From ed9817c2c2d1f1f0fb6aecb38e4c70607b82ee57 Mon Sep 17 00:00:00 2001 From: Jiewen Yao Date: Thu, 28 Sep 2017 11:26:03 +0800 Subject: Rename gPlatformModuleTokenSpaceGuid to gMinPlatformModuleTokenSpaceGuid. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao --- .../Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf | 4 +- .../Acpi/AcpiTables/AcpiPlatform.inf | 40 ++-- .../DxePlatformBootManagerLib.inf | 4 +- .../Flash/SpiFvbService/SpiFvbServiceSmm.inf | 4 +- .../PeiFspWrapperHobProcessLib.inf | 4 +- .../SecFspWrapperPlatformSecLib.inf | 8 +- .../Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf | 2 +- .../MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 2 +- .../MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc | 16 +- .../MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 10 +- .../MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc | 2 +- .../MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 4 +- .../Include/Fdf/CoreOsBootInclude.fdf | 6 +- .../Include/Fdf/CoreSecurityLateInclude.fdf | 4 +- .../Include/Fdf/CoreSecurityPreMemoryInclude.fdf | 2 +- .../Include/Fdf/CoreUefiBootInclude.fdf | 2 +- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 208 ++++++++++----------- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc | 10 +- .../PciHostBridgeLibSimple.inf | 26 +-- .../PlatformInitPei/PlatformInitPreMem.inf | 30 +-- .../TestPointCheckLib/DxeTestPointCheckLib.inf | 2 +- .../TestPointCheckLib/PeiTestPointCheckLib.inf | 2 +- .../TestPointCheckLib/SmmTestPointCheckLib.inf | 2 +- 23 files changed, 197 insertions(+), 197 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf index e7f5d57494..2d82bd14ce 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf @@ -38,8 +38,8 @@ MinPlatformPkg/MinPlatformPkg.dec [Pcd] - gPlatformModuleTokenSpaceGuid.PcdAcpiEnableSwSmi ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdAcpiDisableSwSmi ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdAcpiEnableSwSmi ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdAcpiDisableSwSmi ## CONSUMES [Sources] AcpiSmm.h diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf index 8a2007bbe2..d8e6897a20 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf @@ -56,30 +56,30 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId ## CONSUMES gPcAtChipsetPkgTokenSpaceGuid.PcdHpetBaseAddress - gPlatformModuleTokenSpaceGuid.PcdPreferredPmProfile - gPlatformModuleTokenSpaceGuid.PcdLowPowerS0Idle - gPlatformModuleTokenSpaceGuid.PcdTenSecondPowerButtonEnable - gPlatformModuleTokenSpaceGuid.PcdPciExpNative - gPlatformModuleTokenSpaceGuid.PcdNativeAspmEnable + gMinPlatformModuleTokenSpaceGuid.PcdPreferredPmProfile + gMinPlatformModuleTokenSpaceGuid.PcdLowPowerS0Idle + gMinPlatformModuleTokenSpaceGuid.PcdTenSecondPowerButtonEnable + gMinPlatformModuleTokenSpaceGuid.PcdPciExpNative + gMinPlatformModuleTokenSpaceGuid.PcdNativeAspmEnable [FixedPcd] - gPlatformModuleTokenSpaceGuid.PcdAcpiPm1AEventBlockAddress - gPlatformModuleTokenSpaceGuid.PcdAcpiPm1BEventBlockAddress - gPlatformModuleTokenSpaceGuid.PcdAcpiPm1AControlBlockAddress - gPlatformModuleTokenSpaceGuid.PcdAcpiPm1BControlBlockAddress - gPlatformModuleTokenSpaceGuid.PcdAcpiPm2ControlBlockAddress - gPlatformModuleTokenSpaceGuid.PcdAcpiPmTimerBlockAddress - gPlatformModuleTokenSpaceGuid.PcdAcpiGpe0BlockAddress - gPlatformModuleTokenSpaceGuid.PcdAcpiGpe1BlockAddress - gPlatformModuleTokenSpaceGuid.PcdPciExpressRegionLength + gMinPlatformModuleTokenSpaceGuid.PcdAcpiPm1AEventBlockAddress + gMinPlatformModuleTokenSpaceGuid.PcdAcpiPm1BEventBlockAddress + gMinPlatformModuleTokenSpaceGuid.PcdAcpiPm1AControlBlockAddress + gMinPlatformModuleTokenSpaceGuid.PcdAcpiPm1BControlBlockAddress + gMinPlatformModuleTokenSpaceGuid.PcdAcpiPm2ControlBlockAddress + gMinPlatformModuleTokenSpaceGuid.PcdAcpiPmTimerBlockAddress + gMinPlatformModuleTokenSpaceGuid.PcdAcpiGpe0BlockAddress + gMinPlatformModuleTokenSpaceGuid.PcdAcpiGpe1BlockAddress + gMinPlatformModuleTokenSpaceGuid.PcdPciExpressRegionLength - gPlatformModuleTokenSpaceGuid.PcdApicLocalAddress ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdApicIoAddress ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdAcpiEnableSwSmi ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdAcpiDisableSwSmi ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdApicIoIdPch ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdApicLocalAddress ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdApicIoAddress ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdAcpiEnableSwSmi ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdAcpiDisableSwSmi ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdApicIoIdPch ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdWsmtProtectionFlags + gMinPlatformModuleTokenSpaceGuid.PcdWsmtProtectionFlags [Protocols] gEfiAcpiTableProtocolGuid ## CONSUMES diff --git a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf index 4d32fd24a2..e0d7992930 100644 --- a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf +++ b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf @@ -54,7 +54,7 @@ MinPlatformPkg/MinPlatformPkg.dec [Pcd] - gPlatformModuleTokenSpaceGuid.PcdTpm2Enable ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdTpm2Enable ## CONSUMES gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut ## PRODUCES gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution ## PRODUCES gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution ## PRODUCES @@ -65,7 +65,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand ## PRODUCES - gPlatformModuleTokenSpaceGuid.PcdBootToShellOnly + gMinPlatformModuleTokenSpaceGuid.PcdBootToShellOnly [Sources] BdsPlatform.c diff --git a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf index 3a5f788f45..0d900730b0 100644 --- a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf +++ b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf @@ -50,8 +50,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdFlashFvMicrocodeBase ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdFlashFvMicrocodeSize ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdFlashFvMicrocodeBase ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdFlashFvMicrocodeSize ## CONSUMES [Sources] Common/SpiFvbServiceCommon.c diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/PeiFspWrapperHobProcessLib.inf b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/PeiFspWrapperHobProcessLib.inf index e36674e009..f64edd1c96 100644 --- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/PeiFspWrapperHobProcessLib.inf +++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/PeiFspWrapperHobProcessLib.inf @@ -69,8 +69,8 @@ gIntelFsp2WrapperTokenSpaceGuid.PcdPeiMinMemSize ## CONSUMES gIntelFsp2WrapperTokenSpaceGuid.PcdPeiRecoveryMinMemSize ## CONSUMES gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress - gPlatformModuleTokenSpaceGuid.PcdPciExpressRegionLength - gPlatformModuleTokenSpaceGuid.PcdFspCpuPeiApWakeupBufferAddr + gMinPlatformModuleTokenSpaceGuid.PcdPciExpressRegionLength + gMinPlatformModuleTokenSpaceGuid.PcdFspCpuPeiApWakeupBufferAddr [Guids] gFspReservedMemoryResourceHobGuid ## CONSUMES ## HOB diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf index 68abcf4d0a..f5820951bc 100644 --- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf +++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf @@ -97,7 +97,7 @@ gIntelFsp2WrapperTokenSpaceGuid.PcdFlashMicrocodeOffset ## CONSUMES gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheAddress ## CONSUMES gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheSize ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdFlashFvSecurityBase ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdFlashFvSecuritySize ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdFlashFvAdvancedBase ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdFlashFvAdvancedSize ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdFlashFvSecurityBase ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdFlashFvSecuritySize ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdFlashFvAdvancedBase ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdFlashFvAdvancedSize ## CONSUMES diff --git a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf index 1fa93b050d..e78818d4c0 100644 --- a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf +++ b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf @@ -45,7 +45,7 @@ HstiLib [Pcd] - gPlatformModuleTokenSpaceGuid.PcdHstiIbvPlatformFeature + gMinPlatformModuleTokenSpaceGuid.PcdHstiIbvPlatformFeature [Protocols] diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc index 6446898102..f706cf399b 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc @@ -123,7 +123,7 @@ PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf -!if gPlatformModuleTokenSpaceGuid.PcdUefiSecureBootEnable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdUefiSecureBootEnable == TRUE AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf !endif diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc index c7b34e0795..2e4d2c0871 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc @@ -36,7 +36,7 @@ PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf -!if gPlatformModuleTokenSpaceGuid.PcdBootToShellOnly == FALSE +!if gMinPlatformModuleTokenSpaceGuid.PcdBootToShellOnly == FALSE MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf { @@ -54,10 +54,10 @@ MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { -!if gPlatformModuleTokenSpaceGuid.PcdUefiSecureBootEnable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdUefiSecureBootEnable == TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf !endif -!if gPlatformModuleTokenSpaceGuid.PcdTpm2Enable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdTpm2Enable == TRUE NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf !endif } @@ -105,7 +105,7 @@ MdeModulePkg/Application/UiApp/UiApp.inf MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf -!if gPlatformModuleTokenSpaceGuid.PcdBootToShellOnly == FALSE +!if gMinPlatformModuleTokenSpaceGuid.PcdBootToShellOnly == FALSE MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf @@ -118,18 +118,18 @@ MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf !endif -!if gPlatformModuleTokenSpaceGuid.PcdBootToShellOnly == FALSE +!if gMinPlatformModuleTokenSpaceGuid.PcdBootToShellOnly == FALSE MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf !endif -!if gPlatformModuleTokenSpaceGuid.PcdUefiSecureBootEnable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdUefiSecureBootEnable == TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf !endif -!if gPlatformModuleTokenSpaceGuid.PcdTpm2Enable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdTpm2Enable == TRUE SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { @@ -141,7 +141,7 @@ SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf !endif -!if gPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE PerformancePkg/Dp_App/Dp.inf !endif diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc index 8432b9b17e..29f2a6b5c7 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc @@ -38,7 +38,7 @@ FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf -!if gPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf !endif @@ -53,7 +53,7 @@ MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf -!if gPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf !endif @@ -71,7 +71,7 @@ LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf -!if gPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE PerformanceLib|MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf !endif @@ -88,7 +88,7 @@ ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf -!if gPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE PerformanceLib|MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf !endif @@ -108,6 +108,6 @@ FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf -!if gPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf !endif diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc index e2c07aeb3f..5a0901cf91 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc @@ -48,7 +48,7 @@ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf } -!if gPlatformModuleTokenSpaceGuid.PcdTpm2Enable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdTpm2Enable == TRUE SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc index 41d5f169b9..95429d1e79 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc @@ -45,7 +45,7 @@ DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif -!if gPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf !endif @@ -58,6 +58,6 @@ HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.inf -!if gPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdPerformanceEnable == TRUE PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf !endif diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf index 399b607458..7abf89dc83 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf @@ -13,13 +13,13 @@ # ## -!if gPlatformModuleTokenSpaceGuid.PcdBootToShellOnly == FALSE +!if gMinPlatformModuleTokenSpaceGuid.PcdBootToShellOnly == FALSE INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf !endif -!if gPlatformModuleTokenSpaceGuid.PcdBootToShellOnly == FALSE +!if gMinPlatformModuleTokenSpaceGuid.PcdBootToShellOnly == FALSE INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf INF MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf @@ -29,7 +29,7 @@ INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf INF MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf !endif -!if gPlatformModuleTokenSpaceGuid.PcdBootToShellOnly == FALSE +!if gMinPlatformModuleTokenSpaceGuid.PcdBootToShellOnly == FALSE INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf index 79bea1bb2a..d51f024d90 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf @@ -13,11 +13,11 @@ # ## -!if gPlatformModuleTokenSpaceGuid.PcdUefiSecureBootEnable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdUefiSecureBootEnable == TRUE INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf !endif -!if gPlatformModuleTokenSpaceGuid.PcdTpm2Enable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdTpm2Enable == TRUE INF SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf INF SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclude.fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclude.fdf index 3e8d86f593..803aec2331 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclude.fdf +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclude.fdf @@ -13,7 +13,7 @@ # ## -!if gPlatformModuleTokenSpaceGuid.PcdTpm2Enable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdTpm2Enable == TRUE INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf !endif diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf index f0950a5017..b93eab2c1f 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf @@ -26,7 +26,7 @@ INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf -!if gPlatformModuleTokenSpaceGuid.PcdBootToShellOnly == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdBootToShellOnly == TRUE INF MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf !endif diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec index 9418ee1f8f..d31de0228c 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec @@ -29,7 +29,7 @@ PACKAGE_GUID = 463B3B00-0D18-4a5f-90C0-D5B851D2574B Include [Guids] -gPlatformModuleTokenSpaceGuid = {0x69d13bf0, 0xaf91, 0x4d96, {0xaa, 0x9f, 0x21, 0x84, 0xc5, 0xce, 0x3b, 0xc0}} +gMinPlatformModuleTokenSpaceGuid = {0x69d13bf0, 0xaf91, 0x4d96, {0xaa, 0x9f, 0x21, 0x84, 0xc5, 0xce, 0x3b, 0xc0}} gAdapterInfoPlatformTestPointGuid = {0x5381e3ea, 0xb77, 0x4580, {0xad, 0xdf, 0xa9, 0x1c, 0x8, 0x3b, 0xf2, 0x97}} @@ -75,68 +75,68 @@ TestPointCheckLib|Include/Library/TestPointCheckLib.h ## The Flash relevant PCD are ineffective and will be patched basing on FDF definitions during build. ## Set all of them to 0 here to prevent from confusion. ## -gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress|0xFF800000|UINT32|0x10000001 -gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize|0x00800000|UINT32|0x10000002 - -gPlatformModuleTokenSpaceGuid.PcdFlashFvMicrocodeBase|0xFFE60000|UINT32|0x30000004 -gPlatformModuleTokenSpaceGuid.PcdFlashFvMicrocodeSize|0x000A0000|UINT32|0x30000005 -gPlatformModuleTokenSpaceGuid.PcdFlashFvMicrocodeOffset|0x00660000|UINT32|0x30000006 - -gPlatformModuleTokenSpaceGuid.PcdFlashFvPreMemoryBase|0x00000000|UINT32|0x20000004 -gPlatformModuleTokenSpaceGuid.PcdFlashFvPreMemorySize|0x00000000|UINT32|0x20000005 -gPlatformModuleTokenSpaceGuid.PcdFlashFvPreMemoryOffset|0x00000000|UINT32|0x20000006 -gPlatformModuleTokenSpaceGuid.PcdFlashFvPostMemoryBase|0x00000000|UINT32|0x20000007 -gPlatformModuleTokenSpaceGuid.PcdFlashFvPostMemorySize|0x00000000|UINT32|0x20000008 -gPlatformModuleTokenSpaceGuid.PcdFlashFvPostMemoryOffset|0x00000000|UINT32|0x20000009 -gPlatformModuleTokenSpaceGuid.PcdFlashFvUefiBootBase|0x00000000|UINT32|0x2000000A -gPlatformModuleTokenSpaceGuid.PcdFlashFvUefiBootSize|0x00000000|UINT32|0x2000000B -gPlatformModuleTokenSpaceGuid.PcdFlashFvUefiBootOffset|0x00000000|UINT32|0x2000000C -gPlatformModuleTokenSpaceGuid.PcdFlashFvOsBootBase|0x00000000|UINT32|0x2000000D -gPlatformModuleTokenSpaceGuid.PcdFlashFvOsBootSize|0x00000000|UINT32|0x2000000E -gPlatformModuleTokenSpaceGuid.PcdFlashFvOsBootOffset|0x00000000|UINT32|0x2000000F -gPlatformModuleTokenSpaceGuid.PcdFlashFvSecurityBase|0x00000000|UINT32|0x20000010 -gPlatformModuleTokenSpaceGuid.PcdFlashFvSecuritySize|0x00000000|UINT32|0x20000011 -gPlatformModuleTokenSpaceGuid.PcdFlashFvSecurityOffset|0x00000000|UINT32|0x20000012 -gPlatformModuleTokenSpaceGuid.PcdFlashFvAdvancedBase|0x00000000|UINT32|0x20000013 -gPlatformModuleTokenSpaceGuid.PcdFlashFvAdvancedSize|0x00000000|UINT32|0x20000014 -gPlatformModuleTokenSpaceGuid.PcdFlashFvAdvancedOffset|0x00000000|UINT32|0x20000015 - -gPlatformModuleTokenSpaceGuid.PcdFlashNvStorageBase|0x00000000|UINT32|0x20000016 -gPlatformModuleTokenSpaceGuid.PcdFlashNvStorageSize|0x00000000|UINT32|0x20000017 -gPlatformModuleTokenSpaceGuid.PcdFlashNvStorageOffset|0x00000000|UINT32|0x20000018 -gPlatformModuleTokenSpaceGuid.PcdFlashNvStorageVariableOffset|0x00000000|UINT32|0x20000019 -gPlatformModuleTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset|0x00000000|UINT32|0x2000001A -gPlatformModuleTokenSpaceGuid.PcdFlashNvStorageFtwWorkingOffset|0x00000000|UINT32|0x2000001B - -gPlatformModuleTokenSpaceGuid.PcdFlashFvFspMTBase|0x00000000|UINT32|0x20000021 -gPlatformModuleTokenSpaceGuid.PcdFlashFvFspMTSize|0x00000000|UINT32|0x20000022 -gPlatformModuleTokenSpaceGuid.PcdFlashFvFspMTOffset|0x00000000|UINT32|0x20000023 -gPlatformModuleTokenSpaceGuid.PcdFlashFvFspSBase|0x00000000|UINT32|0x20000024 -gPlatformModuleTokenSpaceGuid.PcdFlashFvFspSSize|0x00000000|UINT32|0x20000025 -gPlatformModuleTokenSpaceGuid.PcdFlashFvFspSOffset|0x00000000|UINT32|0x20000026 - -gPlatformModuleTokenSpaceGuid.PcdFspMaxUpdSize|0x00000000|UINT32|0x80000000 -gPlatformModuleTokenSpaceGuid.PcdFspReservedSizeOnStackTop|0x00000040|UINT32|0x80000001 -gPlatformModuleTokenSpaceGuid.PcdPeiPhaseStackTop|0x00000000|UINT32|0x80000002 - -gPlatformModuleTokenSpaceGuid.PcdApicLocalAddress|0xFEE00000|UINT64|0x9000000B -gPlatformModuleTokenSpaceGuid.PcdApicLocalMmioSize|0x1000|UINT32|0x9000000C - -gPlatformModuleTokenSpaceGuid.PcdApicIoAddress|0xFEC00000|UINT64|0x9000000D -gPlatformModuleTokenSpaceGuid.PcdApicIoMmioSize|0x1000|UINT32|0x9000000E - -gPlatformModuleTokenSpaceGuid.PcdAcpiEnableSwSmi|0xF0|UINT8|0x90000012 -gPlatformModuleTokenSpaceGuid.PcdAcpiDisableSwSmi|0xF1|UINT8|0x90000013 - -gPlatformModuleTokenSpaceGuid.PcdApicIoIdPch|0x02|UINT8|0x9000001E - -gPlatformModuleTokenSpaceGuid.PcdPlatformEfiAcpiReclaimMemorySize|0x65|UINT32|0x20000500 -gPlatformModuleTokenSpaceGuid.PcdPlatformEfiAcpiNvsMemorySize|0x30|UINT32|0x20000501 -gPlatformModuleTokenSpaceGuid.PcdPlatformEfiReservedMemorySize|0x402|UINT32|0x20000502 -gPlatformModuleTokenSpaceGuid.PcdPlatformEfiRtDataMemorySize|0x4b|UINT32|0x20000503 -gPlatformModuleTokenSpaceGuid.PcdPlatformEfiRtCodeMemorySize|0x25|UINT32|0x20000504 - -gPlatformModuleTokenSpaceGuid.PcdFspTemporaryRamSize|0x1000|UINT32|0x10001003 +gMinPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress|0xFF800000|UINT32|0x10000001 +gMinPlatformModuleTokenSpaceGuid.PcdFlashAreaSize|0x00800000|UINT32|0x10000002 + +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvMicrocodeBase|0xFFE60000|UINT32|0x30000004 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvMicrocodeSize|0x000A0000|UINT32|0x30000005 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvMicrocodeOffset|0x00660000|UINT32|0x30000006 + +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvPreMemoryBase|0x00000000|UINT32|0x20000004 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvPreMemorySize|0x00000000|UINT32|0x20000005 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvPreMemoryOffset|0x00000000|UINT32|0x20000006 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvPostMemoryBase|0x00000000|UINT32|0x20000007 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvPostMemorySize|0x00000000|UINT32|0x20000008 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvPostMemoryOffset|0x00000000|UINT32|0x20000009 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvUefiBootBase|0x00000000|UINT32|0x2000000A +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvUefiBootSize|0x00000000|UINT32|0x2000000B +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvUefiBootOffset|0x00000000|UINT32|0x2000000C +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvOsBootBase|0x00000000|UINT32|0x2000000D +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvOsBootSize|0x00000000|UINT32|0x2000000E +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvOsBootOffset|0x00000000|UINT32|0x2000000F +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvSecurityBase|0x00000000|UINT32|0x20000010 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvSecuritySize|0x00000000|UINT32|0x20000011 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvSecurityOffset|0x00000000|UINT32|0x20000012 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvAdvancedBase|0x00000000|UINT32|0x20000013 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvAdvancedSize|0x00000000|UINT32|0x20000014 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvAdvancedOffset|0x00000000|UINT32|0x20000015 + +gMinPlatformModuleTokenSpaceGuid.PcdFlashNvStorageBase|0x00000000|UINT32|0x20000016 +gMinPlatformModuleTokenSpaceGuid.PcdFlashNvStorageSize|0x00000000|UINT32|0x20000017 +gMinPlatformModuleTokenSpaceGuid.PcdFlashNvStorageOffset|0x00000000|UINT32|0x20000018 +gMinPlatformModuleTokenSpaceGuid.PcdFlashNvStorageVariableOffset|0x00000000|UINT32|0x20000019 +gMinPlatformModuleTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset|0x00000000|UINT32|0x2000001A +gMinPlatformModuleTokenSpaceGuid.PcdFlashNvStorageFtwWorkingOffset|0x00000000|UINT32|0x2000001B + +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspMTBase|0x00000000|UINT32|0x20000021 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspMTSize|0x00000000|UINT32|0x20000022 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspMTOffset|0x00000000|UINT32|0x20000023 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspSBase|0x00000000|UINT32|0x20000024 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspSSize|0x00000000|UINT32|0x20000025 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspSOffset|0x00000000|UINT32|0x20000026 + +gMinPlatformModuleTokenSpaceGuid.PcdFspMaxUpdSize|0x00000000|UINT32|0x80000000 +gMinPlatformModuleTokenSpaceGuid.PcdFspReservedSizeOnStackTop|0x00000040|UINT32|0x80000001 +gMinPlatformModuleTokenSpaceGuid.PcdPeiPhaseStackTop|0x00000000|UINT32|0x80000002 + +gMinPlatformModuleTokenSpaceGuid.PcdApicLocalAddress|0xFEE00000|UINT64|0x9000000B +gMinPlatformModuleTokenSpaceGuid.PcdApicLocalMmioSize|0x1000|UINT32|0x9000000C + +gMinPlatformModuleTokenSpaceGuid.PcdApicIoAddress|0xFEC00000|UINT64|0x9000000D +gMinPlatformModuleTokenSpaceGuid.PcdApicIoMmioSize|0x1000|UINT32|0x9000000E + +gMinPlatformModuleTokenSpaceGuid.PcdAcpiEnableSwSmi|0xF0|UINT8|0x90000012 +gMinPlatformModuleTokenSpaceGuid.PcdAcpiDisableSwSmi|0xF1|UINT8|0x90000013 + +gMinPlatformModuleTokenSpaceGuid.PcdApicIoIdPch|0x02|UINT8|0x9000001E + +gMinPlatformModuleTokenSpaceGuid.PcdPlatformEfiAcpiReclaimMemorySize|0x65|UINT32|0x20000500 +gMinPlatformModuleTokenSpaceGuid.PcdPlatformEfiAcpiNvsMemorySize|0x30|UINT32|0x20000501 +gMinPlatformModuleTokenSpaceGuid.PcdPlatformEfiReservedMemorySize|0x402|UINT32|0x20000502 +gMinPlatformModuleTokenSpaceGuid.PcdPlatformEfiRtDataMemorySize|0x4b|UINT32|0x20000503 +gMinPlatformModuleTokenSpaceGuid.PcdPlatformEfiRtCodeMemorySize|0x25|UINT32|0x20000504 + +gMinPlatformModuleTokenSpaceGuid.PcdFspTemporaryRamSize|0x1000|UINT32|0x10001003 # # The PCDs are used to control the Windows SMM Security Mitigations Table - Protection Flags @@ -147,9 +147,9 @@ gPlatformModuleTokenSpaceGuid.PcdFspTemporaryRamSize|0x1000|UINT32|0x10001003 # BIT2: Firmware setting this bit is an indication that it will not allow reconfiguration of system resources via non-architectural mechanisms. # BIT3-31: Reserved # -gPlatformModuleTokenSpaceGuid.PcdWsmtProtectionFlags|0|UINT32|0x10001006 +gMinPlatformModuleTokenSpaceGuid.PcdWsmtProtectionFlags|0|UINT32|0x10001006 -gPlatformModuleTokenSpaceGuid.PcdPreferredPmProfile|0x0|UINT8|0x00100205 +gMinPlatformModuleTokenSpaceGuid.PcdPreferredPmProfile|0x0|UINT8|0x00100205 # # See HstiIbvFeatureBit.h for the definition @@ -158,7 +158,7 @@ gPlatformModuleTokenSpaceGuid.PcdPreferredPmProfile|0x0|UINT8|0x00100205 # # It means BYTE BIT is for feature . # -gPlatformModuleTokenSpaceGuid.PcdHstiIbvPlatformFeature|{0x00, 0x00, 0x00}|VOID*|0x00100301 +gMinPlatformModuleTokenSpaceGuid.PcdHstiIbvPlatformFeature|{0x00, 0x00, 0x00}|VOID*|0x00100301 # # See TestPointCheckLib.h for the definition @@ -167,7 +167,7 @@ gPlatformModuleTokenSpaceGuid.PcdHstiIbvPlatformFeature|{0x00, 0x00, 0x00}|VOID* # # It means BYTE BIT is for feature . # -gPlatformModuleTokenSpaceGuid.PcdTestPointIbvPlatformFeature|{0x00, 0x07, 0x0F, 0x03}|VOID*|0x00100302 +gMinPlatformModuleTokenSpaceGuid.PcdTestPointIbvPlatformFeature|{0x00, 0x07, 0x0F, 0x03}|VOID*|0x00100302 [PcdsDynamic] @@ -177,36 +177,36 @@ gPlatformModuleTokenSpaceGuid.PcdTestPointIbvPlatformFeature|{0x00, 0x07, 0x0F, ## Allocate 56 KB [0x2000..0xFFFF] of I/O space for Pci Devices ## If PcdPciReservedMemLimit =0 Pci Reserved default MMIO Limit is PciExpressBase else use PcdPciReservedMemLimit . ## - gPlatformModuleTokenSpaceGuid.PcdPciReservedIobase |0x2000 |UINT16|0x40010041 - gPlatformModuleTokenSpaceGuid.PcdPciReservedIoLimit |0xFFFF |UINT16|0x40010042 - gPlatformModuleTokenSpaceGuid.PcdPciReservedMemBase |0x90000000 |UINT32|0x40010043 - gPlatformModuleTokenSpaceGuid.PcdPciReservedMemLimit |0x00000000 |UINT32|0x40010044 - gPlatformModuleTokenSpaceGuid.PcdPciReservedMemAbove4GBBase |0xFFFFFFFFFFFFFFFF |UINT64|0x40010045 - gPlatformModuleTokenSpaceGuid.PcdPciReservedMemAbove4GBLimit |0x0000000000000000 |UINT64|0x40010046 - gPlatformModuleTokenSpaceGuid.PcdPciReservedPMemBase |0xFFFFFFFF |UINT32|0x40010047 - gPlatformModuleTokenSpaceGuid.PcdPciReservedPMemLimit |0x00000000 |UINT32|0x40010048 - gPlatformModuleTokenSpaceGuid.PcdPciReservedPMemAbove4GBBase |0xFFFFFFFFFFFFFFFF |UINT64|0x40010049 - gPlatformModuleTokenSpaceGuid.PcdPciReservedPMemAbove4GBLimit|0x0000000000000000 |UINT64|0x4001004A - gPlatformModuleTokenSpaceGuid.PcdPciDmaAbove4G |FALSE|BOOLEAN|0x4001004B - gPlatformModuleTokenSpaceGuid.PcdPciNoExtendedConfigSpace |FALSE|BOOLEAN|0x4001004C - gPlatformModuleTokenSpaceGuid.PcdPciResourceAssigned |FALSE|BOOLEAN|0x4001004D - - gPlatformModuleTokenSpaceGuid.PcdLowPowerS0Idle|0|UINT8|0x40000006 - gPlatformModuleTokenSpaceGuid.PcdTenSecondPowerButtonEnable|0|UINT8|0x40000008 - gPlatformModuleTokenSpaceGuid.PcdPciExpNative|0|UINT8|0x40000004 - gPlatformModuleTokenSpaceGuid.PcdNativeAspmEnable|1|UINT8|0x40000005 - - gPlatformModuleTokenSpaceGuid.PcdAcpiPm1AEventBlockAddress|0x1800|UINT16|0x00010035 - gPlatformModuleTokenSpaceGuid.PcdAcpiPm1BEventBlockAddress|0x0000|UINT16|0x00010036 - gPlatformModuleTokenSpaceGuid.PcdAcpiPm1AControlBlockAddress|0x1804|UINT16|0x0001037 - gPlatformModuleTokenSpaceGuid.PcdAcpiPm1BControlBlockAddress|0x0000|UINT16|0x00010038 - gPlatformModuleTokenSpaceGuid.PcdAcpiPm2ControlBlockAddress|0x1850|UINT16|0x00010039 - gPlatformModuleTokenSpaceGuid.PcdAcpiPmTimerBlockAddress|0x1808|UINT16|0x0001003A - gPlatformModuleTokenSpaceGuid.PcdAcpiGpe0BlockAddress|0x1880|UINT16|0x0001003B - gPlatformModuleTokenSpaceGuid.PcdAcpiGpe1BlockAddress|0x0000|UINT16|0x0001003C - - gPlatformModuleTokenSpaceGuid.PcdPciExpressRegionLength|0x10000000|UINT32|0x0010004 - gPlatformModuleTokenSpaceGuid.PcdFspCpuPeiApWakeupBufferAddr|0x9f000|UINT32|0x30000008 + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedIobase |0x2000 |UINT16|0x40010041 + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedIoLimit |0xFFFF |UINT16|0x40010042 + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedMemBase |0x90000000 |UINT32|0x40010043 + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedMemLimit |0x00000000 |UINT32|0x40010044 + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedMemAbove4GBBase |0xFFFFFFFFFFFFFFFF |UINT64|0x40010045 + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedMemAbove4GBLimit |0x0000000000000000 |UINT64|0x40010046 + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedPMemBase |0xFFFFFFFF |UINT32|0x40010047 + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedPMemLimit |0x00000000 |UINT32|0x40010048 + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedPMemAbove4GBBase |0xFFFFFFFFFFFFFFFF |UINT64|0x40010049 + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedPMemAbove4GBLimit|0x0000000000000000 |UINT64|0x4001004A + gMinPlatformModuleTokenSpaceGuid.PcdPciDmaAbove4G |FALSE|BOOLEAN|0x4001004B + gMinPlatformModuleTokenSpaceGuid.PcdPciNoExtendedConfigSpace |FALSE|BOOLEAN|0x4001004C + gMinPlatformModuleTokenSpaceGuid.PcdPciResourceAssigned |FALSE|BOOLEAN|0x4001004D + + gMinPlatformModuleTokenSpaceGuid.PcdLowPowerS0Idle|0|UINT8|0x40000006 + gMinPlatformModuleTokenSpaceGuid.PcdTenSecondPowerButtonEnable|0|UINT8|0x40000008 + gMinPlatformModuleTokenSpaceGuid.PcdPciExpNative|0|UINT8|0x40000004 + gMinPlatformModuleTokenSpaceGuid.PcdNativeAspmEnable|1|UINT8|0x40000005 + + gMinPlatformModuleTokenSpaceGuid.PcdAcpiPm1AEventBlockAddress|0x1800|UINT16|0x00010035 + gMinPlatformModuleTokenSpaceGuid.PcdAcpiPm1BEventBlockAddress|0x0000|UINT16|0x00010036 + gMinPlatformModuleTokenSpaceGuid.PcdAcpiPm1AControlBlockAddress|0x1804|UINT16|0x0001037 + gMinPlatformModuleTokenSpaceGuid.PcdAcpiPm1BControlBlockAddress|0x0000|UINT16|0x00010038 + gMinPlatformModuleTokenSpaceGuid.PcdAcpiPm2ControlBlockAddress|0x1850|UINT16|0x00010039 + gMinPlatformModuleTokenSpaceGuid.PcdAcpiPmTimerBlockAddress|0x1808|UINT16|0x0001003A + gMinPlatformModuleTokenSpaceGuid.PcdAcpiGpe0BlockAddress|0x1880|UINT16|0x0001003B + gMinPlatformModuleTokenSpaceGuid.PcdAcpiGpe1BlockAddress|0x0000|UINT16|0x0001003C + + gMinPlatformModuleTokenSpaceGuid.PcdPciExpressRegionLength|0x10000000|UINT32|0x0010004 + gMinPlatformModuleTokenSpaceGuid.PcdFspCpuPeiApWakeupBufferAddr|0x9f000|UINT32|0x30000008 [PcdsFeatureFlag] # @@ -216,11 +216,11 @@ gPlatformModuleTokenSpaceGuid.PcdTestPointIbvPlatformFeature|{0x00, 0x07, 0x0F, # Stage 4 - boot to OS # Stage 5 - boot to OS with security boot enabled # - gPlatformModuleTokenSpaceGuid.PcdBootStage|4|UINT8|0xF00000A0 + gMinPlatformModuleTokenSpaceGuid.PcdBootStage|4|UINT8|0xF00000A0 - gPlatformModuleTokenSpaceGuid.PcdStopAfterDebugInit |FALSE|BOOLEAN|0xF00000A1 - gPlatformModuleTokenSpaceGuid.PcdStopAfterMemInit |FALSE|BOOLEAN|0xF00000A2 - gPlatformModuleTokenSpaceGuid.PcdBootToShellOnly |FALSE|BOOLEAN|0xF00000A3 - gPlatformModuleTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE|BOOLEAN|0xF00000A4 - gPlatformModuleTokenSpaceGuid.PcdTpm2Enable |FALSE|BOOLEAN|0xF00000A5 - gPlatformModuleTokenSpaceGuid.PcdPerformanceEnable |FALSE|BOOLEAN|0xF00000A6 + gMinPlatformModuleTokenSpaceGuid.PcdStopAfterDebugInit |FALSE|BOOLEAN|0xF00000A1 + gMinPlatformModuleTokenSpaceGuid.PcdStopAfterMemInit |FALSE|BOOLEAN|0xF00000A2 + gMinPlatformModuleTokenSpaceGuid.PcdBootToShellOnly |FALSE|BOOLEAN|0xF00000A3 + gMinPlatformModuleTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE|BOOLEAN|0xF00000A4 + gMinPlatformModuleTokenSpaceGuid.PcdTpm2Enable |FALSE|BOOLEAN|0xF00000A5 + gMinPlatformModuleTokenSpaceGuid.PcdPerformanceEnable |FALSE|BOOLEAN|0xF00000A6 diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc index ef2b150f2a..1b64ed6a87 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc @@ -45,10 +45,10 @@ [PcdsFeatureFlag] # configuration - gPlatformModuleTokenSpaceGuid.PcdBootToShellOnly|FALSE - gPlatformModuleTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE - gPlatformModuleTokenSpaceGuid.PcdTpm2Enable|FALSE - gPlatformModuleTokenSpaceGuid.PcdPerformanceEnable|FALSE + gMinPlatformModuleTokenSpaceGuid.PcdBootToShellOnly|FALSE + gMinPlatformModuleTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE + gMinPlatformModuleTokenSpaceGuid.PcdTpm2Enable|FALSE + gMinPlatformModuleTokenSpaceGuid.PcdPerformanceEnable|FALSE ################################################################################ # @@ -182,7 +182,7 @@ MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLib.inf MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpApp.inf -!if gPlatformModuleTokenSpaceGuid.PcdTpm2Enable == TRUE +!if gMinPlatformModuleTokenSpaceGuid.PcdTpm2Enable == TRUE MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf !endif diff --git a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.inf b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.inf index 631de8e6b6..e29c371d7e 100644 --- a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.inf +++ b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.inf @@ -43,17 +43,17 @@ [Pcd] gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress - gPlatformModuleTokenSpaceGuid.PcdPciReservedIobase - gPlatformModuleTokenSpaceGuid.PcdPciReservedIoLimit - gPlatformModuleTokenSpaceGuid.PcdPciReservedMemBase - gPlatformModuleTokenSpaceGuid.PcdPciReservedMemLimit - gPlatformModuleTokenSpaceGuid.PcdPciReservedMemAbove4GBBase - gPlatformModuleTokenSpaceGuid.PcdPciReservedMemAbove4GBLimit - gPlatformModuleTokenSpaceGuid.PcdPciReservedPMemBase - gPlatformModuleTokenSpaceGuid.PcdPciReservedPMemLimit - gPlatformModuleTokenSpaceGuid.PcdPciReservedPMemAbove4GBBase - gPlatformModuleTokenSpaceGuid.PcdPciReservedPMemAbove4GBLimit - gPlatformModuleTokenSpaceGuid.PcdPciDmaAbove4G - gPlatformModuleTokenSpaceGuid.PcdPciNoExtendedConfigSpace - gPlatformModuleTokenSpaceGuid.PcdPciResourceAssigned + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedIobase + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedIoLimit + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedMemBase + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedMemLimit + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedMemAbove4GBBase + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedMemAbove4GBLimit + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedPMemBase + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedPMemLimit + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedPMemAbove4GBBase + gMinPlatformModuleTokenSpaceGuid.PcdPciReservedPMemAbove4GBLimit + gMinPlatformModuleTokenSpaceGuid.PcdPciDmaAbove4G + gMinPlatformModuleTokenSpaceGuid.PcdPciNoExtendedConfigSpace + gMinPlatformModuleTokenSpaceGuid.PcdPciResourceAssigned diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf index e8115668b7..2afb3163ff 100644 --- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf @@ -41,23 +41,23 @@ UefiCpuPkg/UefiCpuPkg.dec [Pcd] - gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdFlashFvPostMemoryBase ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdFlashFvPostMemorySize ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdFlashFvUefiBootBase ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdFlashFvUefiBootSize ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdFlashFvOsBootBase ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdFlashFvOsBootSize ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdStopAfterDebugInit - gPlatformModuleTokenSpaceGuid.PcdStopAfterMemInit + gMinPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdFlashAreaSize ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdFlashFvPostMemoryBase ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdFlashFvPostMemorySize ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdFlashFvUefiBootBase ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdFlashFvUefiBootSize ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdFlashFvOsBootBase ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdFlashFvOsBootSize ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdStopAfterDebugInit + gMinPlatformModuleTokenSpaceGuid.PcdStopAfterMemInit [FixedPcd] - gPlatformModuleTokenSpaceGuid.PcdPlatformEfiAcpiReclaimMemorySize ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdPlatformEfiAcpiNvsMemorySize ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdPlatformEfiReservedMemorySize ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdPlatformEfiRtDataMemorySize ## CONSUMES - gPlatformModuleTokenSpaceGuid.PcdPlatformEfiRtCodeMemorySize ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdPlatformEfiAcpiReclaimMemorySize ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdPlatformEfiAcpiNvsMemorySize ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdPlatformEfiReservedMemorySize ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdPlatformEfiRtDataMemorySize ## CONSUMES + gMinPlatformModuleTokenSpaceGuid.PcdPlatformEfiRtCodeMemorySize ## CONSUMES [Sources] PlatformInitPreMem.c diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.inf b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.inf index beec4a2193..c5f6882340 100644 --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.inf +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.inf @@ -83,4 +83,4 @@ gEfiDevicePathProtocolGuid [Pcd] - gPlatformModuleTokenSpaceGuid.PcdTestPointIbvPlatformFeature \ No newline at end of file + gMinPlatformModuleTokenSpaceGuid.PcdTestPointIbvPlatformFeature diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.inf b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.inf index 11b4ce6756..24056ca69e 100644 --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.inf +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.inf @@ -45,7 +45,7 @@ PeiDumpSmramHob.c [Pcd] - gPlatformModuleTokenSpaceGuid.PcdTestPointIbvPlatformFeature + gMinPlatformModuleTokenSpaceGuid.PcdTestPointIbvPlatformFeature [Guids] gEfiHobMemoryAllocStackGuid diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.inf b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.inf index f17c96cecb..bd3bce527e 100644 --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.inf +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.inf @@ -47,7 +47,7 @@ SmmDumpSmrr.c [Pcd] - gPlatformModuleTokenSpaceGuid.PcdTestPointIbvPlatformFeature + gMinPlatformModuleTokenSpaceGuid.PcdTestPointIbvPlatformFeature [Guids] gEdkiiPiSmmMemoryAttributesTableGuid -- cgit v1.2.3