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>; Jeremy Soller <jer...@system76.com> > Subject: [edk2-platforms][PATCH V1 05/17] > KabylakeOpenBoardPkg/GalagoPro3: Remove OpenBoardPkgConfig.dsc > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2242 > > The location for PCD configuration is currently inconsistent in > KabylakeOpenBoardPkg. 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 GalagoPro3 board to > OpenBoardPkgPcd.dsc and removes OpenBoardPkgConfig.dsc. > > Cc: Chasel Chiu <chasel.c...@intel.com> > Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> > Cc: Jeremy Soller <jer...@system76.com> > Signed-off-by: Michael Kubacki <michael.a.kuba...@intel.com> > --- > Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc > | 1 - > > Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgConfig.dsc > | 132 -------------------- > Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc > | 122 ++++++++++++++++++ > 3 files changed, 122 insertions(+), 133 deletions(-) > > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc > b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc > index 90ee5dfc53..75f774d26b 100644 > --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc > +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc > @@ -23,7 +23,6 @@ > # > # Platform On/Off features are defined here > # > - !include OpenBoardPkgConfig.dsc > !include OpenBoardPkgPcd.dsc > > > ################################################################ > ################ > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgConfig.d > sc > b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgConfig.d > sc > deleted file mode 100644 > index 3de3f8942c..0000000000 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgConfig.d > sc > +++ /dev/null > @@ -1,132 +0,0 @@ > -## @file > -# System 76 GalagoPro3 board configuration. > -# > -# 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 > - gSiPkgTokenSpaceGuid.PcdTxtEnable|TRUE #Set to FALSE for GCC Build > @todo Convert TXT ASM to NASM > - gSiPkgTokenSpaceGuid.PcdBiosGuardEnable|TRUE > - > -# SA > - gSiPkgTokenSpaceGuid.PcdIgdEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdPegEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSgEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSaDmiEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSkycamEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdGmmEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSaOcEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdVtdEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdPeiDisplayEnable|TRUE > - > -# ME > - gSiPkgTokenSpaceGuid.PcdAmtEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdAtaEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdPttEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdJhiEnable|TRUE > - > - gSiPkgTokenSpaceGuid.PcdAcpiEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdBdatEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdBootGuardEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdIntegratedTouchEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdCpuPowerOnConfigEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSiCsmEnable|FALSE > - gSiPkgTokenSpaceGuid.PcdEvLoaderEnable|FALSE > - gSiPkgTokenSpaceGuid.PcdTraceHubEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdOverclockEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdPpmEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdS3Enable|TRUE > - gSiPkgTokenSpaceGuid.PcdSerialGpioEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSmbiosEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSmmVariableEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSoftwareGuardEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSsaFlagEnable|FALSE > - gSiPkgTokenSpaceGuid.PcdOcWdtEnable|TRUE > - gSiPkgTokenSpaceGuid.PcdSiCatalogDebugEnable|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. > - # > - > - gSiPkgTokenSpaceGuid.PcdPttEnable|FALSE > - gSiPkgTokenSpaceGuid.PcdTxtEnable|FALSE > - gSiPkgTokenSpaceGuid.PcdTxtEnable|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/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc > b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc > index 2dfdd3b30e..d564f0a9ee 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc > +++ > b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc > @@ -12,7 +12,129 @@ > # 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 > + gSiPkgTokenSpaceGuid.PcdTxtEnable|TRUE #Set to FALSE for GCC Build > +@todo Convert TXT ASM to NASM > + gSiPkgTokenSpaceGuid.PcdBiosGuardEnable|TRUE > + > +# SA > + gSiPkgTokenSpaceGuid.PcdIgdEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdPegEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSgEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSaDmiEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSkycamEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdGmmEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSaOcEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdVtdEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdPeiDisplayEnable|TRUE > + > +# ME > + gSiPkgTokenSpaceGuid.PcdAmtEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdAtaEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdPttEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdJhiEnable|TRUE > + > + gSiPkgTokenSpaceGuid.PcdAcpiEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdBdatEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdBootGuardEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdIntegratedTouchEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdCpuPowerOnConfigEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSiCsmEnable|FALSE > + gSiPkgTokenSpaceGuid.PcdEvLoaderEnable|FALSE > + gSiPkgTokenSpaceGuid.PcdTraceHubEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdOverclockEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdPpmEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdS3Enable|TRUE > + gSiPkgTokenSpaceGuid.PcdSerialGpioEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSmbiosEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSmmVariableEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSoftwareGuardEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSsaFlagEnable|FALSE > + gSiPkgTokenSpaceGuid.PcdOcWdtEnable|TRUE > + gSiPkgTokenSpaceGuid.PcdSiCatalogDebugEnable|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. > + # > + > + gSiPkgTokenSpaceGuid.PcdPttEnable|FALSE > + gSiPkgTokenSpaceGuid.PcdTxtEnable|FALSE > + gSiPkgTokenSpaceGuid.PcdTxtEnable|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 > + > gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE > > gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSection > First|FALSE > !if $(TARGET) == RELEASE > -- > 2.16.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#48592): https://edk2.groups.io/g/devel/message/48592 Mute This Topic: https://groups.io/mt/34439440/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
