Reviewed-by: Ray Ni <ray...@intel.com> > -----Original Message----- > From: Liu, Zhiguang <zhiguang....@intel.com> > Sent: Tuesday, April 25, 2023 2:40 PM > To: devel@edk2.groups.io > Cc: Liu, Zhiguang <zhiguang....@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desim...@intel.com>; Ni, Ray <ray...@intel.com> > Subject: [PATCH 1/3] SimicsOpenBoardPkg: Support 64-bit Pei BoardX58Ich10 > > Create a new platform build configure file, build_config_x64.cfg. > It enables 64-bit Pei BoardX58Ich10. > > Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> > Cc: Ray Ni <ray...@intel.com> > Signed-off-by: Zhiguang Liu <zhiguang....@intel.com> > --- > .../BoardX58Ich10/OpenBoardPkg.dsc | 8 ++--- > .../BoardX58Ich10/OpenBoardPkg.fdf | 2 +- > .../BoardX58Ich10/build_config_x64.cfg | 31 +++++++++++++++++++ > Platform/Intel/build.cfg | 1 + > .../Intel/SimicsX58SktPkg/SktSecInclude.fdf | 2 +- > 5 files changed, 36 insertions(+), 8 deletions(-) > create mode 100644 > Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/build_config_x64.cfg > > diff --git > a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc > b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc > index 64c3af2584..c02804c19c 100644 > --- > a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc > +++ > b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc > @@ -72,9 +72,7 @@ > ####################################### > # Component Includes > ####################################### > -# @todo: Change below line to [Components.$(PEI_ARCH)] after > https://bugzilla.tianocore.org/show_bug.cgi?id=2308 > -# is completed > -[Components.IA32] > +[Components.$(PEI_ARCH)] > !include $(PLATFORM_PACKAGE)/Include/Dsc/CorePeiInclude.dsc > !include $(SKT_PKG)/SktPkgPei.dsc > > @@ -175,9 +173,7 @@ > ####################################### > # PEI Components > ####################################### > -# @todo: Change below line to [Components.$(PEI_ARCH)] after > https://bugzilla.tianocore.org/show_bug.cgi?id=2308 > -# is completed > -[Components.IA32] > +[Components.$(PEI_ARCH)] > ####################################### > # Edk2 Packages > ####################################### > diff --git > a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf > b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf > index 844f9b6dcf..ccb7fe7e59 100644 > --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf > +++ > b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf > @@ -121,7 +121,7 @@ READ_LOCK_CAP = TRUE > READ_LOCK_STATUS = TRUE > FvNameGuid = 229EEDCE-8E76-4809-B233-EC36BFBF6989 > > -INF RuleOverride=RESET_SECMAIN USE = IA32 > $(BOARD_PKG)/SecCore/SecMain.inf > +INF RuleOverride=RESET_SECMAIN USE = $(PEI_ARCH) > $(BOARD_PKG)/SecCore/SecMain.inf > !include $(SKT_PKG)/SktSecInclude.fdf > > [FV.FvPreMemory] > diff --git > a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/build_config_x64.cfg > b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/build_config_x64.cfg > new file mode 100644 > index 0000000000..b80415208a > --- /dev/null > +++ > b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/build_config_x64.cfg > @@ -0,0 +1,31 @@ > +# @ build_config.cfg > +# This is the BoardX58Ich10 board specific build settings enabling 64bit PEI. > +# > +# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> > +# SPDX-License-Identifier: BSD-2-Clause-Patent > +# > + > + > +[CONFIG] > +WORKSPACE_PLATFORM_BIN = edk2-non-osi/Platform/Intel > +EDK_SETUP_OPTION = > +openssl_path = > +PLATFORM_BOARD_PACKAGE = SimicsOpenBoardPkg > +PROJECT = SimicsOpenBoardPkg/BoardX58Ich10 > +BOARD = BoardX58Ich10 > +FLASH_MAP_FDF = > SimicsOpenBoardPkg/BoardX58Ich10/Include/Fdf/FlashMapInclude.fdf > +PROJECT_DSC = SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc > +BOARD_PKG_PCD_DSC = > SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc > +PrepRELEASE = DEBUG > +SILENT_MODE = FALSE > +EXT_CONFIG_CLEAR = > +CapsuleBuild = FALSE > +EXT_BUILD_FLAGS = -D PEI_ARCH=X64 > +CAPSULE_BUILD = 0 > +TARGET = DEBUG > +TARGET_SHORT = D > +PERFORMANCE_BUILD = FALSE > +FSP_WRAPPER_BUILD = FALSE > +FSP_BINARY_BUILD = FALSE > +FSP_TEST_RELEASE = FALSE > +SECURE_BOOT_ENABLE = FALSE > diff --git a/Platform/Intel/build.cfg b/Platform/Intel/build.cfg > index 8d480f27dc..fe0ddb7a1e 100644 > --- a/Platform/Intel/build.cfg > +++ b/Platform/Intel/build.cfg > @@ -57,6 +57,7 @@ BIOS_INFO_GUID = > # board_name = path_to_board_build_config.cfg > BoardMtOlympus = > PurleyOpenBoardPkg/BoardMtOlympus/build_config.cfg > BoardX58Ich10 = SimicsOpenBoardPkg/BoardX58Ich10/build_config.cfg > +BoardX58Ich10X64 = > SimicsOpenBoardPkg/BoardX58Ich10/build_config_x64.cfg > AspireVn7Dash572G = > KabylakeOpenBoardPkg/AspireVn7Dash572G/build_config.cfg > GalagoPro3 = KabylakeOpenBoardPkg/GalagoPro3/build_config.cfg > KabylakeRvp3 = KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg > diff --git a/Silicon/Intel/SimicsX58SktPkg/SktSecInclude.fdf > b/Silicon/Intel/SimicsX58SktPkg/SktSecInclude.fdf > index dafca1ad36..c1f9e00f22 100644 > --- a/Silicon/Intel/SimicsX58SktPkg/SktSecInclude.fdf > +++ b/Silicon/Intel/SimicsX58SktPkg/SktSecInclude.fdf > @@ -13,4 +13,4 @@ > # The code in this FV handles the initial firmware startup, and > # decompresses the PEI and DXE FVs which handles the rest of the boot > sequence. > # > -INF RuleOverride=RESET_VECTOR USE = IA32 > UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf > +INF RuleOverride=RESET_VECTOR USE = $(PEI_ARCH) > UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf > -- > 2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#103527): https://edk2.groups.io/g/devel/message/103527 Mute This Topic: https://groups.io/mt/98488021/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
