From: Guo Dong <guo.d...@intel.com>
The payload entry module should support to build as IA32 image
beside X64 image so that it could work with 32bit bootloaders.
This patch adds a option build parameter for arch selection.
Cc: Ray Ni <ray...@intel.com>
Cc: Benjamin You <benjamin....@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Signed-off-by: Guo Dong <guo.d...@intel.com>
---
UefiPayloadPkg/UniversalPayloadBuild.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py
b/UefiPayloadPkg/UniversalPayloadBuild.py
index e624ec5874..ac965766c7 100644
--- a/UefiPayloadPkg/UniversalPayloadBuild.py
+++ b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -53,6 +53,7 @@ def RunCommand(cmd):
def BuildUniversalPayload(Args, MacroList):
BuildTarget = Args.Target
ToolChain = Args.ToolChain
+ BuildArch = "X64" if Args.Arch == 'X64' else "IA32 -a X64"
ElfToolChain = 'CLANGDWARF'
EntryModuleInf =
os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf")
@@ -87,7 +88,7 @@ def BuildUniversalPayload(Args, MacroList):
#
# Building Universal Payload entry.
#
- BuildModule = f"build -p {DscPath} -b {BuildTarget} -a X64 -m
{EntryModuleInf} -t {ElfToolChain} -y {ModuleReportPath}"
+ BuildModule = f"build -p {DscPath} -b {BuildTarget} -a {BuildArch} -m
{EntryModuleInf} -t {ElfToolChain} -y {ModuleReportPath}"
BuildModule += Defines
RunCommand(BuildModule)
@@ -116,6 +117,7 @@ def main():
parser = argparse.ArgumentParser(description='For building Universal
Payload')
parser.add_argument('-t', '--ToolChain')
parser.add_argument('-b', '--Target', default='DEBUG')
+ parser.add_argument('-a', '--Arch', choices=['IA32', 'X64'], help='Specify
the ARCH for payload entry module. Default build X64 image.', default ='X64')
parser.add_argument("-D", "--Macro", action="append",
default=["UNIVERSAL_PAYLOAD=TRUE"])
parser.add_argument('-i', '--ImageId', type=str, help='Specify payload ID
(16 bytes maximal).', default ='UEFI')
MacroList = {}
--
2.35.1.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#88181): https://edk2.groups.io/g/devel/message/88181
Mute This Topic: https://groups.io/mt/90113865/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
