UefiPayloadPkg: Support IA32 Build

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.ni@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Signed-off-by: Guo Dong <guo.dong@intel.com>
Reviewed-by: Sean Rhodes <sean@starlabs.systems>

diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py
index e624ec5874cf114f387239f3b3f92e49bc25f654..ac965766c749f4fb0cbc9fed88c4f8ac0acb80d7 100644 (file)
--- a/UefiPayloadPkg/UniversalPayloadBuild.py
+++ b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -53,6 +53,7 @@ def RunCommand(cmd):
 def BuildUniversalPayload(Args, MacroList):\r
     BuildTarget = Args.Target\r
     ToolChain = Args.ToolChain\r
+    BuildArch = "X64" if Args.Arch == 'X64' else "IA32 -a X64"\r
     ElfToolChain = 'CLANGDWARF'\r
 \r
     EntryModuleInf = os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf")\r
@@ -87,7 +88,7 @@ def BuildUniversalPayload(Args, MacroList):
     #\r
     # Building Universal Payload entry.\r
     #\r
-    BuildModule = f"build -p {DscPath} -b {BuildTarget} -a X64 -m {EntryModuleInf} -t {ElfToolChain} -y {ModuleReportPath}"\r
+    BuildModule = f"build -p {DscPath} -b {BuildTarget} -a {BuildArch} -m {EntryModuleInf} -t {ElfToolChain} -y {ModuleReportPath}"\r
     BuildModule += Defines\r
     RunCommand(BuildModule)\r
 \r
@@ -116,6 +117,7 @@ def main():
     parser = argparse.ArgumentParser(description='For building Universal Payload')\r
     parser.add_argument('-t', '--ToolChain')\r
     parser.add_argument('-b', '--Target', default='DEBUG')\r
+    parser.add_argument('-a', '--Arch', choices=['IA32', 'X64'], help='Specify the ARCH for payload entry module. Default build X64 image.', default ='X64')\r
     parser.add_argument("-D", "--Macro", action="append", default=["UNIVERSAL_PAYLOAD=TRUE"])\r
     parser.add_argument('-i', '--ImageId', type=str, help='Specify payload ID (16 bytes maximal).', default ='UEFI')\r
     MacroList = {}\r