From 4297639904aa5e964472ea8fa54e3d09bd1f0595 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Thu, 1 Feb 2018 15:33:04 +0000 Subject: Platform/Cello,Overdrive: set fw vendor PCD from FIRMWARE_VENDOR 'AMD Seattle' is not a firmware vendor, nor is 'LeMaker Cello' So let's do what other platforms do, and default to 'EDK II' unless it is overridden at build time by setting FIRMWARE_VENDOR. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 4 +++- Platform/LeMaker/CelloBoard/CelloBoard.dsc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index a99a9a1062..21edcc8798 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -365,7 +365,9 @@ DEFINE DO_CAPSULE = FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"AMD Seattle" +!ifdef $(FIRMWARE_VENDOR) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"$(FIRMWARE_VENDOR)" +!endif # Number of configured cores gArmPlatformTokenSpaceGuid.PcdCoreCount|$(NUM_CORES) diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc index fb9155ce3a..cf3df86514 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc @@ -351,7 +351,9 @@ DEFINE DO_FLASHER = FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"LeMaker Cello" +!ifdef $(FIRMWARE_VENDOR) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"$(FIRMWARE_VENDOR)" +!endif # Number of configured cores gArmPlatformTokenSpaceGuid.PcdCoreCount|$(NUM_CORES) -- cgit v1.2.3