From 5e6c424cac5703a232f84e14ae360fae9cd166f1 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 6 Mar 2026 13:34:07 +0100 Subject: [PATCH] package/edk2-platforms: fix package patch newline characters Commit [1] was applied without fixing the edk2-platform patch newlines which are changed by the mailing list. As a result, the patch fails to apply. This commit fixes the issue. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/21baec5ef57077cc7b4ce98dbd863c5f5a6d8380 Signed-off-by: Julien Olivain --- ...Marvell-fix-SMBIOS-type-7-structures.patch | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/package/edk2-platforms/0001-Silicon-Marvell-fix-SMBIOS-type-7-structures.patch b/package/edk2-platforms/0001-Silicon-Marvell-fix-SMBIOS-type-7-structures.patch index 9a12580a69..533b325796 100644 --- a/package/edk2-platforms/0001-Silicon-Marvell-fix-SMBIOS-type-7-structures.patch +++ b/package/edk2-platforms/0001-Silicon-Marvell-fix-SMBIOS-type-7-structures.patch @@ -32,49 +32,49 @@ index 16fe05a46c..d348bbb458 100644 --- a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c +++ b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c @@ -227,8 +227,8 @@ STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l1i = { - CacheTypeInstruction, //instruction cache - CacheAssociativityOther, //three way - // SMBIOS 3.1.0 fields -- 48, //48k I-cache max -- 48, //48k installed -+ {48,0},//48k I-cache max -+ {48,0},//48k installed - }; - - STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l1d = { + CacheTypeInstruction, //instruction cache + CacheAssociativityOther, //three way + // SMBIOS 3.1.0 fields +- 48, //48k I-cache max +- 48, //48k installed ++ {48,0},//48k I-cache max ++ {48,0},//48k installed + }; + + STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l1d = { @@ -248,8 +248,8 @@ STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l1d = { - CacheTypeData, //data cache - CacheAssociativity2Way, //two way - // SMBIOS 3.1.0 fields -- 32, //32k D-cache max -- 32, //32k installed -+ {32,0},//32k D-cache max -+ {32,0},//32k installed - }; - - STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l2 = { + CacheTypeData, //data cache + CacheAssociativity2Way, //two way + // SMBIOS 3.1.0 fields +- 32, //32k D-cache max +- 32, //32k installed ++ {32,0},//32k D-cache max ++ {32,0},//32k installed + }; + + STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l2 = { @@ -269,8 +269,8 @@ STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l2 = { - CacheTypeUnified, //instruction cache - CacheAssociativity16Way, //16 way associative - // SMBIOS 3.1.0 fields -- 512, //512k D-cache max -- 512, //512k installed -+ {512,0},//512k D-cache max -+ {512,0},//512k installed - }; - - STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_l3 = { + CacheTypeUnified, //instruction cache + CacheAssociativity16Way, //16 way associative + // SMBIOS 3.1.0 fields +- 512, //512k D-cache max +- 512, //512k installed ++ {512,0},//512k D-cache max ++ {512,0},//512k installed + }; + + STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_l3 = { @@ -290,8 +290,8 @@ STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_l3 = { - CacheTypeUnified, //instruction cache - CacheAssociativity8Way, //8 way associative - // SMBIOS 3.1.0 fields -- 1024, //1M cache max -- 1024, //1M installed -+ {1024,0},//1M cache max -+ {1024,0},//1M installed - }; - - STATIC CONST CHAR8 *mArmadaDefaultType7Strings[] = { + CacheTypeUnified, //instruction cache + CacheAssociativity8Way, //8 way associative + // SMBIOS 3.1.0 fields +- 1024, //1M cache max +- 1024, //1M installed ++ {1024,0},//1M cache max ++ {1024,0},//1M installed + }; + + STATIC CONST CHAR8 *mArmadaDefaultType7Strings[] = { -- 2.52.0