Reviewed-by: Chasel Chiu <chasel.c...@intel.com>
> -----Original Message----- > From: Kubacki, Michael A <michael.a.kuba...@intel.com> > Sent: Tuesday, October 8, 2019 1:17 PM > To: devel@edk2.groups.io > Cc: Chiu, Chasel <chasel.c...@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desim...@intel.com> > Subject: [edk2-platforms][PATCH V1 09/17] > WhiskeylakeOpenBoardPkg/WhiskeylakeURvp: Remove > OpenBoardPkgConfig.dsc > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2243 > > The location for PCD configuration is currently inconsistent in > WhiskeylakeOpenBoardPkg. A large set of FeaturePCD definitions are in > OpenBoardPkgConfig.dsc while other PCD definitions (including > FeaturePCD) are located in OpenBoardPkgPcd.dsc. > > This change consolidates PCD configuration for the WhiskeylakeURvp board > to OpenBoardPkgPcd.dsc and removes OpenBoardPkgConfig.dsc. > > Cc: Chasel Chiu <chasel.c...@intel.com> > Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> > Signed-off-by: Michael Kubacki <michael.a.kuba...@intel.com> > --- > > Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg. > dsc | 1 - > > Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg > Config.dsc | 128 -------------------- > > Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg > Pcd.dsc | 116 ++++++++++++++++++ > 3 files changed, 116 insertions(+), 129 deletions(-) > > diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kg.dsc > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kg.dsc > index 9a516cad60..1d07fdea84 100644 > --- > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kg.dsc > +++ > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > k > +++ g.dsc > @@ -26,7 +26,6 @@ > # > # Platform On/Off features are defined here > # > - !include OpenBoardPkgConfig.dsc > !include OpenBoardPkgPcd.dsc > > > ################################################################ > ################ > diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kgConfig.dsc > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kgConfig.dsc > deleted file mode 100644 > index c68fecf50e..0000000000 > --- > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kgConfig.dsc > +++ /dev/null > @@ -1,128 +0,0 @@ > -## @file > -# Platform configuration file. > -# > -# > -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> -# -# > SPDX-License-Identifier: BSD-2-Clause-Patent -# -# -## > - > -[PcdsFixedAtBuild] > - # > - # Please select BootStage 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 > - # Stage 4 - boot to OS > - # Stage 5 - boot to OS with security boot enabled > - # > - gMinPlatformPkgTokenSpaceGuid.PcdBootStage|4 > - > -[PcdsFeatureFlag] > - 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 > -!endif > - > - gBoardModuleTokenSpaceGuid.PcdTbtEnable|FALSE > - # > - # More fine granularity control below: > - # > - > - gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport|TRUE > - > -# > -# TRUE is ENABLE. FALSE is DISABLE. > -# > -# > -# BIOS build switches configuration > -# > - gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE > - > -# CPU > - gSiPkgTokenSpaceGuid.PcdSourceDebugEnable|FALSE > - > -# SA > - gSiPkgTokenSpaceGuid.PcdIgdEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdPegEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSgEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSaDmiEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSaOcEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdVtdEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdPeiDisplayEnable|TRUE > - > -# ME > - gSiPkgTokenSpaceGuid.PcdAtaEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdPttEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdJhiEnable|TRUE > - > - gSiPkgTokenSpaceGuid.PcdAcpiEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdBdatEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdIntegratedTouchEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdCpuPowerOnConfigEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSiCsmEnable|FALSE > - gSiPkgTokenSpaceGuid.PcdTraceHubEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdOverclockEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdPpmEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdS3Enable|TRUE > - gSiPkgTokenSpaceGuid.PcdSmbiosEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSmmVariableEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdUseHpetTimer|TRUE > # TRUE - HPET / FALSE - 8254 timer is used. > - gSiPkgTokenSpaceGuid.PcdOcWdtEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSiCatalogDebugEnable|FALSE > - > - gSiPkgTokenSpaceGuid.PcdSerialIoUartEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdCflCpuEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdIpuEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdGnaEnable|TRUE > - > -# > -# 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. > - # > - > - gSiPkgTokenSpaceGuid.PcdPttEnable|FALSE > - > - !if $(TARGET) == DEBUG > - gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE > - !else > - gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE > - !endif > - > - !if $(TARGET) == DEBUG > - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE > - !else > - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE > - !endif > - > - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE > - > diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kgPcd.dsc > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kgPcd.dsc > index 96d65133ae..24e3da6686 100644 > --- > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kgPcd.dsc > +++ > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > k > +++ gPcd.dsc > @@ -14,7 +14,123 @@ > # Pcd Section - list of all EDK II PCD Entries defined by this Platform # > ################################################################ > ################ > +[PcdsFixedAtBuild] > + # > + # Please select BootStage 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 > + # Stage 4 - boot to OS > + # Stage 5 - boot to OS with security boot enabled > + # > + gMinPlatformPkgTokenSpaceGuid.PcdBootStage|4 > + > [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 > +!endif > + > + gBoardModuleTokenSpaceGuid.PcdTbtEnable|FALSE > + # > + # More fine granularity control below: > + # > + > + gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport|TRUE > + > +# > +# TRUE is ENABLE. FALSE is DISABLE. > +# > +# > +# BIOS build switches configuration > +# > + gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE > + > +# CPU > + gSiPkgTokenSpaceGuid.PcdSourceDebugEnable|FALSE > + > +# SA > + gSiPkgTokenSpaceGuid.PcdIgdEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdPegEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSgEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSaDmiEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSaOcEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdVtdEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdPeiDisplayEnable|TRUE > + > +# ME > + gSiPkgTokenSpaceGuid.PcdAtaEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdPttEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdJhiEnable|TRUE > + > + gSiPkgTokenSpaceGuid.PcdAcpiEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdBdatEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdIntegratedTouchEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdCpuPowerOnConfigEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSiCsmEnable|FALSE > + gSiPkgTokenSpaceGuid.PcdTraceHubEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdOverclockEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdPpmEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdS3Enable|TRUE > + gSiPkgTokenSpaceGuid.PcdSmbiosEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSmmVariableEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdUseHpetTimer|TRUE > # TRUE - HPET / FALSE - 8254 timer is used. > + gSiPkgTokenSpaceGuid.PcdOcWdtEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSiCatalogDebugEnable|FALSE > + > + gSiPkgTokenSpaceGuid.PcdSerialIoUartEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdCflCpuEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdIpuEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdGnaEnable|TRUE > + > +# > +# 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. > + # > + > + gSiPkgTokenSpaceGuid.PcdPttEnable|FALSE > + > + !if $(TARGET) == DEBUG > + gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE > + !else > + gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE > + !endif > + > + !if $(TARGET) == DEBUG > + gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE > + !else > + gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE > + !endif > + > + gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE > + > > #gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|T > RUE > gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE > > gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSection > First|FALSE > -- > 2.16.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#48597): https://edk2.groups.io/g/devel/message/48597 Mute This Topic: https://groups.io/mt/34439445/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
