From 5f107076c9a9a4242a85584c7b6538190a1fd6c9 Mon Sep 17 00:00:00 2001 From: Nhi Pham Date: Sun, 8 Sep 2024 19:39:50 +0700 Subject: [PATCH] JadePkg: Consolidate SMBIOS PCDs Signed-off-by: Nhi Pham --- Platform/Ampere/JadePkg/Jade.dsc | 13 ------------- .../Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc | 14 ++++++++++---- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/Platform/Ampere/JadePkg/Jade.dsc b/Platform/Ampere/JadePkg/Jade.dsc index 170ad03436..31594d0830 100644 --- a/Platform/Ampere/JadePkg/Jade.dsc +++ b/Platform/Ampere/JadePkg/Jade.dsc @@ -171,25 +171,12 @@ gAmpereTokenSpaceGuid.PcdPcieHotPlugPortMapTable.PortMap[35]|{ 35, 1, 7, 6, 0, 0x24, 0x70, 0x4, 0, 11, 8 } # S1 RCB3.6 - SSD8 gAmpereTokenSpaceGuid.PcdPcieHotPlugPortMapTable.PortMap[36]|{ 0xFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF } # Require if no fully structure used -!ifdef $(FIRMWARE_VER) - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" -!endif - [PcdsFixedAtBuild.common] # # Platform config UUID # gAmpereTokenSpaceGuid.PcdPlatformConfigUuid|"$(PLATFORM_CONFIG_UUID)" - # - # SMBIOS PCDs - # - gArmTokenSpaceGuid.PcdProcessorManufacturer|L"Ampere(R)" - gArmTokenSpaceGuid.PcdProcessorVersion|L"Ampere(R) Altra(R) Processor" - - gAmpereTokenSpaceGuid.PcdSmbiosTables0MajorVersion|$(MAJOR_VER) - gAmpereTokenSpaceGuid.PcdSmbiosTables0MinorVersion|$(MINOR_VER) - # Clearing BIT0 in this PCD prevents installing a 32-bit SMBIOS entry point, # if the entry point version is >= 3.0. AARCH64 OSes cannot assume the # presence of the 32-bit entry point anyway (because many AARCH64 systems diff --git a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc index a3a838e5ba..d403366610 100644 --- a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc +++ b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc @@ -311,10 +311,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE [PcdsFixedAtBuild.common] -!ifdef $(FIRMWARE_VER) - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" -!endif - gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000 gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000 gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000 @@ -507,6 +503,16 @@ # gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|32 + # + # SMBIOS PCDs + # + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" + gAmpereTokenSpaceGuid.PcdSmbiosTables0MajorVersion|$(MAJOR_VER) + gAmpereTokenSpaceGuid.PcdSmbiosTables0MinorVersion|$(MINOR_VER) + gArmTokenSpaceGuid.PcdProcessorManufacturer|L"Ampere(R)" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"Ampere(R)" + gArmTokenSpaceGuid.PcdProcessorAssetTag|L"Not Set" + [PcdsDynamicHii.common.DEFAULT] gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10