WhitleyOpenBoardPkg/Build: Remove confusing build options

There is an unnecessary inheritance of a SKX build option that has confused the build settings. Removed unused IE_ENABLE, PCH_PKG_OPTIONS, and SECURITY_OPTIONS Fix a bug where changes in PlatformPkgConfig.dsc were not taking effect because of missing [Defines] context. Cc: Nate DeSimone <[email protected]> Cc: Chasel Chiu <[email protected]> Signed-off-by: Isaac Oram <[email protected]> Reviewed-by: Nate DeSimone <[email protected]>
worproject · Mar 11, 2022 · 7cd51aa · 7cd51aa
1 parent d74d4ec
commit 7cd51aa
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 24 deletions.
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc
@@ -55,20 +55,16 @@ DEFINE NVDIMM_OPTIONS =
 
 !if $(CPUTARGET) == "ICX"
   DEFINE CPU_TYPE_OPTIONS  = -D ICX_HOST -D A0_HOST -D B0_HOST
+  DEFINE MAX_IMC_CH_OPTIONS = -D MAX_IMC=4 -D MAX_MC_CH=2
 !elseif $(CPUTARGET) == "CPX"
   DEFINE CPU_TYPE_OPTIONS  = -D SKX_HOST -D CLX_HOST -D CPX_HOST -D A0_HOST -D B0_HOST
+  DEFINE MAX_IMC_CH_OPTIONS = -D MAX_IMC=2 -D MAX_MC_CH=3
 !endif
 
 DEFINE MAX_SOCKET_CORE_THREAD_OPTIONS = -D MAX_SOCKET=$(MAX_SOCKET) -D MAX_CORE=$(MAX_CORE) -D MAX_THREAD=$(MAX_THREAD)
 
 DEFINE MRC_OPTIONS = -D LRDIMM_SUPPORT -D DDRT_SUPPORT
 
-!if $(CPU_SKX_ONLY_SUPPORT) == FALSE
-  DEFINE MAX_IMC_CH_OPTIONS = -D MAX_IMC=4 -D MAX_MC_CH=2
-!else
-  DEFINE MAX_IMC_CH_OPTIONS = -D MAX_IMC=2 -D MAX_MC_CH=3
-!endif
-
 DEFINE MAX_SAD_RULE_OPTION = -D MAX_SAD_RULES=24 -D MAX_DRAM_CLUSTERS=1
 
 DEFINE LT_BUILD_OPTIONS = -D LT_FLAG
@@ -88,9 +84,9 @@ DEFINE IIO_STACK_OPTIONS = -D MAX_IIO_STACK=6 -D MAX_LOGIC_IIO_STACK=8
 
 DEFINE PCH_BIOS_BUILD_OPTIONS = $(PCH_BUILD_OPTION) $(SC_PATH) $(SERVER_BUILD_OPTION)
 
-DEFINE EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CRB_EDKII_BUILD_OPTIONS) $(EDKII_DEBUG_BUILD_OPTIONS) $(PCH_BIOS_BUILD_OPTIONS) $(PCH_PKG_OPTIONS) $(MAX_SOCKET_CORE_THREAD_OPTIONS) $(MAX_IMC_CH_OPTIONS) $(MAX_SAD_RULE_OPTION) $(KTI_OPTIONS) $(IIO_STACK_OPTIONS) $(LT_BUILD_OPTIONS) $(SECURITY_OPTIONS) $(SPARING_SCRATCHPAD_OPTION) $(SCRATCHPAD_DEBUG_OPTION) $(NVDIMM_OPTIONS) -D EFI_PCI_IOV_SUPPORT -D WHEA_SUPPORT $(CPU_TYPE_OPTIONS) -D MMCFG_BASE_ADDRESS=0x80000000 -D DISABLE_NEW_DEPRECATED_INTERFACES $(MRC_OPTIONS) $(FSP_BUILD_OPTIONS)
+DEFINE EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CRB_EDKII_BUILD_OPTIONS) $(EDKII_DEBUG_BUILD_OPTIONS) $(PCH_BIOS_BUILD_OPTIONS) $(MAX_SOCKET_CORE_THREAD_OPTIONS) $(MAX_IMC_CH_OPTIONS) $(MAX_SAD_RULE_OPTION) $(KTI_OPTIONS) $(IIO_STACK_OPTIONS) $(LT_BUILD_OPTIONS) $(SPARING_SCRATCHPAD_OPTION) $(SCRATCHPAD_DEBUG_OPTION) $(NVDIMM_OPTIONS) -D EFI_PCI_IOV_SUPPORT -D WHEA_SUPPORT $(CPU_TYPE_OPTIONS) -D MMCFG_BASE_ADDRESS=0x80000000 -D DISABLE_NEW_DEPRECATED_INTERFACES $(MRC_OPTIONS) $(FSP_BUILD_OPTIONS)
 
-DEFINE IE_OPTIONS = $(IE_PATH) -DIE_SUPPORT=0
+DEFINE IE_OPTIONS = $(IE_PATH)
 
 !if $(LINUX_GCC_BUILD) == TRUE
   DEFINE EDK2_LINUX_BUILD_OPTIONS = -D EDK2_CTE_BUILD

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc
@@ -169,7 +169,7 @@
   ## This PCD specifies whether FPGA routine will be active
   gSocketPkgFpgaGuid.PcdSktFpgaActive|TRUE
 
-!if $(CPU_SKX_ONLY_SUPPORT) == TRUE
+!if $(CPUTARGET) == "CPX"
   gEfiCpRcPkgTokenSpaceGuid.PerBitMargin|FALSE
   gEfiCpRcPkgTokenSpaceGuid.PcdSeparateCwlAdj|TRUE
 !endif
@@ -343,7 +343,7 @@
   # Disable Fast Warm Boot for Whitley Openboard Package
   gEfiCpRcPkgTokenSpaceGuid.PcdMrcFastBootDefault|FALSE
 
-!if $(CPU_SKX_ONLY_SUPPORT) == FALSE
+!if $(CPUTARGET) == "ICX"
   gCpuUncoreTokenSpaceGuid.PcdWaSerializationEn|FALSE
   gEfiCpRcPkgTokenSpaceGuid.PcdMrcCmdVrefCenteringTrainingEnable|FALSE
 !endif
@@ -426,7 +426,7 @@
   #
 
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07         # Enable status codes for debug, progress, and errors
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042           # Displayed messages:  Error, Info, warn
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000047           # Displayed messages:  Error, Info, warn
 
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x80000000
   gUefiCpuPkgTokenSpaceGuid.PcdCpuNumberOfReservedVariableMtrrs|0
@@ -856,7 +856,7 @@
   DEFINE CPU_CPX_SUPPORT                     = FALSE
 !endif
 [PcdsFixedAtBuild]
-!if ($(CPU_SKX_ONLY_SUPPORT) == TRUE)
+!if $(CPUTARGET) == "CPX"
   gSiPkgTokenSpaceGuid.PcdPostedCsrAccessSupported         |FALSE
 !endif
 [LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION]

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkgConfig.dsc b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkgConfig.dsc
@@ -11,6 +11,7 @@
 # TRUE is ENABLE. FALSE is DISABLE.
 #
 
+[Defines]
 DEFINE CRB_FLAG_ENABLE                       = TRUE
 DEFINE DEBUG_FLAGS_ENABLE                    = FALSE
 
@@ -19,12 +20,6 @@ DEFINE PERFORMANCE_ENABLE                    = TRUE
 DEFINE SERVER_BIOS_ENABLE                    = TRUE
 DEFINE PCH_SERVER_BIOS_ENABLE                = TRUE
 
-!if $(CPUTARGET) == "CPX"
-  DEFINE CPU_SKX_ONLY_SUPPORT                = TRUE
-!else
-  DEFINE CPU_SKX_ONLY_SUPPORT                 = FALSE
-!endif
-
 !if $(CPUTARGET) == "CPX"
   DEFINE CPU_CPX_SUPPORT                     = TRUE
 !else

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaDxeRpBoards.fdf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaDxeRpBoards.fdf
@@ -8,9 +8,11 @@
 ##
 
 #
-# Currently shared by all platforms
+# Currently shared by all ICX platforms
 #
-INF  $(RP_PKG)/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.inf
+!if $(CPUTARGET) == "ICX"
+  INF  $(RP_PKG)/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.inf
+!endif
 
 #
 # Platform TypeWilsonCityRP

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaRpBoards.dsc b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaRpBoards.dsc
@@ -31,9 +31,11 @@ $(RP_PKG)/Uba/BoardInit/Pei/BoardInitPei.inf {
 
 [Components.X64]
 #
-# Currently shared by all platforms
+# Currently shared by all ICX platforms
 #
-$(RP_PKG)/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.inf
+!if $(CPUTARGET) == "ICX"
+  $(RP_PKG)/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.inf
+!endif
 
 #
 # Platform TypeWilsonCityRP

diff --git a/Silicon/Intel/WhitleySiliconPkg/Product/Whitley/SiliconPkg10nmPcds.dsc b/Silicon/Intel/WhitleySiliconPkg/Product/Whitley/SiliconPkg10nmPcds.dsc
@@ -52,7 +52,7 @@
   # for 10nm
   #
 
-!if $(CPU_SKX_ONLY_SUPPORT) == TRUE
+!if $(CPUTARGET) == "CPX"
 
   gEfiCpRcPkgTokenSpaceGuid.PcdMrcBdatDefault|FALSE
   gEfiCpRcPkgTokenSpaceGuid.PcdMrcWritePreambleTclkDefault|0x0
@@ -96,4 +96,4 @@
   #
   # enable NVDIMM support
   #
-  gEfiCpRcPkgTokenSpaceGuid.PcdNvDimmEn|TRUE
+  gEfiCpRcPkgTokenSpaceGuid.PcdNvDimmEn|TRUE