Re: [edk2-platforms][PATCH V1 12/17] WhiskeylakeOpenBoardPkg/WhiskeylakeURvp: DSC cleanup

["Chiu, Chasel" <chasel.chiu@intel.com>]

Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>

> -----Original Message-----
> From: Kubacki, Michael A <michael.a.kubacki@intel.com>
> Sent: Tuesday, October 8, 2019 1:17 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>
> Subject: [edk2-platforms][PATCH V1 12/17]
> WhiskeylakeOpenBoardPkg/WhiskeylakeURvp: DSC cleanup
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2243
> 
> This change refactors OpenBoardPkg.dsc and OpenBoardPkgPcd.dsc to
> consolidate redundant sections and better group file content to
> improve maintainability and readability.
> 
> The same pattern made in this change for WhiskeylakeURvp is being
> applied to all existing board packages in Platform/Intel to improve
> overall consistency.
> 
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Signed-off-by: Michael Kubacki <michael.a.kubacki@intel.com>
> ---
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.
> dsc    | 502 +++++++++++---------
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg
> Pcd.dsc | 441 +++++++++--------
>  2 files changed, 510 insertions(+), 433 deletions(-)
> 
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kg.dsc
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kg.dsc
> index 1d07fdea84..d6eb66a880 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kg.dsc
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kg.dsc
> @@ -1,20 +1,13 @@
>  ## @file
> -#  Platform description.
> -#
> +#  The main build description file for the WhiskeylakeURvp board.
>  #
>  #  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> -#
>  ##
> 
>  [Defines]
> -  #
> -  # Set platform specific package/folder name, same as passed from
> PREBUILD script.
> -  # PLATFORM_PACKAGE would be the same as PLATFORM_NAME as well
> as package build folder
> -  # DEFINE only takes effect at R9 DSC and FDF.
> -  #
>    DEFINE      PLATFORM_PACKAGE          = MinPlatformPkg
>    DEFINE      PLATFORM_SI_PACKAGE       = CoffeelakeSiliconPkg
>    DEFINE      PLATFORM_SI_BIN_PACKAGE   = CoffeelakeSiliconBinPkg
> @@ -24,7 +17,7 @@
>    DEFINE      PROJECT                   =
> $(PLATFORM_BOARD_PACKAGE)/$(BOARD)
> 
>    #
> -  # Platform On/Off features are defined here
> +  # Include PCD configuration for this board.
>    #
>    !include OpenBoardPkgPcd.dsc
> 
> @@ -42,8 +35,6 @@
>    SUPPORTED_ARCHITECTURES             = IA32|X64
>    BUILD_TARGETS                       = DEBUG|RELEASE
>    SKUID_IDENTIFIER                    = ALL
> -
> -
>    FLASH_DEFINITION                    =
> $(PROJECT)/OpenBoardPkg.fdf
> 
>    FIX_LOAD_TOP_MEMORY_ADDRESS         = 0x0
> @@ -56,163 +47,238 @@
> 
> 
> ################################################################
> ################
>  #
> -# SKU Identification section - list of all SKU IDs supported by this
> -#                              Platform.
> +# SKU Identification section - list of all SKU IDs supported by this board.
>  #
> 
> ################################################################
> ################
>  [SkuIds]
> -  0|DEFAULT              # The entry: 0|DEFAULT is reserved and
> always required.
> +  0|DEFAULT              # 0|DEFAULT is reserved and always required.
>    0x60|WhiskeylakeURvp
> 
> 
> ################################################################
> ################
>  #
> -# Library Class section - list of all Library Classes needed by this Platform.
> +# Includes section - other DSC file contents included for this board build.
>  #
> 
> ################################################################
> ################
> 
> -  !include $(PLATFORM_PACKAGE)/Include/Dsc/CoreCommonLib.dsc
> -  !include $(PLATFORM_PACKAGE)/Include/Dsc/CorePeiLib.dsc
> -  !include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeLib.dsc
> +#######################################
> +# Library Includes
> +#######################################
> +!include $(PLATFORM_PACKAGE)/Include/Dsc/CoreCommonLib.dsc
> +!include $(PLATFORM_PACKAGE)/Include/Dsc/CorePeiLib.dsc
> +!include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeLib.dsc
> +!include $(PLATFORM_SI_PACKAGE)/SiPkgCommonLib.dsc
> +!include $(PLATFORM_SI_PACKAGE)/SiPkgPeiLib.dsc
> +!include $(PLATFORM_SI_PACKAGE)/SiPkgDxeLib.dsc
> +
> +#######################################
> +# Component Includes
> +#######################################
> +[Components.IA32]
> +!include $(PLATFORM_PACKAGE)/Include/Dsc/CorePeiInclude.dsc
> +!include $(PLATFORM_SI_PACKAGE)/SiPkgPei.dsc
> +
> +[Components.X64]
> +!include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc
> +!include $(PLATFORM_SI_PACKAGE)/SiPkgDxe.dsc
> +
> +#######################################
> +# Build Option Includes
> +#######################################
> +!include $(PLATFORM_SI_PACKAGE)/SiPkgBuildOption.dsc
> +!include OpenBoardPkgBuildOption.dsc
> +
> +###############################################################
> #################
> +#
> +# Library Class section - list of all Library Classes needed by this board.
> +#
> +###############################################################
> #################
> 
>  [LibraryClasses.common]
> -
> -  PeiLib|$(PLATFORM_PACKAGE)/Library/PeiLib/PeiLib.inf
> -
> ReportFvLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/PeiReportFvLib/Pei
> ReportFvLib.inf
> -
> -
> PciHostBridgeLib|$(PLATFORM_PACKAGE)/Pci/Library/PciHostBridgeLibSimple
> /PciHostBridgeLibSimple.inf
> -
> PciSegmentInfoLib|$(PLATFORM_PACKAGE)/Pci/Library/PciSegmentInfoLibSim
> ple/PciSegmentInfoLibSimple.inf
> -
> PlatformBootManagerLib|$(PLATFORM_PACKAGE)/Bds/Library/DxePlatformB
> ootManagerLib/DxePlatformBootManagerLib.inf
> -
> I2cAccessLib|$(PLATFORM_BOARD_PACKAGE)/Library/PeiI2cAccessLib/PeiI2cA
> ccessLib.inf
> -
> GpioExpanderLib|$(PLATFORM_BOARD_PACKAGE)/Library/BaseGpioExpande
> rLib/BaseGpioExpanderLib.inf
> -
> -
> PlatformHookLib|$(PROJECT)/Library/BasePlatformHookLib/BasePlatformHo
> okLib.inf
> -
> -
> FspWrapperHobProcessLib|$(PLATFORM_PACKAGE)/FspWrapper/Library/PeiF
> spWrapperHobProcessLib/PeiFspWrapperHobProcessLib.inf
> -
> PlatformSecLib|$(PLATFORM_BOARD_PACKAGE)/FspWrapper/Library/SecFsp
> WrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
> -
> +  #######################################
> +  # Edk2 Packages
> +  #######################################
> 
> FspWrapperApiLib|IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/Bas
> eFspWrapperApiLib.inf
> 
> FspWrapperApiTestLib|IntelFsp2WrapperPkg/Library/PeiFspWrapperApiTestL
> ib/PeiFspWrapperApiTestLib.inf
> 
> -
> FspWrapperPlatformLib|$(PLATFORM_PACKAGE)/FspWrapper/Library/PeiFsp
> WrapperPlatformLib/PeiFspWrapperPlatformLib.inf
> -
> SiliconPolicyUpdateLib|$(PLATFORM_BOARD_PACKAGE)/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> -
> +  #######################################
> +  # Silicon Initialization Package
> +  #######################################
> 
> ConfigBlockLib|$(PLATFORM_SI_PACKAGE)/Library/BaseConfigBlockLib/BaseC
> onfigBlockLib.inf
> -
> BoardInitLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/BoardInitLibNull/B
> oardInitLibNull.inf
> -
> TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLibNu
> ll/TestPointCheckLibNull.inf
> -
> -  # Tbt
> -  !if gBoardModuleTokenSpaceGuid.PcdTbtEnable == TRUE
> -
> TbtCommonLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/PeiDx
> eSmmTbtCommonLib/TbtCommonLib.inf
> -  !endif
> -
> DxeTbtPolicyLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/DxeTb
> tPolicyLib/DxeTbtPolicyLib.inf
> -  #
> -  # Silicon Init Package
> -  #
> -  !include $(PLATFORM_SI_PACKAGE)/SiPkgCommonLib.dsc
> -
> PchHsioLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/PeiDxeSmmPchHsioLib/Pe
> iDxeSmmPchHsioLib.inf
> 
> MmPciLib|$(PLATFORM_SI_PACKAGE)/Library/PeiDxeSmmMmPciLib/PeiDxeS
> mmMmPciLib.inf
> +
> PchHsioLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/PeiDxeSmmPchHsioLib/Pe
> iDxeSmmPchHsioLib.inf
> 
> PchPmcLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/PeiDxeSmmPchPmcLib/Pei
> DxeSmmPchPmcLib.inf
> 
> -
> TimerLib|$(PLATFORM_BOARD_PACKAGE)/Library/AcpiTimerLib/BaseAcpiTim
> erLib.inf
> -
> -[LibraryClasses.IA32]
> -  #
> -  # PEI phase common
> -  #
> -
> SiliconPolicyInitLib|$(PLATFORM_BOARD_PACKAGE)/FspWrapper/Library/Pei
> FspPolicyInitLib/PeiFspPolicyInitLib.inf
> +  #####################################
> +  # Platform Package
> +  #####################################
> +
> BoardInitLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/BoardInitLibNull/B
> oardInitLibNull.inf
> +
> FspWrapperHobProcessLib|$(PLATFORM_PACKAGE)/FspWrapper/Library/PeiF
> spWrapperHobProcessLib/PeiFspWrapperHobProcessLib.inf
> 
> FspWrapperPlatformLib|$(PLATFORM_PACKAGE)/FspWrapper/Library/PeiFsp
> WrapperPlatformLib/PeiFspWrapperPlatformLib.inf
> -  !if $(TARGET) == DEBUG
> -
> TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib/P
> eiTestPointCheckLib.inf
> -  !endif
> -
> TestPointLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointLib/PeiTestPointLi
> b.inf
> -
> MultiBoardInitSupportLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/Mult
> iBoardInitSupportLib/PeiMultiBoardInitSupportLib.inf
> -
> BoardInitLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/MultiBoardInitSup
> portLib/PeiMultiBoardInitSupportLib.inf
> -
> TimerLib|$(PLATFORM_BOARD_PACKAGE)/Library/AcpiTimerLib/BaseAcpiTim
> erLib.inf
> +
> PciHostBridgeLib|$(PLATFORM_PACKAGE)/Pci/Library/PciHostBridgeLibSimple
> /PciHostBridgeLibSimple.inf
> +
> PciSegmentInfoLib|$(PLATFORM_PACKAGE)/Pci/Library/PciSegmentInfoLibSim
> ple/PciSegmentInfoLibSimple.inf
> +  PeiLib|$(PLATFORM_PACKAGE)/Library/PeiLib/PeiLib.inf
> +
> PlatformBootManagerLib|$(PLATFORM_PACKAGE)/Bds/Library/DxePlatformB
> ootManagerLib/DxePlatformBootManagerLib.inf
> +
> ReportFvLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/PeiReportFvLib/Pei
> ReportFvLib.inf
> +
> TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLibNu
> ll/TestPointCheckLibNull.inf
> +
> +  #######################################
> +  # Board Package
> +  #######################################
> +
> GpioExpanderLib|$(PLATFORM_BOARD_PACKAGE)/Library/BaseGpioExpande
> rLib/BaseGpioExpanderLib.inf
> 
> HdaVerbTableLib|$(PLATFORM_BOARD_PACKAGE)/Library/PeiHdaVerbTableLi
> b/PeiHdaVerbTableLib.inf
> +
> I2cAccessLib|$(PLATFORM_BOARD_PACKAGE)/Library/PeiI2cAccessLib/PeiI2cA
> ccessLib.inf
> +
> PlatformSecLib|$(PLATFORM_BOARD_PACKAGE)/FspWrapper/Library/SecFsp
> WrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
> +
> TimerLib|$(PLATFORM_BOARD_PACKAGE)/Library/AcpiTimerLib/BaseAcpiTim
> erLib.inf
> +  # Thunderbolt
> +!if gBoardModuleTokenSpaceGuid.PcdTbtEnable == TRUE
> +
> TbtCommonLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/PeiDx
> eSmmTbtCommonLib/TbtCommonLib.inf
> +!endif
> 
> -  # Tbt
> -  !if gBoardModuleTokenSpaceGuid.PcdTbtEnable == TRUE
> -
> PeiTbtPolicyLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/PeiTbt
> PolicyLib/PeiTbtPolicyLib.inf
> -
> PeiDTbtInitLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/Private/
> PeiDTbtInitLib/PeiDTbtInitLib.inf
> -  !endif
> -
> -  #
> -  # Silicon Init Package
> -  #
> -  !include $(PLATFORM_SI_PACKAGE)/SiPkgPeiLib.dsc
> -
> PeiPolicyInitLib|$(PLATFORM_BOARD_PACKAGE)/Policy/Library/PeiPolicyInitLi
> b/PeiPolicyInitLib.inf
> -
> PeiPolicyBoardConfigLib|$(PROJECT)/Library/PeiPolicyBoardConfigLib/PeiPoli
> cyBoardConfigLib.inf
> -
> PeiPolicyUpdateLib|$(PLATFORM_BOARD_PACKAGE)/Policy/Library/PeiPolicy
> UpdateLib/PeiPolicyUpdateLib.inf
> -
> PeiPlatformHookLib|$(PROJECT)/Library/PeiPlatformHookLib/PeiPlatformHoo
> klib.inf
> -  !if $(TARGET) == DEBUG
> -
> GpioCheckConflictLib|$(PROJECT)/Library/BaseGpioCheckConflictLib/BaseGp
> ioCheckConflictLib.inf
> -  !else
> -
> GpioCheckConflictLib|$(PROJECT)/Library/BaseGpioCheckConflictLibNull/Bas
> eGpioCheckConflictLibNull.inf
> -  !endif
> +  #######################################
> +  # Board-specific
> +  #######################################
> +
> PlatformHookLib|$(PROJECT)/Library/BasePlatformHookLib/BasePlatformHo
> okLib.inf
> 
>  [LibraryClasses.IA32.SEC]
> +  #######################################
> +  # Platform Package
> +  #######################################
> 
> TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib/S
> ecTestPointCheckLib.inf
> 
> SecBoardInitLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/SecBoardInitLi
> bNull/SecBoardInitLibNull.inf
> +
> +  #######################################
> +  # Board Package
> +  #######################################
> +
> SiliconPolicyInitLib|$(PLATFORM_BOARD_PACKAGE)/FspWrapper/Library/Pei
> FspPolicyInitLib/PeiFspPolicyInitLib.inf
> +
> SiliconPolicyUpdateLib|$(PLATFORM_BOARD_PACKAGE)/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> +
> TimerLib|$(PLATFORM_BOARD_PACKAGE)/Library/AcpiTimerLib/BaseAcpiTim
> erLib.inf
> +
> +[LibraryClasses.common.PEIM]
> +  #######################################
> +  # Platform Package
> +  #######################################
> +
> BoardInitLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/MultiBoardInitSup
> portLib/PeiMultiBoardInitSupportLib.inf
> +
> FspWrapperPlatformLib|$(PLATFORM_PACKAGE)/FspWrapper/Library/PeiFsp
> WrapperPlatformLib/PeiFspWrapperPlatformLib.inf
> +
> MultiBoardInitSupportLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/Mult
> iBoardInitSupportLib/PeiMultiBoardInitSupportLib.inf
> +
> TestPointLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointLib/PeiTestPointLi
> b.inf
> +!if $(TARGET) == DEBUG
> +
> TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib/P
> eiTestPointCheckLib.inf
> +!endif
> +
> +  #######################################
> +  # Board Package
> +  #######################################
> +  # Thunderbolt
> +!if gBoardModuleTokenSpaceGuid.PcdTbtEnable == TRUE
> +
> PeiDTbtInitLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/Private/
> PeiDTbtInitLib/PeiDTbtInitLib.inf
> +
> PeiTbtPolicyLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/PeiTbt
> PolicyLib/PeiTbtPolicyLib.inf
> +!endif
> +
> PeiPolicyInitLib|$(PLATFORM_BOARD_PACKAGE)/Policy/Library/PeiPolicyInitLi
> b/PeiPolicyInitLib.inf
> +
> PeiPolicyUpdateLib|$(PLATFORM_BOARD_PACKAGE)/Policy/Library/PeiPolicy
> UpdateLib/PeiPolicyUpdateLib.inf
> +
> SiliconPolicyInitLib|$(PLATFORM_BOARD_PACKAGE)/FspWrapper/Library/Pei
> FspPolicyInitLib/PeiFspPolicyInitLib.inf
> +
> SiliconPolicyUpdateLib|$(PLATFORM_BOARD_PACKAGE)/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> 
> TimerLib|$(PLATFORM_BOARD_PACKAGE)/Library/AcpiTimerLib/BaseAcpiTim
> erLib.inf
> 
> -[LibraryClasses.X64]
> -  #
> -  # DXE phase common
> -  #
> -
> FspWrapperPlatformLib|$(PLATFORM_PACKAGE)/FspWrapper/Library/DxeFsp
> WrapperPlatformLib/DxeFspWrapperPlatformLib.inf
> -  !if $(TARGET) == DEBUG
> -
> TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib/D
> xeTestPointCheckLib.inf
> -  !endif
> -
> TestPointLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointLib/DxeTestPointL
> ib.inf
> -
> MultiBoardInitSupportLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/Mult
> iBoardInitSupportLib/DxeMultiBoardInitSupportLib.inf
> +  #######################################
> +  # Board-specific
> +  #######################################
> +
> PeiPlatformHookLib|$(PROJECT)/Library/PeiPlatformHookLib/PeiPlatformHoo
> klib.inf
> +
> PeiPolicyBoardConfigLib|$(PROJECT)/Library/PeiPolicyBoardConfigLib/PeiPoli
> cyBoardConfigLib.inf
> +
> +!if $(TARGET) == DEBUG
> +
> GpioCheckConflictLib|$(PROJECT)/Library/BaseGpioCheckConflictLib/BaseGp
> ioCheckConflictLib.inf
> +!else
> +
> GpioCheckConflictLib|$(PROJECT)/Library/BaseGpioCheckConflictLibNull/Bas
> eGpioCheckConflictLibNull.inf
> +!endif
> +
> +[LibraryClasses.common.DXE_DRIVER]
> +  #######################################
> +  # Edk2 Packages
> +  #######################################
> +
> DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.i
> nf
> +
> +  #######################################
> +  # Platform Package
> +  #######################################
> +
> BoardAcpiTableLib|$(PLATFORM_PACKAGE)/Acpi/Library/MultiBoardAcpiSup
> portLib/DxeMultiBoardAcpiSupportLib.inf
> 
> BoardInitLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/MultiBoardInitSup
> portLib/DxeMultiBoardInitSupportLib.inf
> +
> FspWrapperPlatformLib|$(PLATFORM_PACKAGE)/FspWrapper/Library/DxeFsp
> WrapperPlatformLib/DxeFspWrapperPlatformLib.inf
> 
> MultiBoardAcpiSupportLib|$(PLATFORM_PACKAGE)/Acpi/Library/MultiBoard
> AcpiSupportLib/DxeMultiBoardAcpiSupportLib.inf
> -
> BoardAcpiTableLib|$(PLATFORM_PACKAGE)/Acpi/Library/MultiBoardAcpiSup
> portLib/DxeMultiBoardAcpiSupportLib.inf
> +
> MultiBoardInitSupportLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/Mult
> iBoardInitSupportLib/DxeMultiBoardInitSupportLib.inf
> +
> TestPointLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointLib/DxeTestPointL
> ib.inf
> 
> -
> DxePolicyBoardConfigLib|$(PROJECT)/Library/DxePolicyBoardConfigLib/DxeP
> olicyBoardConfigLib.inf
> +!if $(TARGET) == DEBUG
> +
> TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib/D
> xeTestPointCheckLib.inf
> +!endif
> +
> +  #######################################
> +  # Board Package
> +  #######################################
> 
> DxePolicyUpdateLib|$(PLATFORM_BOARD_PACKAGE)/Policy/Library/DxePolic
> yUpdateLib/DxePolicyUpdateLib.inf
> -  #
> -  # Silicon Init Package
> -  #
> -  !include $(PLATFORM_SI_PACKAGE)/SiPkgDxeLib.dsc
> +
> DxeTbtPolicyLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/DxeTb
> tPolicyLib/DxeTbtPolicyLib.inf
> +
> +  #######################################
> +  # Board-specific
> +  #######################################
> +
> DxePolicyBoardConfigLib|$(PROJECT)/Library/DxePolicyBoardConfigLib/DxeP
> olicyBoardConfigLib.inf
> +
> +[LibraryClasses.X64.DXE_RUNTIME_DRIVER]
> +  #######################################
> +  # Edk2 Packages
> +  #######################################
> 
> DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.i
> nf
> 
> +  #######################################
> +  # Silicon Initialization Package
> +  #######################################
> +
> ResetSystemLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/DxeRuntimeResetSys
> temLib/DxeRuntimeResetSystemLib.inf
> +
>  [LibraryClasses.X64.DXE_SMM_DRIVER]
> +  #######################################
> +  # Edk2 Packages
> +  #######################################
> +
> DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.i
> nf
> +
> +  #######################################
> +  # Silicon Initialization Package
> +  #######################################
> 
> SpiFlashCommonLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/SmmSpiFlashCo
> mmonLib/SmmSpiFlashCommonLib.inf
> -  !if $(TARGET) == DEBUG
> -
> TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib/S
> mmTestPointCheckLib.inf
> -  !endif
> -
> TestPointLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointLib/SmmTestPoin
> tLib.inf
> -
> MultiBoardAcpiSupportLib|$(PLATFORM_PACKAGE)/Acpi/Library/MultiBoard
> AcpiSupportLib/SmmMultiBoardAcpiSupportLib.inf
> +
> +  #######################################
> +  # Platform Package
> +  #######################################
> 
> BoardAcpiEnableLib|$(PLATFORM_PACKAGE)/Acpi/Library/MultiBoardAcpiSu
> pportLib/SmmMultiBoardAcpiSupportLib.inf
> -
> DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.i
> nf
> -
> -[LibraryClasses.X64.DXE_RUNTIME_DRIVER]
> -
> ResetSystemLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/DxeRuntimeResetSys
> temLib/DxeRuntimeResetSystemLib.inf
> -
> DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.i
> nf
> +
> MultiBoardAcpiSupportLib|$(PLATFORM_PACKAGE)/Acpi/Library/MultiBoard
> AcpiSupportLib/SmmMultiBoardAcpiSupportLib.inf
> +
> TestPointLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointLib/SmmTestPoin
> tLib.inf
> +!if $(TARGET) == DEBUG
> +
> TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib/S
> mmTestPointCheckLib.inf
> +!endif
> 
>  [Components.IA32]
> -  #
> -  # Common
> -  #
> -  !include $(PLATFORM_PACKAGE)/Include/Dsc/CorePeiInclude.dsc
> -
> -  #
> -  # FSP wrapper SEC Core
> -  #
> +  #######################################
> +  # Edk2 Packages
> +  #######################################
>    UefiCpuPkg/SecCore/SecCore.inf {
>      <LibraryClasses>
>        PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
>    }
> 
>    #
> -  # Silicon
> +  # In FSP API mode the policy has to be installed before FSP Wrapper
> updating UPD.
> +  # Add policy as dependency for FSP Wrapper
>    #
> -  !include $(PLATFORM_SI_PACKAGE)/SiPkgPei.dsc
> +  IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
> +  IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
> 
> -  #
> -  # Platform
> -  #
> +  #######################################
> +  # Silicon Initialization Package
> +  #######################################
> +  IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/IntelVTdPmrPei.inf
> +
> IntelSiliconPkg/Feature/VTd/PlatformVTdInfoSamplePei/PlatformVTdInfoSam
> plePei.inf
> +
> +  #######################################
> +  # Platform Package
> +  #######################################
>    $(PLATFORM_PACKAGE)/PlatformInit/ReportFv/ReportFvPei.inf
> 
> $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf
> {
>      <LibraryClasses>
> @@ -223,12 +289,7 @@
>        !endif
>        NULL|$(PROJECT)/Library/BaseFuncLib/BaseFuncLib.inf
>    }
> -  IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
> -
> $(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPreMe
> m.inf {
> -    <LibraryClasses>
> -
> SiliconPolicyInitLib|MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLib
> Null/SiliconPolicyInitLibNull.inf
> -
> SiliconPolicyUpdateLib|MinPlatformPkg/PlatformInit/Library/SiliconPolicyUp
> dateLibNull/SiliconPolicyUpdateLibNull.inf
> -  }
> +
> 
> $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPostMem.in
> f {
>      <LibraryClasses>
>        !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport == FALSE
> @@ -237,51 +298,43 @@
> 
> NULL|$(PROJECT)/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
>        !endif
>    }
> -  IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
> -#to do
> $(PLATFORM_PACKAGE)/FspWrapper/FspWrapperPeim/FspWrapperPeim.inf
> +
> +
> $(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPreMe
> m.inf {
> +    <LibraryClasses>
> +
> SiliconPolicyInitLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/SiliconPolicy
> InitLibNull/SiliconPolicyInitLibNull.inf
> +
> SiliconPolicyUpdateLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/SiliconP
> olicyUpdateLibNull/SiliconPolicyUpdateLibNull.inf
> +  }
> 
> $(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMe
> m.inf {
>      <LibraryClasses>
> -
> SiliconPolicyInitLib|MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLib
> Null/SiliconPolicyInitLibNull.inf
> -
> SiliconPolicyUpdateLib|MinPlatformPkg/PlatformInit/Library/SiliconPolicyUp
> dateLibNull/SiliconPolicyUpdateLibNull.inf
> +
> SiliconPolicyInitLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/SiliconPolicy
> InitLibNull/SiliconPolicyInitLibNull.inf
> +
> SiliconPolicyUpdateLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/SiliconP
> olicyUpdateLibNull/SiliconPolicyUpdateLibNull.inf
>    }
> 
> -  #
> -  # Security
> -  #
> +!if gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable == TRUE
> +  $(PLATFORM_PACKAGE)/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> +!endif
> 
> -  !if gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable == TRUE
> -    $(PLATFORM_PACKAGE)/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> -  !endif
> -
> -  IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/IntelVTdPmrPei.inf
> -
> IntelSiliconPkg/Feature/VTd/PlatformVTdInfoSamplePei/PlatformVTdInfoSam
> plePei.inf
> -
> -  # Tbt
> -  !if gBoardModuleTokenSpaceGuid.PcdTbtEnable == TRUE
> -    $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
> -  !endif
> +  #######################################
> +  # Board Package
> +  #######################################
> +  # Thunderbolt
> +!if gBoardModuleTokenSpaceGuid.PcdTbtEnable == TRUE
> +  $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
> +!endif
> 
>  [Components.X64]
> -
> -  #
> -  # Common
> -  #
> -  !include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc
> -
> -  $(PLATFORM_SI_PACKAGE)/SystemAgent/SaInit/Dxe/SaInitDxe.inf
> -
> -  UefiCpuPkg/CpuDxe/CpuDxe.inf
> +  #######################################
> +  # Edk2 Packages
> +  #######################################
> +  IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
> +  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
> +  MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
> +  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
>    MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
> -
>    MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
> -  MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
> -  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
> 
> MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.
> inf
> -  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
> +  UefiCpuPkg/CpuDxe/CpuDxe.inf
> 
> -  #
> -  # Shell
> -  #
>    ShellPkg/Application/Shell/Shell.inf {
>     <PcdsFixedAtBuild>
>       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> @@ -301,57 +354,7 @@
>       ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
>    }
> 
> -  #
> -  # Silicon
> -  #
> -  !include $(PLATFORM_SI_PACKAGE)/SiPkgDxe.dsc
> -
> -  # Tbt
> -  !if gBoardModuleTokenSpaceGuid.PcdTbtEnable == TRUE
> -    $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Smm/TbtSmm.inf
> -    $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
> -    $(PLATFORM_BOARD_PACKAGE)/Features/PciHotPlug/PciHotPlug.inf
> -  !endif
> -
> -  #
> -  # Platform
> -  #
> -  $(PLATFORM_BOARD_PACKAGE)/Policy/PolicyInitDxe/PolicyInitDxe.inf{
> -    <LibraryClasses>
> -      NULL|$(PROJECT)/Library/BaseFuncLib/BaseFuncLib.inf
> -  }
> -
> -  $(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.inf
> {
> -    <LibraryClasses>
> -
> SiliconPolicyInitLib|MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLib
> Null/SiliconPolicyInitLibNull.inf
> -
> SiliconPolicyUpdateLib|MinPlatformPkg/PlatformInit/Library/SiliconPolicyUp
> dateLibNull/SiliconPolicyUpdateLibNull.inf
> -  }
> -  $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf
> -  IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
> -
> -
> $(PLATFORM_PACKAGE)/FspWrapper/SaveMemoryConfig/SaveMemoryConfig
> .inf
> -
> -  $(PLATFORM_PACKAGE)/Test/TestPointStubDxe/TestPointStubDxe.inf
> -  $(PLATFORM_PACKAGE)/Test/TestPointDumpApp/TestPointDumpApp.inf
> -
> -  #
> -  # OS Boot
> -  #
> -  !if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
> -    $(PLATFORM_PACKAGE)/Acpi/AcpiTables/AcpiPlatform.inf
> -  $(PLATFORM_BOARD_PACKAGE)/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
> -  $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf {
> -    <LibraryClasses>
> -      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport == FALSE
> -
> BoardAcpiEnableLib|$(PROJECT)/Library/BoardAcpiLib/SmmBoardAcpiEnabl
> eLib.inf
> -      !else
> -
> NULL|$(PROJECT)/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
> -      !endif
> -  }
> -
> -  $(PLATFORM_PACKAGE)/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> -
> $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf
> -
> +!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
>    UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf {
>      <PcdsPatchableInModule>
>        gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80080046
> @@ -360,25 +363,66 @@
> 
> DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.i
> nf
>        !endif
>    }
> +!endif
> 
> -  !endif
> -
> -  #
> -  # Security
> -  #
> -  $(PLATFORM_PACKAGE)/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf
> -
> -  !if gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable == TRUE
> -    $(PLATFORM_PACKAGE)/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
> -  !endif
> -
> +  #######################################
> +  # Silicon Initialization Package
> +  #######################################
>    IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf
> -
> -  #
> -  # Other
> -  #
> +  $(PLATFORM_SI_PACKAGE)/SystemAgent/SaInit/Dxe/SaInitDxe.inf
>    $(PLATFORM_SI_BIN_PACKAGE)/Microcode/MicrocodeUpdates.inf
> 
> -  !include $(PLATFORM_SI_PACKAGE)/SiPkgBuildOption.dsc
> -  !include OpenBoardPkgBuildOption.dsc
> +  #######################################
> +  # Platform Package
> +  #######################################
> +
> $(PLATFORM_PACKAGE)/FspWrapper/SaveMemoryConfig/SaveMemoryConfig
> .inf
> +  $(PLATFORM_PACKAGE)/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf
> +  $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf
> +  $(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.inf
> {
> +    <LibraryClasses>
> +
> SiliconPolicyInitLib|MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLib
> Null/SiliconPolicyInitLibNull.inf
> +
> SiliconPolicyUpdateLib|MinPlatformPkg/PlatformInit/Library/SiliconPolicyUp
> dateLibNull/SiliconPolicyUpdateLibNull.inf
> +  }
> +  $(PLATFORM_PACKAGE)/Test/TestPointDumpApp/TestPointDumpApp.inf
> +  $(PLATFORM_PACKAGE)/Test/TestPointStubDxe/TestPointStubDxe.inf
> 
> +!if gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable == TRUE
> +  $(PLATFORM_PACKAGE)/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
> +!endif
> +
> +!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
> +
> +  $(PLATFORM_PACKAGE)/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> +
> $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf
> +
> +  $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf {
> +    <LibraryClasses>
> +      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport == FALSE
> +
> BoardAcpiEnableLib|$(PROJECT)/Library/BoardAcpiLib/SmmBoardAcpiEnabl
> eLib.inf
> +      !else
> +
> NULL|$(PROJECT)/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
> +      !endif
> +  }
> +
> +  $(PLATFORM_PACKAGE)/Acpi/AcpiTables/AcpiPlatform.inf
> +
> +!endif
> +
> +  #######################################
> +  # Board Package
> +  #######################################
> +  $(PLATFORM_BOARD_PACKAGE)/Policy/PolicyInitDxe/PolicyInitDxe.inf{
> +    <LibraryClasses>
> +      NULL|$(PROJECT)/Library/BaseFuncLib/BaseFuncLib.inf
> +  }
> +
> +  # Thunderbolt
> +!if gBoardModuleTokenSpaceGuid.PcdTbtEnable == TRUE
> +  $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Smm/TbtSmm.inf
> +  $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
> +  $(PLATFORM_BOARD_PACKAGE)/Features/PciHotPlug/PciHotPlug.inf
> +!endif
> +
> +!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
> +  $(PLATFORM_BOARD_PACKAGE)/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
> +!endif
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kgPcd.dsc
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kgPcd.dsc
> index 24e3da6686..5cf0aa9d86 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kgPcd.dsc
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kgPcd.dsc
> @@ -1,22 +1,24 @@
>  ## @file
> -#  Platform description.
> +#  PCD configuration build description file for the WhiskeylakeURvp board.
>  #
> +# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> -#
> -#  SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> 
> ################################################################
> ################
>  #
> -# Pcd Section - list of all EDK II PCD Entries defined by this Platform
> +# Pcd Section - list of all PCD Entries used by this board.
>  #
> 
> ################################################################
> ################
> -[PcdsFixedAtBuild]
> +
> +[PcdsFixedAtBuild.common]
> +  ######################################
> +  # Key Boot Stage and FSP configuration
> +  ######################################
>    #
> -  # Please select BootStage here.
> +  # Please select the Boot Stage here.
>    # Stage 1 - enable debug (system deadloop after debug init)
>    # Stage 2 - mem init (system deadloop after mem init)
>    # Stage 3 - boot to shell only
> @@ -25,56 +27,74 @@
>    #
>    gMinPlatformPkgTokenSpaceGuid.PcdBootStage|4
> 
> +  #
> +  # 0: FSP Wrapper is running in Dispatch mode.
> +  # 1: FSP Wrapper is running in API mode.
> +  # Note: Dispatch mode is currently NOT supported for this board.
> +  #
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection|1
> +
> +  #
> +  # FALSE: The board is not a FSP wrapper (FSP binary not used)
> +  # TRUE:  The board is a FSP wrapper (FSP binary is used)
> +  #
> +  gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperBootMode|TRUE
> +
> +  #
> +  # FSP Base address PCD will be updated in FDF basing on flash map.
> +  #
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress|0
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress|0
> +
> +  gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase|0xFEF00000
> +  gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamSize|0x00040000
> +  gSiPkgTokenSpaceGuid.PcdTemporaryRamBase|0xFEF80000
> +  gSiPkgTokenSpaceGuid.PcdTemporaryRamSize|0x00040000
> +  gSiPkgTokenSpaceGuid.PcdTsegSize|0x1000000
> +
> +  #
> +  # FSP API mode does not share stack with the boot loader,
> +  # so FSP needs more temporary memory for FSP heap + stack size.
> +  #
> +  gIntelFsp2PkgTokenSpaceGuid.PcdFspTemporaryRamSize|0x26000
> +  #
> +  # FSP API mode does not need to enlarge the boot loader stack size
> +  # since the stacks are separate.
> +  #
> +  gSiPkgTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0x20000
> +
> +  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE0000000
> +
> gMinPlatformPkgTokenSpaceGuid.PcdPciExpressRegionLength|0x10000000
> +
>  [PcdsFeatureFlag.common]
> -  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
> -  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
> -  gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
> -  gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
> -  gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
> -
> -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 1
> -  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|TRUE
> -!endif
> -
> -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 2
> -  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
> -  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|TRUE
> -!endif
> -
> -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 3
> -  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
> -  gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|TRUE
> -!endif
> -
> -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 4
> -  gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
> -!endif
> -
> -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 5
> -  gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE
> -  gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|TRUE
> +  ######################################
> +  # Edk2 Configuration
> +  ######################################
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSection
> First|FALSE
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE
> +!if $(TARGET) == RELEASE
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
> +!else
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE
>  !endif
> -
> -  gBoardModuleTokenSpaceGuid.PcdTbtEnable|FALSE
> -  #
> -  # More fine granularity control below:
> -  #
> -
> -  gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport|TRUE
> -
> -#
> -# TRUE is ENABLE. FALSE is DISABLE.
> -#
> -#
> -# BIOS build switches configuration
> -#
> +  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE
> +  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmProfileEnable|FALSE
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
> +
> +  ######################################
> +  # Silicon Configuration
> +  ######################################
> +  # Build switches
>    gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE
> 
> -# CPU
> +  # CPU
> +  gSiPkgTokenSpaceGuid.PcdCflCpuEnable|TRUE
>    gSiPkgTokenSpaceGuid.PcdSourceDebugEnable|FALSE
> 
> -# SA
> +  # SA
> +  gSiPkgTokenSpaceGuid.PcdGnaEnable|TRUE
>    gSiPkgTokenSpaceGuid.PcdIgdEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdIpuEnable|TRUE
>    gSiPkgTokenSpaceGuid.PcdPegEnable|TRUE
>    gSiPkgTokenSpaceGuid.PcdSgEnable|TRUE
>    gSiPkgTokenSpaceGuid.PcdSaDmiEnable|TRUE
> @@ -82,166 +102,132 @@
>    gSiPkgTokenSpaceGuid.PcdVtdEnable|TRUE
>    gSiPkgTokenSpaceGuid.PcdPeiDisplayEnable|TRUE
> 
> -# ME
> +  # ME
>    gSiPkgTokenSpaceGuid.PcdAtaEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdPttEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdPttEnable|FALSE
>    gSiPkgTokenSpaceGuid.PcdJhiEnable|TRUE
> 
> +  # Others
>    gSiPkgTokenSpaceGuid.PcdAcpiEnable|TRUE
>    gSiPkgTokenSpaceGuid.PcdBdatEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdIntegratedTouchEnable|TRUE
>    gSiPkgTokenSpaceGuid.PcdCpuPowerOnConfigEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdSiCsmEnable|FALSE
> -  gSiPkgTokenSpaceGuid.PcdTraceHubEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdIntegratedTouchEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdOcWdtEnable|TRUE
>    gSiPkgTokenSpaceGuid.PcdOverclockEnable|TRUE
>    gSiPkgTokenSpaceGuid.PcdPpmEnable|TRUE
>    gSiPkgTokenSpaceGuid.PcdS3Enable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdSerialIoUartEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdSiCatalogDebugEnable|FALSE
> +  gSiPkgTokenSpaceGuid.PcdSiCsmEnable|FALSE
>    gSiPkgTokenSpaceGuid.PcdSmbiosEnable|TRUE
>    gSiPkgTokenSpaceGuid.PcdSmmVariableEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdUseHpetTimer|TRUE
> # TRUE - HPET / FALSE - 8254 timer is used.
> -  gSiPkgTokenSpaceGuid.PcdOcWdtEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdSiCatalogDebugEnable|FALSE
> +  gSiPkgTokenSpaceGuid.PcdTraceHubEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdUseHpetTimer|TRUE   # TRUE - HPET / FALSE
> - 8254 timer is used.
> 
> -  gSiPkgTokenSpaceGuid.PcdSerialIoUartEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdCflCpuEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdIpuEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdGnaEnable|TRUE
> +  ######################################
> +  # Platform Configuration
> +  ######################################
> +  gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
> +  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
> +  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
> +  gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE
> +  gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
> +  gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
> 
> -#
> -# Override some PCDs for specific build requirements.
> -#
> -  #
> -  # Disable USB debug message when Source Level Debug is enabled
> -  # because they cannot be enabled at the same time.
> -  #
> +!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 1
> +  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|TRUE
> +!endif
> 
> -    gSiPkgTokenSpaceGuid.PcdPttEnable|FALSE
> +!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 2
> +  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
> +  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|TRUE
> +!endif
> 
> -  !if $(TARGET) == DEBUG
> -    gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE
> -  !else
> -    gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE
> -  !endif
> +!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 3
> +  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
> +  gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|TRUE
> +!endif
> 
> -  !if $(TARGET) == DEBUG
> -    gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
> -  !else
> -    gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
> -  !endif
> +!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 4
> +  gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
> +!endif
> 
> -    gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE
> +!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 5
> +  gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE
> +  gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|TRUE
> +!endif
> 
> -
> #gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|T
> RUE
> -  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSection
> First|FALSE
> -!if $(TARGET) == RELEASE
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
> +!if $(TARGET) == DEBUG
> +  gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
>  !else
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE
> +  gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
>  !endif
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE
> -
> -  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmProfileEnable|FALSE
> -
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
> 
> +  ######################################
> +  # Board Configuration
> +  ######################################
>    gBoardModuleTokenSpaceGuid.PcdIntelGopEnable|TRUE
> +  gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport|TRUE
> +  gBoardModuleTokenSpaceGuid.PcdTbtEnable|FALSE
> 
>  [PcdsFixedAtBuild.common]
> -  gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperBootMode|TRUE
> -
> -!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
> -  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0x1
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|140
> -!endif
> -
> -!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1
> -!endif
> -
> -  gMinPlatformPkgTokenSpaceGuid.PcdMaxCpuThreadCount|2
> -  gMinPlatformPkgTokenSpaceGuid.PcdMaxCpuCoreCount|8
> -  gMinPlatformPkgTokenSpaceGuid.PcdMaxCpuSocketCount|1
> -
> -  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE0000000
> -
> gMinPlatformPkgTokenSpaceGuid.PcdPciExpressRegionLength|0x10000000
> -  gSiPkgTokenSpaceGuid.PcdPciExpressRegionLength|0x10000000
> -  gSiPkgTokenSpaceGuid.PcdTemporaryRamBase|0xFEF80000
> -  gSiPkgTokenSpaceGuid.PcdTemporaryRamSize|0x00040000
> -  gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase|0xFEF00000
> -  gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamSize|0x00040000
> -
> -  gIntelFsp2PkgTokenSpaceGuid.PcdFspTemporaryRamSize        |
> 0x00026000
> -
> -  gSiPkgTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0x20000
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x5000
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize|0x00000800
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x40
> 0
> -
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport|FALSE
> -  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|10000
> +  ######################################
> +  # Edk2 Configuration
> +  ######################################
>  !if $(TARGET) == RELEASE
>    gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0
>    gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x3
>  !else
>    gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALS
> E
>    gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
>  !endif
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable|$(T
> OP_MEMORY_ADDRESS)
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor|0x0
> +!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
> +  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0x1
> +!endif
> +
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport|FALSE
>    gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor|0x01
> -  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x20000
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor|0x0
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize|0x00000800
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable|$(T
> OP_MEMORY_ADDRESS)
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x40
> 0
> +!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|140
> +!endif
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x5000
> 
> gEfiMdeModulePkgTokenSpaceGuid.PcdReclaimVariableSpaceAtEndOfDxe|TR
> UE
> -
> -#
> -# 8MB Default
> -#
> -gSiPkgTokenSpaceGuid.PcdTsegSize|0x800000
> -
> -#
> -# 16MB TSEG in Debug build only.
> -#
> +!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1
> +!endif
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE
>  !if $(TARGET) == DEBUG
> -  gSiPkgTokenSpaceGuid.PcdTsegSize|0x1000000
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALS
> E
>  !endif
> 
> +  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoBarEnableMask|0x80
> +  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciBarRegisterOffset|0x00
>    gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciBusNumber|0x0
>    gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciDeviceNumber|0x1F
> -  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciFunctionNumber|0x2
>    gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciEnableRegisterOffset|0x44
> -  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoBarEnableMask|0x80
> -  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciBarRegisterOffset|0x00
> +  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciFunctionNumber|0x2
>    gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPortBaseAddress|0x1800
> -  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiPm1TmrOffset|0x08
>    gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPortBaseAddressMask|0xFFFC
> +  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiPm1TmrOffset|0x08
> 
> -  !if $(TARGET) == RELEASE
> -
> gMinPlatformPkgTokenSpaceGuid.PcdPlatformEfiReservedMemorySize|0x402
> -  !else
> -
> gMinPlatformPkgTokenSpaceGuid.PcdPlatformEfiReservedMemorySize|0x188
> B
> -  !endif
> +  # Specifies timeout value in microseconds for the BSP to detect all APs
> for the first time.
> +  gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds|1000
> +  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|10000
> +  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x20000
> 
> -
> -  gMinPlatformPkgTokenSpaceGuid.PcdPlatformEfiRtDataMemorySize|0x4b
> -  !if $(TARGET) == RELEASE
> -  gMinPlatformPkgTokenSpaceGuid.PcdPlatformEfiRtCodeMemorySize|0x70
> -  !else
> -  gMinPlatformPkgTokenSpaceGuid.PcdPlatformEfiRtCodeMemorySize|0xE0
> -  !endif
> -
> -  gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress|0xFFEAC000
> -  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress|0xFFDC0000
> +  #
> +  # In non-FSP build (EDK2 build) or FSP API mode below PCD are
> FixedAtBuild
> +  # (They will be DynamicEx in FSP Dispatch mode)
> +  #
> 
>    ## Specifies the size of the microcode Region.
>    # @Prompt Microcode Region size.
>    gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0
> 
> -  ## Specifies timeout value in microseconds for the BSP to detect all APs
> for the first time.
> -  # @Prompt Timeout for the BSP to detect all APs for the first time.
> -  gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds|1000
> -
>    ## Specifies the AP wait loop state during POST phase.
>    #  The value is defined as below.
>    #  1: Place AP in the Hlt-Loop state.
> @@ -250,6 +236,17 @@ gSiPkgTokenSpaceGuid.PcdTsegSize|0x800000
>    # @Prompt The AP wait loop state.
>    gUefiCpuPkgTokenSpaceGuid.PcdCpuApLoopMode|2
> 
> +  ######################################
> +  # Silicon Configuration
> +  ######################################
> +
> gSiPkgTokenSpaceGuid.PcdPciExpressRegionLength|gMinPlatformPkgTokenSp
> aceGuid.PcdPciExpressRegionLength
> +
> +  ######################################
> +  # Platform Configuration
> +  ######################################
> +  gMinPlatformPkgTokenSpaceGuid.PcdMaxCpuSocketCount|1
> +  gMinPlatformPkgTokenSpaceGuid.PcdMaxCpuCoreCount|8
> +  gMinPlatformPkgTokenSpaceGuid.PcdMaxCpuThreadCount|2
> 
>    #
>    # The PCDs are used to control the Windows SMM Security Mitigations
> Table - Protection Flags
> @@ -262,6 +259,19 @@ gSiPkgTokenSpaceGuid.PcdTsegSize|0x800000
>    #
>    gMinPlatformPkgTokenSpaceGuid.PcdWsmtProtectionFlags|0x07
> 
> +!if $(TARGET) == RELEASE
> +
> gMinPlatformPkgTokenSpaceGuid.PcdPlatformEfiReservedMemorySize|0x402
> +!else
> +
> gMinPlatformPkgTokenSpaceGuid.PcdPlatformEfiReservedMemorySize|0x188
> B
> +!endif
> +
> +  gMinPlatformPkgTokenSpaceGuid.PcdPlatformEfiRtDataMemorySize|0x4b
> +!if $(TARGET) == RELEASE
> +
> gMinPlatformPkgTokenSpaceGuid.PcdPlatformEfiRtCodeMemorySize|0x70
> +!else
> +
> gMinPlatformPkgTokenSpaceGuid.PcdPlatformEfiRtCodeMemorySize|0xE0
> +!endif
> +
>  !if gMinPlatformPkgTokenSpaceGuid.PcdBootStage == 1
>    gMinPlatformPkgTokenSpaceGuid.PcdTestPointIbvPlatformFeature|{0x03,
> 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
> 0x00, 0x00}
>  !endif
> @@ -287,75 +297,98 @@ gSiPkgTokenSpaceGuid.PcdTsegSize|0x800000
>  !endif
> 
>  [PcdsFixedAtBuild.IA32]
> +  ######################################
> +  # Edk2 Configuration
> +  ######################################
>    gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0
>    gIntelFsp2PkgTokenSpaceGuid.PcdGlobalDataPointerAddress|0xFED00148
> -  gMinPlatformPkgTokenSpaceGuid.PcdPeiPhaseStackTop|0xA0000
>    gIntelFsp2WrapperTokenSpaceGuid.PcdPeiMinMemSize|0x3800000
> 
> +  ######################################
> +  # Platform Configuration
> +  ######################################
> +  gMinPlatformPkgTokenSpaceGuid.PcdPeiPhaseStackTop|0xA0000
> +
>  [PcdsFixedAtBuild.X64]
> +  ######################################
> +  # Edk2 Configuration
> +  ######################################
> +
>    # Default platform supported RFC 4646 languages: (American) English
> 
> gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLangCodes|"en-
> US"
> 
> -
>  [PcdsPatchableInModule.common]
> +  ######################################
> +  # Edk2 Configuration
> +  ######################################
>    gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0208
>    gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
> 
> +  ######################################
> +  # Silicon Configuration
> +  ######################################
>  !if $(TARGET) == DEBUG
>    gSiPkgTokenSpaceGuid.PcdSerialIoUartDebugEnable|1
>  !endif
> 
> -[PcdsDynamicHii.X64.DEFAULT]
> -
> gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGloba
> lVariableGuid|0x0|5 # Variable: L"Timeout"
> -
> gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupp
> ort"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport"
> -
> -!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
> -
> gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGloba
> lVariableGuid|0x0|1 # Variable: L"Timeout"
> -!endif
> -
>  [PcdsDynamicDefault]
> -  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress|0xFFD50000
> -  # Platform will pre-allocate UPD buffer and pass it to FspWrapper
> -  # Those dummy address will be patched before FspWrapper executing
> -  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmUpdDataAddress|0x0
> -  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress|0x0
> -
> -  ## Specifies max supported number of Logical Processors.
> -  # @Prompt Configure max supported number of Logical Processors
> -  gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|16
> -
> -[PcdsDynamicDefault.common.DEFAULT]
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0x0
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0x0
> +  ######################################
> +  # Edk2 Configuration
> +  ######################################
>    gEfiMdeModulePkgTokenSpaceGuid.PcdAtaSmartEnable|TRUE
>    gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand|FALSE
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0x0
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0x0
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0
> +
>    #
>    #  Set video to native resolution as Windows 8 WHCK requirement.
>    #
>    gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0x0
>    gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0x0
> 
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0
> -
>    gEfiSecurityPkgTokenSpaceGuid.PcdTpm2CurrentIrqNum|0x00
> 
> -[PcdsDynamicDefault.common.DEFAULT]
> +  #
> +  # FSP Base address PCD will be updated in FDF basing on flash map.
> +  #
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress|0
> 
> -  # Tbt
> -  gBoardModuleTokenSpaceGuid.PcdDTbtGpioLevel | 0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtForcepowerGpioPad | 13
> -  gBoardModuleTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad |
> 0x02010011
> -  gBoardModuleTokenSpaceGuid.PcdDTbtWakeupSupport | 0x0
> -  gBoardModuleTokenSpaceGuid.PcdDTbtHotSMI | 0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtHotNotify | 0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtSetClkReq| 0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtAspm | 0x0
> -  gBoardModuleTokenSpaceGuid.PcdDTbtAcDcSwitch | 0x0
> +  # Platform will pre-allocate UPD buffer and pass it to FspWrapper
> +  # Those dummy address will be patched before FspWrapper executing
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmUpdDataAddress|0x0
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress|0x0
> 
> -  gBoardModuleTokenSpaceGuid.PcdRtd3Tbt | 0x1
> -  gBoardModuleTokenSpaceGuid.PcdRtd3TbtClkReq | 0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax | 26
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemRsvd | 100
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax | 28
>    gUefiCpuPkgTokenSpaceGuid.PcdCpuApTargetCstate|0
> +  gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|16
> 
> +  ######################################
> +  # Board Configuration
> +  ######################################
> +
> +  # Thunderbolt Configuration
> +  gBoardModuleTokenSpaceGuid.PcdDTbtAcDcSwitch|0x0
> +  gBoardModuleTokenSpaceGuid.PcdDTbtAspm|0x0
> +
> gBoardModuleTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad|0x02010011
> +  gBoardModuleTokenSpaceGuid.PcdDTbtForcepowerGpioPad|13
> +  gBoardModuleTokenSpaceGuid.PcdDTbtGpioLevel|0x1
> +  gBoardModuleTokenSpaceGuid.PcdDTbtHotNotify|0x1
> +  gBoardModuleTokenSpaceGuid.PcdDTbtHotSMI|0x1
> +  gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax|26
> +  gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax|28
> +  gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemRsvd|100
> +  gBoardModuleTokenSpaceGuid.PcdDTbtSetClkReq|0x1
> +  gBoardModuleTokenSpaceGuid.PcdDTbtWakeupSupport|0x0
> +  gBoardModuleTokenSpaceGuid.PcdRtd3Tbt|0x1
> +  gBoardModuleTokenSpaceGuid.PcdRtd3TbtClkReq|0x1
> +
> +[PcdsDynamicHii.X64.DEFAULT]
> +  ######################################
> +  # Edk2 Configuration
> +  ######################################
> +
> gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupp
> ort"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport"
> +!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
> +
> gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGloba
> lVariableGuid|0x0|1 # Variable: L"Timeout"
> +!else
> +
> gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGloba
> lVariableGuid|0x0|5 # Variable: L"Timeout"
> +!endif
> --
> 2.16.2.windows.1