* [edk2-devel][edk2-platforms][PATCH V1 01/13] MinPlatformPkg/Include: Simplify board creation
2022-07-22 18:46 [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Oram, Isaac W
@ 2022-07-22 18:46 ` Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 02/13] WhitleyOpenBoardPkg/Build: Reduce duplicate code Oram, Isaac W
` (12 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Oram, Isaac W @ 2022-07-22 18:46 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Chasel Chiu, Nate DeSimone, Liming Gao, Eric Dong
Reduce the need for boards to initialize common
MinPlatformPkg PCD used in build files.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
.../Dsc/MinPlatformFeaturesPcd.dsc.inc | 26 +++++++++++++++++++
.../Intel/MinPlatformPkg/MinPlatformPkg.dsc | 14 +++++-----
2 files changed, 32 insertions(+), 8 deletions(-)
create mode 100644 Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc b/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
new file mode 100644
index 0000000000..842668a081
--- /dev/null
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
@@ -0,0 +1,26 @@
+## @file
+# DSC file for defining default PCD for MinPlatform features.
+#
+# This makes it easy for boards to initially configure their build.
+#
+# This initializes features to be disable by default.
+# A board can enable a feature by configuring the PCD in the board DSC file
+# after this file has been included.
+#
+# Copyright (C) 2022 Intel Corporation
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+##
+
+[PcdsFeatureFlag]
+ gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit |FALSE
+ gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit |FALSE
+ gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly |FALSE
+ gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable |FALSE
+
+ gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
+ gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable |FALSE
+
+ gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
+ gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
index 09aa6fe4d5..90127c16b5 100644
--- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
+++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
@@ -38,14 +38,12 @@
#
################################################################################
-[PcdsFeatureFlag]
- # configuration
- gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|FALSE
+#
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
+#
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
################################################################################
#
--
2.36.1.windows.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [edk2-devel][edk2-platforms][PATCH V1 02/13] WhitleyOpenBoardPkg/Build: Reduce duplicate code
2022-07-22 18:46 [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 01/13] MinPlatformPkg/Include: Simplify board creation Oram, Isaac W
@ 2022-07-22 18:46 ` Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 03/13] Features/Intel: " Oram, Isaac W
` (11 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Oram, Isaac W @ 2022-07-22 18:46 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Nate DeSimone, Chasel Chiu
Leverage common includes for default feature values.
Remove PERFORMANCE_ENABLE in favor of PcdPerformanceEnable.
Use DpDynamicCommand instead of standalone DpApp.
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>
---
...blePerformanceMonitoringInfrastructure.dsc | 5 +--
...anceMonitoringInfrastructurePostMemory.fdf | 5 +--
...manceMonitoringInfrastructurePreMemory.fdf | 2 +-
.../Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc | 45 ++++++++++++++-----
.../WhitleyOpenBoardPkg/PlatformPkgConfig.dsc | 2 -
5 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/EnablePerformanceMonitoringInfrastructure.dsc b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/EnablePerformanceMonitoringInfrastructure.dsc
index c308e0df4f..7439b2fb36 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/EnablePerformanceMonitoringInfrastructure.dsc
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/EnablePerformanceMonitoringInfrastructure.dsc
@@ -6,7 +6,7 @@
# SPDX-License-Identifier: BSD-2-Clause-Patent
##
-!if $(PERFORMANCE_ENABLE) == TRUE
+!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
[PcdsFixedAtBuild]
gEfiMdeModulePkgTokenSpaceGuid.PcdEdkiiFpdtStringRecordEnableOnly|TRUE
@@ -34,7 +34,6 @@
[Components.X64]
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
- MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
- ShellPkg/DynamicCommand/DpDynamicCommand/DpApp.inf
+ ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
!endif
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePostMemory.fdf b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePostMemory.fdf
index a3576bd7a8..52b79a31d0 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePostMemory.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePostMemory.fdf
@@ -6,9 +6,8 @@
# SPDX-License-Identifier: BSD-2-Clause-Patent
##
-!if $(PERFORMANCE_ENABLE) == TRUE
+!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
- INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
- INF ShellPkg/DynamicCommand/DpDynamicCommand/DpApp.inf
+ INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
!endif
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePreMemory.fdf b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePreMemory.fdf
index dbc98f6f1f..18574f67ef 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePreMemory.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePreMemory.fdf
@@ -6,6 +6,6 @@
# SPDX-License-Identifier: BSD-2-Clause-Patent
##
-!if $(PERFORMANCE_ENABLE) == TRUE
+!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf
!endif
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc
index cefee8273b..5b5d84779e 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc
+++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc
@@ -39,12 +39,39 @@
DEFINE IIO_INSTANCE = UnknownCpu
!endif
+#
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
+# Optional MinPlatformPkg features should be enabled after this
+#
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
+#
+# AdvancedFeature common include for feature enable/disable PCD
+#
+#
!include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc
+#
+# PCD required by advanced features
+#
[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
#
@@ -124,20 +151,16 @@
# Pcd Section - list of all EDK II PCD Entries defined by this Platform
#
################################################################################
-[PcdsFeatureFlag]
- #
- # MinPlatform control flags
- #
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
+[PcdsFeatureFlag]
+ #
# don't degrade 64bit MMIO space to 32-bit
+ #
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDegradeResourceForOptionRom|FALSE
+ #
# Server doesn't support capsule update on Reset.
+ #
gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmEnableBspElection|TRUE
gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugSupport|FALSE
@@ -761,13 +784,13 @@
UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf {
<LibraryClasses>
- !if $(PERFORMANCE_ENABLE) == TRUE
+ !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
TimerLib|UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf
!endif
}
[Components.X64]
- !include WhitleyOpenBoardPkg/Include/Dsc/CoreDxeInclude.dsc
+ !include MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
$(RP_PKG)/Platform/Dxe/PlatformType/PlatformType.inf
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkgConfig.dsc b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkgConfig.dsc
index a4ac8b6935..c9620f11d8 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkgConfig.dsc
+++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkgConfig.dsc
@@ -15,8 +15,6 @@
DEFINE CRB_FLAG_ENABLE = TRUE
DEFINE DEBUG_FLAGS_ENABLE = FALSE
-DEFINE PERFORMANCE_ENABLE = TRUE
-
DEFINE SERVER_BIOS_ENABLE = TRUE
DEFINE PCH_SERVER_BIOS_ENABLE = TRUE
--
2.36.1.windows.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [edk2-devel][edk2-platforms][PATCH V1 03/13] Features/Intel: Reduce duplicate code
2022-07-22 18:46 [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 01/13] MinPlatformPkg/Include: Simplify board creation Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 02/13] WhitleyOpenBoardPkg/Build: Reduce duplicate code Oram, Isaac W
@ 2022-07-22 18:46 ` Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 04/13] WhitleyOpenBoardPkg/Build: Reduce unnecessary code Oram, Isaac W
` (10 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Oram, Isaac W @ 2022-07-22 18:46 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Sai Chaganty, Nate DeSimone, Liming Gao
Enable simpler initialation of the MinPlatformPkg feature
selection PCD. Most features and boards don't benefit from
initializing these.
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
.../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 13 ++++++-------
.../AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc | 12 ++++--------
.../BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc | 15 +++++++--------
.../PostCodeDebugFeaturePkg.dsc | 15 +++++++--------
.../NetworkFeaturePkg/NetworkFeaturePkg.dsc | 13 ++++++-------
.../IpmiFeaturePkg/IpmiFeaturePkg.dsc | 13 ++++++-------
.../SpcrFeaturePkg/SpcrFeaturePkg.dsc | 13 ++++++-------
.../PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc | 13 ++++++-------
.../SmbiosFeaturePkg/SmbiosFeaturePkg.dsc | 13 ++++++-------
.../TemplateFeaturePkg/TemplateFeaturePkg.dsc | 13 ++++++-------
.../LogoFeaturePkg/LogoFeaturePkg.dsc | 12 ++++++------
.../UserAuthFeaturePkg/UserAuthFeaturePkg.dsc | 13 ++++++-------
.../VirtualKeyboardFeaturePkg.dsc | 13 ++++++-------
13 files changed, 78 insertions(+), 93 deletions(-)
diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
index 28530b8c67..b572f2eda8 100644
--- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
+++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
@@ -88,13 +88,12 @@
[PcdsFixedAtBuild]
gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance|1
-[PcdsFeatureFlag]
- #
- # MinPlatform common include currently required PCD
- #
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
+#
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
+#
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
#
# Include common libraries
diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc
index 3b76d39ea8..306d8bce16 100644
--- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc
+++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc
@@ -28,15 +28,11 @@
MinPlatformPkg/MinPlatformPkg.dec
#
-# Since there are no 32b libraries or components in this package, these PCD are specified for 64b only
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
#
-[PcdsFeatureFlag.X64]
- #
- # PCD needed for MinPlatform build includes
- #
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
#
# Include common libraries
diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc b/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc
index 56cad020bf..cad4e30aa3 100644
--- a/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc
+++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc
@@ -28,17 +28,16 @@
MinPlatformPkg/MinPlatformPkg.dec
BeepDebugFeaturePkg/BeepDebugFeaturePkg.dec
-[PcdsFeatureFlag]
- #
- # PCD needed for MinPlatform build includes
- #
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
-
[PcdsDynamicExDefault]
gBeepDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUseBeep|TRUE
+#
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
+#
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
#
# Include common libraries
#
diff --git a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.dsc b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.dsc
index 349604098f..16642e6c59 100644
--- a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.dsc
+++ b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.dsc
@@ -27,20 +27,19 @@
[Packages]
MinPlatformPkg/MinPlatformPkg.dec
-[PcdsFeatureFlag]
- #
- # PCD needed for MinPlatform build includes
- #
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
-
[PcdsDynamicExDefault]
#
# PCD needed for this feature to build
#
gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUsePostCode|TRUE
+#
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
+#
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
#
# Include common libraries
#
diff --git a/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc b/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc
index cdc5dc851d..87060714e7 100644
--- a/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc
+++ b/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc
@@ -27,13 +27,12 @@
[Packages]
MinPlatformPkg/MinPlatformPkg.dec
-[PcdsFeatureFlag]
- #
- # PCD needed for MinPlatform build includes
- #
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
+#
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
+#
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
#
# Include common libraries
diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc
index c35e1e174e..76d2c45a73 100644
--- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc
@@ -28,13 +28,12 @@
[Packages]
MinPlatformPkg/MinPlatformPkg.dec
-[PcdsFeatureFlag]
- #
- # PCD needed for MinPlatform build includes
- #
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
+#
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
+#
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
#
# Include common libraries
diff --git a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dsc b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dsc
index 2ee874a58e..8d71939a16 100644
--- a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dsc
+++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dsc
@@ -27,13 +27,12 @@
[Packages]
MinPlatformPkg/MinPlatformPkg.dec
-[PcdsFeatureFlag]
- #
- # PCD needed for MinPlatform build includes
- #
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
+#
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
+#
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
#
# Include common libraries
diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc b/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc
index e16a1f8d00..2d1d197b2a 100644
--- a/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc
+++ b/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc
@@ -27,13 +27,12 @@
[Packages]
MinPlatformPkg/MinPlatformPkg.dec
-[PcdsFeatureFlag]
- #
- # PCD needed for MinPlatform build includes
- #
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
+#
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
+#
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
#
# Include common libraries
diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dsc b/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dsc
index e72b341154..5a9ff5b1b8 100644
--- a/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dsc
+++ b/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dsc
@@ -27,13 +27,12 @@
[Packages]
MinPlatformPkg/MinPlatformPkg.dec
-[PcdsFeatureFlag]
- #
- # PCD needed for MinPlatform build includes
- #
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
+#
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
+#
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
#
# Include common libraries
diff --git a/Features/Intel/TemplateFeaturePkg/TemplateFeaturePkg.dsc b/Features/Intel/TemplateFeaturePkg/TemplateFeaturePkg.dsc
index 03657047dc..191173051f 100644
--- a/Features/Intel/TemplateFeaturePkg/TemplateFeaturePkg.dsc
+++ b/Features/Intel/TemplateFeaturePkg/TemplateFeaturePkg.dsc
@@ -27,13 +27,12 @@
[Packages]
MinPlatformPkg/MinPlatformPkg.dec
-[PcdsFeatureFlag]
- #
- # PCD needed for MinPlatform build includes
- #
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
+#
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
+#
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
#
# Include common libraries
diff --git a/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc b/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc
index 5a6436178c..ffcd104a3e 100644
--- a/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc
+++ b/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc
@@ -31,12 +31,12 @@
[PcdsFeatureFlag]
gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable |FALSE
- #
- # PCD needed for MinPlatform build includes
- #
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
+#
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
+#
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
#
# Include common libraries
diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dsc b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dsc
index 10360c5737..8af4dd4cd9 100644
--- a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dsc
+++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dsc
@@ -27,13 +27,12 @@
[Packages]
MinPlatformPkg/MinPlatformPkg.dec
-[PcdsFeatureFlag]
- #
- # PCD needed for MinPlatform build includes
- #
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
+#
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
+#
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
#
# Include common libraries
diff --git a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardFeaturePkg.dsc b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardFeaturePkg.dsc
index 6717c892f1..d13bd673d3 100644
--- a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardFeaturePkg.dsc
+++ b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardFeaturePkg.dsc
@@ -27,13 +27,12 @@
[Packages]
MinPlatformPkg/MinPlatformPkg.dec
-[PcdsFeatureFlag]
- #
- # PCD needed for MinPlatform build includes
- #
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
+#
+# MinPlatform common include for required feature PCD
+# These PCD must be set before the core include files, CoreCommonLib,
+# CorePeiLib, and CoreDxeLib.
+#
+!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
#
# Include common libraries
--
2.36.1.windows.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [edk2-devel][edk2-platforms][PATCH V1 04/13] WhitleyOpenBoardPkg/Build: Reduce unnecessary code
2022-07-22 18:46 [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Oram, Isaac W
` (2 preceding siblings ...)
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 03/13] Features/Intel: " Oram, Isaac W
@ 2022-07-22 18:46 ` Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 05/13] MinPlatformPkg/Include: Simplify build logic Oram, Isaac W
` (9 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Oram, Isaac W @ 2022-07-22 18:46 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Nate DeSimone, Chasel Chiu
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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [edk2-devel][edk2-platforms][PATCH V1 05/13] MinPlatformPkg/Include: Simplify build logic
2022-07-22 18:46 [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Oram, Isaac W
` (3 preceding siblings ...)
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 04/13] WhitleyOpenBoardPkg/Build: Reduce unnecessary code Oram, Isaac W
@ 2022-07-22 18:46 ` Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 06/13] BoardModulePkg/Include: Add include for stage behavior logic Oram, Isaac W
` (8 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Oram, Isaac W @ 2022-07-22 18:46 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Chasel Chiu, Nate DeSimone, Liming Gao, Eric Dong
Removed the logic that doesn't build some things only if you are doing a
shell boot. Since they are built for stage 1 or 2, there is no porting
benefit to this logic. Build simplified to build both sets of drivers.
Switched from PcdSmiHandlerProfileEnable to using RELEASE build type to
disable SMI profiling.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
.../Include/Dsc/CoreCommonLib.dsc | 6 ++---
.../Include/Dsc/CoreDxeInclude.dsc | 23 +++++++++----------
.../Dsc/MinPlatformFeaturesPcd.dsc.inc | 1 -
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
index b77d55dfd5..3749199da7 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
@@ -122,10 +122,10 @@
DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
!endif
-!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE
- SmiHandlerProfileLib|MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.inf
-!else
+!if $(TARGET) == RELEASE
SmiHandlerProfileLib|MdePkg/Library/SmiHandlerProfileLibNull/SmiHandlerProfileLibNull.inf
+!else
+ SmiHandlerProfileLib|MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.inf
!endif
PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
index c2ade240f3..21570afe3f 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
@@ -29,7 +29,17 @@
PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
-!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
+ #
+ # Emulated variables for stages 1-4
+ #
+ MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
+ <PcdsFixedAtBuild>
+ gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE
+ }
+
+ #
+ # Real variables for stages 5+
+ #
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf {
@@ -38,12 +48,6 @@
NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
NULL|MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLib.inf
}
-!else
- MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
- <PcdsFixedAtBuild>
- gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE
- }
-!endif
MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
@@ -122,7 +126,6 @@
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
}
-!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
@@ -133,14 +136,11 @@
UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf
-!endif
-!if gMinPlatformPkgTokenSpaceGuid.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 gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable == TRUE
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
@@ -162,4 +162,3 @@
!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
!endif
-
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc b/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
index 842668a081..2d665c25c5 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
@@ -22,5 +22,4 @@
gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable |FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
--
2.36.1.windows.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [edk2-devel][edk2-platforms][PATCH V1 06/13] BoardModulePkg/Include: Add include for stage behavior logic
2022-07-22 18:46 [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Oram, Isaac W
` (4 preceding siblings ...)
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 05/13] MinPlatformPkg/Include: Simplify build logic Oram, Isaac W
@ 2022-07-22 18:46 ` Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 07/13] WhiskeyLakeOpenBoardPkg/Build: Reduce unnecessary code Oram, Isaac W
` (7 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Oram, Isaac W @ 2022-07-22 18:46 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Eric Dong, Liming Gao
This is a commonly used set of settings modifications based on
the boot stage targeted.
Cc: Eric Dong <eric.dong@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
.../Include/Dsc/CommonStageConfig.dsc.inc | 37 +++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 Platform/Intel/BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
diff --git a/Platform/Intel/BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc b/Platform/Intel/BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
new file mode 100644
index 0000000000..6927b5c9c2
--- /dev/null
+++ b/Platform/Intel/BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
@@ -0,0 +1,37 @@
+## @file
+# Commonly used stage configuration logic
+#
+# Copyright (C) 2022 Intel Corporation
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+##
+
+[PcdsFeatureFlag.Common]
+ !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
+
+[PcdsFixedAtBuild.Common]
+ !if $(TARGET) != RELEASE
+ gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1
+ !endif
--
2.36.1.windows.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [edk2-devel][edk2-platforms][PATCH V1 07/13] WhiskeyLakeOpenBoardPkg/Build: Reduce unnecessary code
2022-07-22 18:46 [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Oram, Isaac W
` (5 preceding siblings ...)
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 06/13] BoardModulePkg/Include: Add include for stage behavior logic Oram, Isaac W
@ 2022-07-22 18:46 ` Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 08/13] TigerLakeOpenBoardPkg/Build: " Oram, Isaac W
` (6 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Oram, Isaac W @ 2022-07-22 18:46 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Chasel Chiu, Nate DeSimone
Leverage common includes to reduce duplicated or low value code.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
.../UpXtreme/OpenBoardPkgPcd.dsc | 51 +++++--------------
.../WhiskeylakeURvp/OpenBoardPkgPcd.dsc | 51 +++++--------------
2 files changed, 24 insertions(+), 78 deletions(-)
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkgPcd.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkgPcd.dsc
index 8f3cc6ba28..a7e9a41e2c 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkgPcd.dsc
@@ -121,42 +121,18 @@
######################################
# Platform Configuration
######################################
- gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|TRUE
-
-!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
-
-!if $(TARGET) == DEBUG
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
-!else
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
-!endif
+ #
+ # MinPlatform common include for required feature PCD
+ # These PCD must be set before the core include files, CoreCommonLib,
+ # CorePeiLib, and CoreDxeLib.
+ # Optional MinPlatformPkg features should be enabled after this
+ #
+ !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
+ #
+ # Commonly used MinPlatform feature configuration logic that maps functionity to stage
+ #
+ !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
######################################
# Board Configuration
@@ -191,9 +167,6 @@
!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x5000
gEfiMdeModulePkgTokenSpaceGuid.PcdReclaimVariableSpaceAtEndOfDxe|TRUE
-!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE
- gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1
-!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE
#
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPcd.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPcd.dsc
index 4a5d5ef03b..daf5411ac3 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPcd.dsc
@@ -121,42 +121,18 @@
######################################
# Platform Configuration
######################################
- gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|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
-
-!if $(TARGET) == DEBUG
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
-!else
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
-!endif
+ #
+ # MinPlatform common include for required feature PCD
+ # These PCD must be set before the core include files, CoreCommonLib,
+ # CorePeiLib, and CoreDxeLib.
+ # Optional MinPlatformPkg features should be enabled after this
+ #
+ !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
+ #
+ # Commonly used MinPlatform feature configuration logic that maps functionity to stage
+ #
+ !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
######################################
# Board Configuration
@@ -191,9 +167,6 @@
!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x5000
gEfiMdeModulePkgTokenSpaceGuid.PcdReclaimVariableSpaceAtEndOfDxe|TRUE
-!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE
- gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1
-!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE
!if $(TARGET) == DEBUG
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE
--
2.36.1.windows.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [edk2-devel][edk2-platforms][PATCH V1 08/13] TigerLakeOpenBoardPkg/Build: Reduce unnecessary code
2022-07-22 18:46 [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Oram, Isaac W
` (6 preceding siblings ...)
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 07/13] WhiskeyLakeOpenBoardPkg/Build: Reduce unnecessary code Oram, Isaac W
@ 2022-07-22 18:46 ` Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 09/13] SimicsOpenBoardPkg/Build: " Oram, Isaac W
` (5 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Oram, Isaac W @ 2022-07-22 18:46 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Chasel Chiu, Nate DeSimone, Heng Luo
Leverage common includes to reduce duplicated or low value code.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Heng Luo <heng.luo@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
.../TigerlakeURvp/OpenBoardPkgPcd.dsc | 52 +++++--------------
1 file changed, 12 insertions(+), 40 deletions(-)
diff --git a/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkgPcd.dsc b/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkgPcd.dsc
index aba3c8d6d0..2fd6d0c50e 100644
--- a/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkgPcd.dsc
@@ -138,42 +138,18 @@
######################################
# Platform Configuration
######################################
- gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|TRUE
-
-!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
-
-!if $(TARGET) == DEBUG
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
-!else
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
-!endif
+ #
+ # MinPlatform common include for required feature PCD
+ # These PCD must be set before the core include files, CoreCommonLib,
+ # CorePeiLib, and CoreDxeLib.
+ # Optional MinPlatformPkg features should be enabled after this
+ #
+ !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
+ #
+ # Commonly used MinPlatform feature configuration logic that maps functionity to stage
+ #
+ !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
######################################
# Board Configuration
@@ -212,9 +188,6 @@
!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x10000
gEfiMdeModulePkgTokenSpaceGuid.PcdReclaimVariableSpaceAtEndOfDxe|TRUE
-!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE
- gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1
-!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE
!if $(TARGET) == DEBUG
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE
@@ -396,4 +369,3 @@
#
!include $(PLATFORM_FSP_BIN_PACKAGE)/TigerLakeFspPcds.dsc
!endif
-
--
2.36.1.windows.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [edk2-devel][edk2-platforms][PATCH V1 09/13] SimicsOpenBoardPkg/Build: Reduce unnecessary code
2022-07-22 18:46 [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Oram, Isaac W
` (7 preceding siblings ...)
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 08/13] TigerLakeOpenBoardPkg/Build: " Oram, Isaac W
@ 2022-07-22 18:46 ` Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 10/13] PurleyOpenBoardPkg/Build: " Oram, Isaac W
` (4 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Oram, Isaac W @ 2022-07-22 18:46 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Nate DeSimone
Leverage common includes to reduce duplicated or low value code.
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
.../BoardX58Ich10/OpenBoardPkgPcd.dsc | 51 +++++--------------
1 file changed, 12 insertions(+), 39 deletions(-)
diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc
index 44b6a81277..e2171dd376 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc
@@ -42,42 +42,18 @@
######################################
# Platform Configuration
######################################
- gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|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
-
-!if $(TARGET) == DEBUG
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
-!else
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
-!endif
+ #
+ # MinPlatform common include for required feature PCD
+ # These PCD must be set before the core include files, CoreCommonLib,
+ # CorePeiLib, and CoreDxeLib.
+ # Optional MinPlatformPkg features should be enabled after this
+ #
+ !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
+ #
+ # Commonly used MinPlatform feature configuration logic that maps functionity to stage
+ #
+ !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
######################################
# Silicon Configuration
@@ -212,9 +188,6 @@
######################################
# Edk2 Configuration
######################################
-!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE
- gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1
-!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable|TRUE
gPcAtChipsetPkgTokenSpaceGuid.PcdHpetBaseAddress|0xFED00000
--
2.36.1.windows.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [edk2-devel][edk2-platforms][PATCH V1 10/13] PurleyOpenBoardPkg/Build: Reduce unnecessary code
2022-07-22 18:46 [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Oram, Isaac W
` (8 preceding siblings ...)
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 09/13] SimicsOpenBoardPkg/Build: " Oram, Isaac W
@ 2022-07-22 18:46 ` Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 11/13] KabylakeOpenBoardPkg/Build: " Oram, Isaac W
` (3 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Oram, Isaac W @ 2022-07-22 18:46 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Chasel Chiu, Nate DeSimone
Leverage common includes to reduce duplicated or low value code.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
.../BoardMtOlympus/PlatformPkgConfig.dsc | 46 +++++-----------
.../BoardMtOlympus/PlatformPkgPcd.dsc | 52 +++++--------------
.../BoardTiogaPass/PlatformPkgConfig.dsc | 48 +++++------------
.../BoardTiogaPass/PlatformPkgPcd.dsc | 52 +++++--------------
4 files changed, 49 insertions(+), 149 deletions(-)
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc
index 2bd714c01e..2359243310 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc
@@ -14,40 +14,18 @@
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
-
- !if $(TARGET) == DEBUG
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
- !else
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
- !endif
+ #
+ # MinPlatform common include for required feature PCD
+ # These PCD must be set before the core include files, CoreCommonLib,
+ # CorePeiLib, and CoreDxeLib.
+ # Optional MinPlatformPkg features should be enabled after this
+ #
+ !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
+ #
+ # Commonly used MinPlatform feature configuration logic that maps functionity to stage
+ #
+ !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|TRUE
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc
index 050f9b6228..069f463d5e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc
@@ -61,42 +61,18 @@
######################################
# Platform Configuration
######################################
- gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|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
-
-!if $(TARGET) == DEBUG
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
-!else
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
-!endif
+ #
+ # MinPlatform common include for required feature PCD
+ # These PCD must be set before the core include files, CoreCommonLib,
+ # CorePeiLib, and CoreDxeLib.
+ # Optional MinPlatformPkg features should be enabled after this
+ #
+ !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
+ #
+ # Commonly used MinPlatform feature configuration logic that maps functionity to stage
+ #
+ !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
[PcdsFeatureFlag.X64]
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackGuard|FALSE
@@ -278,10 +254,6 @@
[PcdsPatchableInModule.common]
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042
-!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE
- gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1
-!endif
-
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x80000000
gMinPlatformPkgTokenSpaceGuid.PcdPciExpressRegionLength|0x10000000
gPcAtChipsetPkgTokenSpaceGuid.PcdHpetBaseAddress|0xFED00000
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgConfig.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgConfig.dsc
index cefb81b76e..e393cf3097 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgConfig.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgConfig.dsc
@@ -14,40 +14,18 @@
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
-
- !if $(TARGET) == DEBUG
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
- !else
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
- !endif
+ #
+ # MinPlatform common include for required feature PCD
+ # These PCD must be set before the core include files, CoreCommonLib,
+ # CorePeiLib, and CoreDxeLib.
+ # Optional MinPlatformPkg features should be enabled after this
+ #
+ !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
+ #
+ # Commonly used MinPlatform feature configuration logic that maps functionity to stage
+ #
+ !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|TRUE
@@ -62,4 +40,4 @@
!if gPlatformTokenSpaceGuid.PcdFastBoot == TRUE
gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable|FALSE
gPlatformTokenSpaceGuid.PcdUpdateConsoleInBds|FALSE
-!endif
\ No newline at end of file
+!endif
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgPcd.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgPcd.dsc
index 5940c40dfc..d8cd559490 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgPcd.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgPcd.dsc
@@ -61,42 +61,18 @@
######################################
# Platform Configuration
######################################
- gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|TRUE
- gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|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
-
-!if $(TARGET) == DEBUG
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
-!else
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
-!endif
+ #
+ # MinPlatform common include for required feature PCD
+ # These PCD must be set before the core include files, CoreCommonLib,
+ # CorePeiLib, and CoreDxeLib.
+ # Optional MinPlatformPkg features should be enabled after this
+ #
+ !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
+ #
+ # Commonly used MinPlatform feature configuration logic that maps functionity to stage
+ #
+ !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
[PcdsFeatureFlag.X64]
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackGuard|FALSE
@@ -281,10 +257,6 @@
[PcdsPatchableInModule.common]
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042
-!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE
- gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1
-!endif
-
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x80000000
gMinPlatformPkgTokenSpaceGuid.PcdPciExpressRegionLength|0x10000000
gPcAtChipsetPkgTokenSpaceGuid.PcdHpetBaseAddress|0xFED00000
--
2.36.1.windows.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [edk2-devel][edk2-platforms][PATCH V1 11/13] KabylakeOpenBoardPkg/Build: Reduce unnecessary code
2022-07-22 18:46 [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Oram, Isaac W
` (9 preceding siblings ...)
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 10/13] PurleyOpenBoardPkg/Build: " Oram, Isaac W
@ 2022-07-22 18:46 ` Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 12/13] CometlakeOpenBoardPkg/Build: " Oram, Isaac W
` (2 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Oram, Isaac W @ 2022-07-22 18:46 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Chasel Chiu, Nate DeSimone
Leverage common includes to reduce duplicated or low value code.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
.../AspireVn7Dash572G/OpenBoardPkgPcd.dsc | 52 +++++--------------
.../GalagoPro3/OpenBoardPkgPcd.dsc | 51 +++++-------------
.../KabylakeRvp3/OpenBoardPkgPcd.dsc | 51 +++++-------------
3 files changed, 36 insertions(+), 118 deletions(-)
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkgPcd.dsc b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkgPcd.dsc
index 02080aa864..da8f9a075c 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkgPcd.dsc
@@ -195,43 +195,18 @@
######################################
# Platform Configuration
######################################
- gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE # FIXME: Define by PERFORMANCE_BUILD?
- gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|FALSE # FIXME: Define in build-system?
-
-!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
-
-# TODO: Is TESTING setting, is not test point
-!if $(TARGET) == DEBUG
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
-!else
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
-!endif
+ #
+ # MinPlatform common include for required feature PCD
+ # These PCD must be set before the core include files, CoreCommonLib,
+ # CorePeiLib, and CoreDxeLib.
+ # Optional MinPlatformPkg features should be enabled after this
+ #
+ !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
+ #
+ # Commonly used MinPlatform feature configuration logic that maps functionity to stage
+ #
+ !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
######################################
# Board Configuration
@@ -285,9 +260,6 @@
!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdReclaimVariableSpaceAtEndOfDxe|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE
-!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE
- gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1
-!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE
!if $(TARGET) == RELEASE
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc
index 26e2c16aae..2b9fbe81c0 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc
@@ -163,42 +163,18 @@
######################################
# Platform Configuration
######################################
- gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|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
-
-!if $(TARGET) == DEBUG
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
-!else
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
-!endif
+ #
+ # MinPlatform common include for required feature PCD
+ # These PCD must be set before the core include files, CoreCommonLib,
+ # CorePeiLib, and CoreDxeLib.
+ # Optional MinPlatformPkg features should be enabled after this
+ #
+ !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
+ #
+ # Commonly used MinPlatform feature configuration logic that maps functionity to stage
+ #
+ !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
######################################
# Board Configuration
@@ -233,9 +209,6 @@
!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x5000
gEfiMdeModulePkgTokenSpaceGuid.PcdReclaimVariableSpaceAtEndOfDxe|TRUE
-!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE
- gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1
-!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE
!if $(TARGET) == DEBUG
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc
index ccf757e202..360b99e0cf 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc
@@ -163,42 +163,18 @@
######################################
# Platform Configuration
######################################
- gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|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
-
-!if $(TARGET) == DEBUG
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
-!else
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
-!endif
+ #
+ # MinPlatform common include for required feature PCD
+ # These PCD must be set before the core include files, CoreCommonLib,
+ # CorePeiLib, and CoreDxeLib.
+ # Optional MinPlatformPkg features should be enabled after this
+ #
+ !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
+ #
+ # Commonly used MinPlatform feature configuration logic that maps functionity to stage
+ #
+ !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
######################################
# Board Configuration
@@ -233,9 +209,6 @@
!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x5000
gEfiMdeModulePkgTokenSpaceGuid.PcdReclaimVariableSpaceAtEndOfDxe|TRUE
-!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE
- gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1
-!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE
!if $(TARGET) == DEBUG
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE
--
2.36.1.windows.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [edk2-devel][edk2-platforms][PATCH V1 12/13] CometlakeOpenBoardPkg/Build: Reduce unnecessary code
2022-07-22 18:46 [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Oram, Isaac W
` (10 preceding siblings ...)
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 11/13] KabylakeOpenBoardPkg/Build: " Oram, Isaac W
@ 2022-07-22 18:46 ` Oram, Isaac W
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 13/13] MinPlatformPkg: Remove unnecessary feature controls Oram, Isaac W
2022-09-01 0:55 ` [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Nate DeSimone
13 siblings, 0 replies; 16+ messages in thread
From: Oram, Isaac W @ 2022-07-22 18:46 UTC (permalink / raw)
To: devel
Cc: Isaac Oram, Chasel Chiu, Nate DeSimone, Rangasai V Chaganty,
Deepika Kethi Reddy, Kathappan Esakkithevar
Leverage common includes to reduce duplicated or low value code.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Deepika Kethi Reddy <deepika.kethi.reddy@intel.com>
Cc: Kathappan Esakkithevar <kathappan.esakkithevar@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
.../CometlakeURvp/OpenBoardPkgPcd.dsc | 51 +++++--------------
1 file changed, 12 insertions(+), 39 deletions(-)
diff --git a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkgPcd.dsc b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkgPcd.dsc
index 68dd08423b..79924f1fda 100644
--- a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkgPcd.dsc
@@ -125,42 +125,18 @@
######################################
# Platform Configuration
######################################
- gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|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
-
-!if $(TARGET) == DEBUG
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
-!else
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
-!endif
+ #
+ # MinPlatform common include for required feature PCD
+ # These PCD must be set before the core include files, CoreCommonLib,
+ # CorePeiLib, and CoreDxeLib.
+ # Optional MinPlatformPkg features should be enabled after this
+ #
+ !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+
+ #
+ # Commonly used MinPlatform feature configuration logic that maps functionity to stage
+ #
+ !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
######################################
# Board Configuration
@@ -195,9 +171,6 @@
!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x5000
gEfiMdeModulePkgTokenSpaceGuid.PcdReclaimVariableSpaceAtEndOfDxe|TRUE
-!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE
- gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1
-!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE
!if $(TARGET) == DEBUG
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE
--
2.36.1.windows.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [edk2-devel][edk2-platforms][PATCH V1 13/13] MinPlatformPkg: Remove unnecessary feature controls
2022-07-22 18:46 [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Oram, Isaac W
` (11 preceding siblings ...)
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 12/13] CometlakeOpenBoardPkg/Build: " Oram, Isaac W
@ 2022-07-22 18:46 ` Oram, Isaac W
2022-09-01 0:55 ` [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Nate DeSimone
13 siblings, 0 replies; 16+ messages in thread
From: Oram, Isaac W @ 2022-07-22 18:46 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Chasel Chiu, Nate DeSimone, Liming Gao, Eric Dong
Remove SMI handler profile feature control.
Disable handler profiling on RELEASE builds.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 1 -
1 file changed, 1 deletion(-)
diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
index 098bb50075..5aaa4a9b92 100644
--- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
+++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
@@ -383,6 +383,5 @@
gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly |FALSE|BOOLEAN|0xF00000A3
gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE|BOOLEAN|0xF00000A4
gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable |FALSE|BOOLEAN|0xF00000A5
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE|BOOLEAN|0xF00000A6
gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE|BOOLEAN|0xF00000A7
gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable |FALSE|BOOLEAN|0xF00000B0
--
2.36.1.windows.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting
2022-07-22 18:46 [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Oram, Isaac W
` (12 preceding siblings ...)
2022-07-22 18:46 ` [edk2-devel][edk2-platforms][PATCH V1 13/13] MinPlatformPkg: Remove unnecessary feature controls Oram, Isaac W
@ 2022-09-01 0:55 ` Nate DeSimone
2022-09-01 1:48 ` Isaac Oram
13 siblings, 1 reply; 16+ messages in thread
From: Nate DeSimone @ 2022-09-01 0:55 UTC (permalink / raw)
To: Oram, Isaac W, devel@edk2.groups.io
Cc: Chiu, Chasel, Gao, Liming, Dong, Eric, Chaganty, Rangasai V,
Luo, Heng, Kethi Reddy, Deepika, Esakkithevar, Kathappan
Hi Isaac,
Good cleanup! For the series...
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
-----Original Message-----
From: Oram, Isaac W <isaac.w.oram@intel.com>
Sent: Friday, July 22, 2022 11:46 AM
To: devel@edk2.groups.io
Cc: Oram, Isaac W <isaac.w.oram@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Dong, Eric <eric.dong@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Luo, Heng <heng.luo@intel.com>; Kethi Reddy, Deepika <deepika.kethi.reddy@intel.com>; Esakkithevar, Kathappan <kathappan.esakkithevar@intel.com>
Subject: [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting
These changes simplify the logic for board porting by creating common include files for initializing PCD and for some stage specific logic commonly implemented.
Removes the PERFORMANCE_ENABLE flag and rely on the gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable only.
Simplifies the WhitleyOpenBoardPkg performance monitoring infrastructure.
Removes gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable and disable handler profiling on RELEASE builds.
The net result is removal of unnecessary or duplicate options and the reduction in duplicate code with increases in comments.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Heng Luo <heng.luo@intel.com>
Cc: Deepika Kethi Reddy <deepika.kethi.reddy@intel.com>
Cc: Kathappan Esakkithevar <kathappan.esakkithevar@intel.com>
Isaac Oram (13):
MinPlatformPkg/Include: Simplify board creation
WhitleyOpenBoardPkg/Build: Reduce duplicate code
Features/Intel: Reduce duplicate code
WhitleyOpenBoardPkg/Build: Reduce unnecessary code
MinPlatformPkg/Include: Simplify build logic
BoardModulePkg/Include: Add include for stage behavior logic
WhiskeyLakeOpenBoardPkg/Build: Reduce unnecessary code
TigerLakeOpenBoardPkg/Build: Reduce unnecessary code
SimicsOpenBoardPkg/Build: Reduce unnecessary code
PurleyOpenBoardPkg/Build: Reduce unnecessary code
KabylakeOpenBoardPkg/Build: Reduce unnecessary code
CometlakeOpenBoardPkg/Build: Reduce unnecessary code
MinPlatformPkg: Remove unnecessary feature controls
.../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 13 ++--
.../AcpiDebugFeaturePkg.dsc | 12 ++--
.../BeepDebugFeaturePkg.dsc | 15 ++--
.../PostCodeDebugFeaturePkg.dsc | 15 ++--
.../NetworkFeaturePkg/NetworkFeaturePkg.dsc | 13 ++--
.../IpmiFeaturePkg/IpmiFeaturePkg.dsc | 13 ++--
.../SpcrFeaturePkg/SpcrFeaturePkg.dsc | 13 ++--
.../S3FeaturePkg/S3FeaturePkg.dsc | 13 ++--
.../SmbiosFeaturePkg/SmbiosFeaturePkg.dsc | 13 ++--
.../TemplateFeaturePkg/TemplateFeaturePkg.dsc | 13 ++--
.../LogoFeaturePkg/LogoFeaturePkg.dsc | 12 ++--
.../UserAuthFeaturePkg/UserAuthFeaturePkg.dsc | 13 ++--
.../VirtualKeyboardFeaturePkg.dsc | 13 ++--
.../Include/Dsc/CommonStageConfig.dsc.inc | 37 ++++++++++
.../CometlakeURvp/OpenBoardPkgPcd.dsc | 51 ++++---------
.../AspireVn7Dash572G/OpenBoardPkgPcd.dsc | 52 ++++----------
.../GalagoPro3/OpenBoardPkgPcd.dsc | 51 ++++---------
.../KabylakeRvp3/OpenBoardPkgPcd.dsc | 51 ++++---------
.../Include/Dsc/CoreCommonLib.dsc | 6 +-
.../Include/Dsc/CoreDxeInclude.dsc | 23 +++---
.../Dsc/MinPlatformFeaturesPcd.dsc.inc | 25 +++++++
.../Intel/MinPlatformPkg/MinPlatformPkg.dec | 1 -
.../Intel/MinPlatformPkg/MinPlatformPkg.dsc | 14 ++--
.../BoardMtOlympus/PlatformPkgConfig.dsc | 46 ++++--------
.../BoardMtOlympus/PlatformPkgPcd.dsc | 52 ++++----------
.../BoardTiogaPass/PlatformPkgConfig.dsc | 48 ++++---------
.../BoardTiogaPass/PlatformPkgPcd.dsc | 52 ++++----------
.../BoardX58Ich10/OpenBoardPkgPcd.dsc | 51 ++++---------
.../TigerlakeURvp/OpenBoardPkgPcd.dsc | 52 ++++----------
.../UpXtreme/OpenBoardPkgPcd.dsc | 51 ++++---------
.../WhiskeylakeURvp/OpenBoardPkgPcd.dsc | 51 ++++---------
.../Aowanda/PlatformPkg.dsc | 3 -
.../BoardPortTemplate/PlatformPkg.dsc | 50 +++++++++++++
...blePerformanceMonitoringInfrastructure.dsc | 5 +- ...anceMonitoringInfrastructurePostMemory.fdf | 5 +- ...manceMonitoringInfrastructurePreMemory.fdf | 2 +-
.../JunctionCity/PlatformPkg.dsc | 3 -
.../Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc | 72 ++++++------------- .../WhitleyOpenBoardPkg/PlatformPkgConfig.dsc | 2 -
39 files changed, 382 insertions(+), 645 deletions(-) create mode 100644 Platform/Intel/BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
create mode 100644 Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
--
2.36.1.windows.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting
2022-09-01 0:55 ` [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting Nate DeSimone
@ 2022-09-01 1:48 ` Isaac Oram
0 siblings, 0 replies; 16+ messages in thread
From: Isaac Oram @ 2022-09-01 1:48 UTC (permalink / raw)
To: Desimone, Nathaniel L, devel@edk2.groups.io
Cc: Chiu, Chasel, Gao, Liming, Dong, Eric, Chaganty, Rangasai V,
Luo, Heng, Kethi Reddy, Deepika, Esakkithevar, Kathappan
Pushed as 3c3b116801..d9994fa7e1
-----Original Message-----
From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
Sent: Wednesday, August 31, 2022 5:55 PM
To: Oram, Isaac W <isaac.w.oram@intel.com>; devel@edk2.groups.io
Cc: Chiu, Chasel <chasel.chiu@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Dong, Eric <eric.dong@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Luo, Heng <heng.luo@intel.com>; Kethi Reddy, Deepika <deepika.kethi.reddy@intel.com>; Esakkithevar, Kathappan <kathappan.esakkithevar@intel.com>
Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting
Hi Isaac,
Good cleanup! For the series...
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
-----Original Message-----
From: Oram, Isaac W <isaac.w.oram@intel.com>
Sent: Friday, July 22, 2022 11:46 AM
To: devel@edk2.groups.io
Cc: Oram, Isaac W <isaac.w.oram@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Dong, Eric <eric.dong@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Luo, Heng <heng.luo@intel.com>; Kethi Reddy, Deepika <deepika.kethi.reddy@intel.com>; Esakkithevar, Kathappan <kathappan.esakkithevar@intel.com>
Subject: [edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting
These changes simplify the logic for board porting by creating common include files for initializing PCD and for some stage specific logic commonly implemented.
Removes the PERFORMANCE_ENABLE flag and rely on the gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable only.
Simplifies the WhitleyOpenBoardPkg performance monitoring infrastructure.
Removes gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable and disable handler profiling on RELEASE builds.
The net result is removal of unnecessary or duplicate options and the reduction in duplicate code with increases in comments.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Heng Luo <heng.luo@intel.com>
Cc: Deepika Kethi Reddy <deepika.kethi.reddy@intel.com>
Cc: Kathappan Esakkithevar <kathappan.esakkithevar@intel.com>
Isaac Oram (13):
MinPlatformPkg/Include: Simplify board creation
WhitleyOpenBoardPkg/Build: Reduce duplicate code
Features/Intel: Reduce duplicate code
WhitleyOpenBoardPkg/Build: Reduce unnecessary code
MinPlatformPkg/Include: Simplify build logic
BoardModulePkg/Include: Add include for stage behavior logic
WhiskeyLakeOpenBoardPkg/Build: Reduce unnecessary code
TigerLakeOpenBoardPkg/Build: Reduce unnecessary code
SimicsOpenBoardPkg/Build: Reduce unnecessary code
PurleyOpenBoardPkg/Build: Reduce unnecessary code
KabylakeOpenBoardPkg/Build: Reduce unnecessary code
CometlakeOpenBoardPkg/Build: Reduce unnecessary code
MinPlatformPkg: Remove unnecessary feature controls
.../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 13 ++--
.../AcpiDebugFeaturePkg.dsc | 12 ++--
.../BeepDebugFeaturePkg.dsc | 15 ++--
.../PostCodeDebugFeaturePkg.dsc | 15 ++--
.../NetworkFeaturePkg/NetworkFeaturePkg.dsc | 13 ++--
.../IpmiFeaturePkg/IpmiFeaturePkg.dsc | 13 ++--
.../SpcrFeaturePkg/SpcrFeaturePkg.dsc | 13 ++--
.../S3FeaturePkg/S3FeaturePkg.dsc | 13 ++--
.../SmbiosFeaturePkg/SmbiosFeaturePkg.dsc | 13 ++--
.../TemplateFeaturePkg/TemplateFeaturePkg.dsc | 13 ++--
.../LogoFeaturePkg/LogoFeaturePkg.dsc | 12 ++--
.../UserAuthFeaturePkg/UserAuthFeaturePkg.dsc | 13 ++--
.../VirtualKeyboardFeaturePkg.dsc | 13 ++--
.../Include/Dsc/CommonStageConfig.dsc.inc | 37 ++++++++++
.../CometlakeURvp/OpenBoardPkgPcd.dsc | 51 ++++---------
.../AspireVn7Dash572G/OpenBoardPkgPcd.dsc | 52 ++++----------
.../GalagoPro3/OpenBoardPkgPcd.dsc | 51 ++++---------
.../KabylakeRvp3/OpenBoardPkgPcd.dsc | 51 ++++---------
.../Include/Dsc/CoreCommonLib.dsc | 6 +-
.../Include/Dsc/CoreDxeInclude.dsc | 23 +++---
.../Dsc/MinPlatformFeaturesPcd.dsc.inc | 25 +++++++
.../Intel/MinPlatformPkg/MinPlatformPkg.dec | 1 -
.../Intel/MinPlatformPkg/MinPlatformPkg.dsc | 14 ++--
.../BoardMtOlympus/PlatformPkgConfig.dsc | 46 ++++--------
.../BoardMtOlympus/PlatformPkgPcd.dsc | 52 ++++----------
.../BoardTiogaPass/PlatformPkgConfig.dsc | 48 ++++---------
.../BoardTiogaPass/PlatformPkgPcd.dsc | 52 ++++----------
.../BoardX58Ich10/OpenBoardPkgPcd.dsc | 51 ++++---------
.../TigerlakeURvp/OpenBoardPkgPcd.dsc | 52 ++++----------
.../UpXtreme/OpenBoardPkgPcd.dsc | 51 ++++---------
.../WhiskeylakeURvp/OpenBoardPkgPcd.dsc | 51 ++++---------
.../Aowanda/PlatformPkg.dsc | 3 -
.../BoardPortTemplate/PlatformPkg.dsc | 50 +++++++++++++
...blePerformanceMonitoringInfrastructure.dsc | 5 +- ...anceMonitoringInfrastructurePostMemory.fdf | 5 +- ...manceMonitoringInfrastructurePreMemory.fdf | 2 +-
.../JunctionCity/PlatformPkg.dsc | 3 -
.../Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc | 72 ++++++------------- .../WhitleyOpenBoardPkg/PlatformPkgConfig.dsc | 2 -
39 files changed, 382 insertions(+), 645 deletions(-) create mode 100644 Platform/Intel/BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc
create mode 100644 Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
--
2.36.1.windows.1
^ permalink raw reply [flat|nested] 16+ messages in thread