Simplify board porting

[edk2-devel][edk2-platforms][PATCH V1 04/13] WhitleyOpenBoardPkg/Build: Reduce unnecessary code
Posted by Oram, Isaac W 3 years, 6 months ago
Use MinPlatformFeaturesPcd.dsc.inc to initialize feature PCD
Move individual feature enabling examples to BoardPortTemplate

Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
 .../Aowanda/PlatformPkg.dsc                   |  3 --
 .../BoardPortTemplate/PlatformPkg.dsc         | 50 ++++++++++++++++++
 .../JunctionCity/PlatformPkg.dsc              |  3 --
 .../Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc | 51 -------------------
 4 files changed, 50 insertions(+), 57 deletions(-)

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/PlatformPkg.dsc
index 63648172da..8761f8b56a 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/PlatformPkg.dsc
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/PlatformPkg.dsc
@@ -26,9 +26,6 @@
 !if $(gMinPlatformPkgTokenSpaceGuid.PcdBootStage) >= 5
   gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable        |TRUE
   gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable  |TRUE
-!else
-  gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable        |FALSE
-  gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable  |FALSE
 !endif
 
   !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.dsc
index e3e8ceb7ce..9bf5d02a3d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.dsc
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.dsc
@@ -15,6 +15,56 @@
 
 !include $(RP_PKG)/PlatformPkg.dsc
 
+#
+# Feature enable/disable flags
+#
+[PcdsFeatureFlag]
+  #
+  # MinPlatform control flags
+  #
+  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit                       |FALSE
+  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit                         |FALSE
+  gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly                          |FALSE
+  gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable                        |TRUE
+
+  #
+  # Debugging features
+  #
+  gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable              |FALSE
+  gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable              |FALSE
+  gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable      |FALSE
+  gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable              |FALSE
+
+  #
+  # Network features
+  #
+  gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable                  |FALSE
+
+  #
+  # OutOfBandManagement features
+  #
+  gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable                        |FALSE
+  gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrFeatureEnable                        |FALSE
+
+  #
+  # PowerManagement features
+  #
+  gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable                            |FALSE
+
+  #
+  # SystemInformation features
+  #
+  gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable                    |FALSE
+
+  #
+  # UserInterface features
+  #
+  gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable                        |FALSE
+  gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable      |FALSE
+  gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnable  |FALSE
+
+!include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc
+
 [Defines]
   DEFINE BOARD_NAME                   = BoardPortTemplate
   PLATFORM_GUID                       = f3518dd4-5dec-4d2c-9ac9-561121e2628b
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc
index 8cedbaccee..8e226c1552 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc
@@ -26,9 +26,6 @@
 !if $(gMinPlatformPkgTokenSpaceGuid.PcdBootStage) >= 5
   gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable        |TRUE
   gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable  |TRUE
-!else
-  gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable        |FALSE
-  gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable  |FALSE
 !endif
 
   !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc
index 5b5d84779e..0ff9c00b94 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc
+++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc
@@ -59,57 +59,6 @@
 [PcdsFixedAtBuild]
   gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance|1
 
-#
-# Feature enable/disable flags
-#
-[PcdsFeatureFlag]
-  #
-  # MinPlatform control flags
-  #
-  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit                       |FALSE
-  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit                         |FALSE
-  gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly                          |FALSE
-  gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable                  |TRUE
-  gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable                        |TRUE
-
-  #
-  # Debugging features
-  #
-  gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable              |FALSE
-  gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable              |FALSE
-  gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable      |FALSE
-  gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable              |FALSE
-
-  #
-  # Network features
-  #
-  gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable                  |FALSE
-
-  #
-  # OutOfBandManagement features
-  #
-  gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable                        |FALSE
-  gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrFeatureEnable                        |FALSE
-
-  #
-  # PowerManagement features
-  #
-  gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable                            |FALSE
-
-  #
-  # SystemInformation features
-  #
-  gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable                    |FALSE
-
-  #
-  # UserInterface features
-  #
-  gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable                        |FALSE
-  gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable      |FALSE
-  gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnable  |FALSE
-
-!include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc
-
   #
   # Platform On/Off features are defined here
   #
-- 
2.36.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#91737): https://edk2.groups.io/g/devel/message/91737
Mute This Topic: https://groups.io/mt/92554230/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-