Remove the GUID definitions from the NOR flash bank structure: the driver no longer uses them.
Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel <[email protected]> --- Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c | 2 -- Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c | 2 -- Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c | 4 ---- 3 files changed, 8 deletions(-) diff --git a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c index b31b9635b7b7..2e49f3acfeb3 100644 --- a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c +++ b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c @@ -24,14 +24,12 @@ NOR_FLASH_DESCRIPTION mNorFlashDevices[] = { ARM_VE_SMB_NOR0_BASE, SIZE_256KB * 255, SIZE_256KB, - {0xE7223039, 0x5836, 0x41E1, { 0xB5, 0x42, 0xD7, 0xEC, 0x73, 0x6C, 0x5E, 0x59} } }, { ARM_VE_SMB_NOR0_BASE, ARM_VE_SMB_NOR0_BASE + SIZE_256KB * 255, SIZE_64KB * 4, SIZE_64KB, - {0x02118005, 0x9DA7, 0x443A, { 0x92, 0xD5, 0x78, 0x1F, 0x02, 0x2A, 0xED, 0xBB } } }, }; diff --git a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c index 3ab296aafda0..04e9710bf286 100644 --- a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c +++ b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c @@ -24,14 +24,12 @@ STATIC NOR_FLASH_DESCRIPTION mNorFlashDevices[] = { SGI_EXP_SMC_CS0_BASE, SIZE_256KB * 256, SIZE_256KB, - { 0xEBF0B9DF, 0x17d0, 0x4812, { 0xA9, 0x59, 0xCF, 0xD7, 0x92, 0xEE, 0x31, 0x13 } } }, { SGI_EXP_SMC_CS1_BASE, SGI_EXP_SMC_CS1_BASE, SIZE_256KB * 256, SIZE_256KB, - { 0x1F15DA3C, 0x37FF, 0x4070, { 0xB4, 0x71, 0xBB, 0x4A, 0xF1, 0x2A, 0x72, 0x4A } } }, }; diff --git a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c index a136bff4a1d6..ac270dc3a675 100644 --- a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c +++ b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c @@ -26,28 +26,24 @@ NOR_FLASH_DESCRIPTION mNorFlashDevices[NOR_FLASH_DEVICE_COUNT] = { ARM_VE_SMB_NOR0_BASE, SIZE_256KB * 255, SIZE_256KB, - { 0xE7223039, 0x5836, 0x41E1, { 0xB5, 0x42, 0xD7, 0xEC, 0x73, 0x6C, 0x5E, 0x59 } } }, { // BootMon non-volatile storage ARM_VE_SMB_NOR0_BASE, ARM_VE_SMB_NOR0_BASE + SIZE_256KB * 255, SIZE_64KB * 4, SIZE_64KB, - { 0x02118005, 0x9DA7, 0x443A, { 0x92, 0xD5, 0x78, 0x1F, 0x02, 0x2A, 0xED, 0xBB } } }, { // UEFI ARM_VE_SMB_NOR1_BASE, ARM_VE_SMB_NOR1_BASE, SIZE_256KB * 255, SIZE_256KB, - { 0x1F15DA3C, 0x37FF, 0x4070, { 0xB4, 0x71, 0xBB, 0x4A, 0xF1, 0x2A, 0x72, 0x4A } } }, { // UEFI Variable Services non-volatile storage ARM_VE_SMB_NOR1_BASE, ARM_VE_SMB_NOR1_BASE + SIZE_256KB * 255, SIZE_64KB * 3, //FIXME: Set 3 blocks because I did not succeed to copy 4 blocks into the ARM Versatile Express NOR Flash in the last NOR Flash. It should be 4 blocks SIZE_64KB, - { 0xCC2CBF29, 0x1498, 0x4CDD, { 0x81, 0x71, 0xF8, 0xB6, 0xB4, 0x1D, 0x09, 0x09 } } } }; -- 2.17.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
