From e0082e66565f9a7b5966dba0590659bbcaf8ffdc Mon Sep 17 00:00:00 2001 From: Nate DeSimone Date: Mon, 23 Sep 2024 14:53:15 -0700 Subject: [PATCH] Build failure with Intel platforms on VS2019 REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4854 Build issues are currently seen on Intel platforms due to PR 5957. This PR introduces the requirement for any instance of SecCore to include StackCheckLibNull, which is not currently included on Intel platform builds. The fix is to add this library to SecCore. Signed-off-by: Nate DeSimone --- .../AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc | 1 + .../CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc | 1 + .../KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkg.dsc | 1 + .../Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc | 1 + .../Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc | 1 + Platform/Intel/QuarkPlatformPkg/Quark.dsc | 1 + Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc | 1 + .../TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.dsc | 1 + .../Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc | 1 + .../WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc | 1 + Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc | 5 ++++- 11 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc index 092cb348315..162d59af78d 100644 --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc @@ -277,6 +277,7 @@ ResetSystemLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/BaseResetSystemLib/BaseResetSy UefiCpuPkg/SecCore/SecCore.inf { PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf + NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf } diff --git a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc index 316100e9a59..5d72c017904 100644 --- a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc +++ b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc @@ -278,6 +278,7 @@ UefiCpuPkg/SecCore/SecCore.inf { PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf + NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf } # diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkg.dsc b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkg.dsc index 759e4ea86aa..eb70edbc0cc 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkg.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkg.dsc @@ -380,6 +380,7 @@ UefiCpuPkg/SecCore/SecCore.inf { PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf + NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf } MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf { diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc index 219ef20e55f..5e12920a5b3 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc @@ -294,6 +294,7 @@ UefiCpuPkg/SecCore/SecCore.inf { PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf + NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf } MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf { diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc index 1634d9b31f0..5700e4ec9fe 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc @@ -301,6 +301,7 @@ UefiCpuPkg/SecCore/SecCore.inf { PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf + NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf } !if gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection == 1 diff --git a/Platform/Intel/QuarkPlatformPkg/Quark.dsc b/Platform/Intel/QuarkPlatformPkg/Quark.dsc index 40d97683363..0729ab95f30 100644 --- a/Platform/Intel/QuarkPlatformPkg/Quark.dsc +++ b/Platform/Intel/QuarkPlatformPkg/Quark.dsc @@ -576,6 +576,7 @@ DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf ResetSystemLib|QuarkSocPkg/QuarkNorthCluster/Library/ResetSystemLib/ResetSystemLib.inf !endif + NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf } !if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE) diff --git a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc index 67472930c91..dc39a3f2e99 100644 --- a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc +++ b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc @@ -511,6 +511,7 @@ DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf ResetSystemLib|QuarkSocPkg/QuarkNorthCluster/Library/ResetSystemLib/ResetSystemLib.inf !endif + NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf } # diff --git a/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.dsc b/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.dsc index 758b966fee8..f39f128878a 100644 --- a/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.dsc +++ b/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.dsc @@ -197,6 +197,7 @@ UefiCpuPkg/SecCore/SecCore.inf { PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf + NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf } # diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc index e9c1751df9b..68271438c94 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc @@ -278,6 +278,7 @@ UefiCpuPkg/SecCore/SecCore.inf { PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf + NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf } # diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc index e3cf9963962..50261713b17 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc @@ -278,6 +278,7 @@ UefiCpuPkg/SecCore/SecCore.inf { PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf + NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf } # diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc index aae5d05cc5f..99bceb1e66f 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc @@ -685,7 +685,10 @@ PeiLib|MinPlatformPkg/Library/PeiLib/PeiLib.inf [Components.IA32] - UefiCpuPkg/SecCore/SecCore.inf + UefiCpuPkg/SecCore/SecCore.inf { + + NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf + } !include MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc