Because Alder Lake FSP includes an older version of CpuMpPei MpInfo2HobPei
is needed to boot with newer versions of EDK II.
Accordingly, this change adds MpInfo2HobPei to FvPostMemory.
Cc: Sai Chaganty <rangasai.v.chaga...@intel.com>
Cc: Rosen Chuang <rosen.chu...@intel.com>
Cc: Saloni Kasbekar <saloni.kasbe...@intel.com>
Cc: Chasel Chiu <chasel.c...@intel.com>
Cc: Liming Gao <gaolim...@byosoft.com.cn>
Cc: Eric Dong <eric.d...@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desim...@intel.com>
---
.../AlderlakePRvp/OpenBoardPkg.dsc | 10 +++++++++-
.../AlderlakePRvp/OpenBoardPkg.fdf | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git
a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc
b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc
index edd03cba68..092cb34831 100644
--- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc
+++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc
@@ -1,7 +1,7 @@
## @file
# The main build description file for the AlderlakePRvp board.
#
-# Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2022 - 2024, Intel Corporation. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
@@ -342,6 +342,14 @@
ResetSystemLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/BaseResetSystemLib/BaseResetSy
<LibraryClasses>
}
+ #
+ # ADL FSP includes an older version of CpuMpPei, so the compatibility PEIM
+ # is needed when using FSP Dispatch mode.
+ #
+!if gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection == 0
+ $(PLATFORM_PACKAGE)/FspWrapper/MpInfo2HobPei/MpInfo2HobPei.inf
+!endif
+
#
# Security
#
diff --git
a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf
b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf
index ae7896e5e0..c8ceb8684c 100644
--- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf
+++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf
@@ -1,7 +1,7 @@
## @file
# FDF file of Platform.
#
-# Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2022 - 2024, Intel Corporation. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
@@ -344,6 +344,14 @@ INF
$(PLATFORM_BOARD_PACKAGE)/OpenBoardPlatformInit/OpenBoardPlatformInitPei/Ope
INF
$(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.inf
INF IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
+#
+# ADL FSP includes an older version of CpuMpPei, so the compatibility PEIM
+# is needed when using FSP Dispatch mode.
+#
+!if gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection == 0
+ INF $(PLATFORM_PACKAGE)/FspWrapper/MpInfo2HobPei/MpInfo2HobPei.inf
+!endif
+
[FV.FvPostMemory]
BlockSize = $(FLASH_BLOCK_SIZE)
--
2.44.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#118708): https://edk2.groups.io/g/devel/message/118708
Mute This Topic: https://groups.io/mt/105992898/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
