From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f169.google.com (mail-yw1-f169.google.com [209.85.128.169]) by mx.groups.io with SMTP id smtpd.web08.9965.1648575790577843218 for ; Tue, 29 Mar 2022 10:43:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@starlabs-systems.20210112.gappssmtp.com header.s=20210112 header.b=YTSkm1xR; spf=pass (domain: starlabs.systems, ip: 209.85.128.169, mailfrom: sean@starlabs.systems) Received: by mail-yw1-f169.google.com with SMTP id 00721157ae682-2e68c95e0f9so192283587b3.0 for ; Tue, 29 Mar 2022 10:43:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=F8ZcXWe5UhOOvEgiGlBfsyPsXAJUOdPMQl+f3B29ChE=; b=YTSkm1xR1nY7TDxU5OXMnoy+DYN2naQSzIENkC1Qq8YFcd0mwFgjGK6S46DMZB+kNs BtkW89jbMixH6hGK2x9NbXh4H6EhxGBPNFRhVH3XJ7//f7IM6+PZtNXxGqbxpGIzac81 ZLf2DGfJiOBNdX7QsJKbjpamswWiG6Gsj4urhS/GD5vGA8OGlaWLRmXAoQqST98vPLxZ U6h07j2XQrMmxVsW3EEkmqguULsy1RUqY3V9+5hy36iW93vebkSMPF51nniHadeBtKyh Q6LpIN7vpCK8bGrrNEMNyQ6gS4kPIgVvCC2hjlFBOc83Gfwov7bkHVyG/z1epUGARzgl R1cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=F8ZcXWe5UhOOvEgiGlBfsyPsXAJUOdPMQl+f3B29ChE=; b=aNjQPQ1RnpQacvdAufMlC1ktz/7573cmFmtnuUh88LUlVV48hChj90+nGnsQdoRjU2 x85/X3778lCgRqofx+Tpb2Pfmh7iZV4fd8LJC91CK2Ixd09DurnB6r0XI7rtfmzynkmv zioT4bxhRCg5Pc1xq9mXCif+9pPRnmbgy+j328pHgbrlYT7gwLvCGv2vSwIU/X5X9YOg ZntytKqYG2w1XEhfBM/alKs2kYM0ill2vDEXxWLj6G9HGVEL5cQMCu44hvtF04fNXvch cIaS/Fxc1PG0duZUfsJYqMUGzQGbsmthZMAxBBhCxJo0OrMzR32yX1xZiqkXWjgLYX3f 6RxA== X-Gm-Message-State: AOAM531gQn65KGkD76dZo+aa/T1gsb+50uKzrIU5gVdN5XP447OC0EV9 pZSNc4mRzQrEiD+EtKvyZh2xPdX6iPK9V//ctvI+ X-Google-Smtp-Source: ABdhPJyuc4UV94u1uZZnEJo4rPLIRy4G+ZCSk/CbkvZTLTUzYYO18gklFmuU+aUnJVDddaa/HNatAWlVrDN72DPBzFY= X-Received: by 2002:a0d:f685:0:b0:2e2:22e6:52d7 with SMTP id g127-20020a0df685000000b002e222e652d7mr32445809ywf.418.1648575789693; Tue, 29 Mar 2022 10:43:09 -0700 (PDT) MIME-Version: 1.0 References: <20220329174112.885-1-guo.dong@intel.com> In-Reply-To: <20220329174112.885-1-guo.dong@intel.com> From: "Sean Rhodes" Date: Tue, 29 Mar 2022 18:42:58 +0100 Message-ID: Subject: Re: [edk2-devel][PATCH] UefiPayloadPkg: Support IA32 Build To: guo.dong@intel.com Cc: devel@edk2.groups.io, Ray Ni , Benjamin You Content-Type: multipart/alternative; boundary="000000000000548d3305db5ef6a7" --000000000000548d3305db5ef6a7 Content-Type: text/plain; charset="UTF-8" Reviewed-by: Sean Rhodes On Tue, 29 Mar 2022 at 18:41, wrote: > From: Guo Dong > > 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 > Cc: Benjamin You > Cc: Sean Rhodes > Signed-off-by: Guo Dong > --- > 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 > > --000000000000548d3305db5ef6a7 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Reviewed-by: Sean Rhodes <sean@starlabs.systems>


On Tue, 29 Mar 2022 at 18:41, <guo.dong@intel.com> wrote:
From: Guo Dong <guo.dong@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.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>
---
=C2=A0UefiPayloadPkg/UniversalPayloadBuild.py | 4 +++-
=C2=A01 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/Unive= rsalPayloadBuild.py
index e624ec5874..ac965766c7 100644
--- a/UefiPayloadPkg/UniversalPayloadBuild.py
+++ b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -53,6 +53,7 @@ def RunCommand(cmd):
=C2=A0def BuildUniversalPayload(Args, MacroList):
=C2=A0 =C2=A0 =C2=A0BuildTarget =3D Args.Target
=C2=A0 =C2=A0 =C2=A0ToolChain =3D Args.ToolChain
+=C2=A0 =C2=A0 BuildArch =3D "X64" if Args.Arch =3D=3D 'X64&#= 39; else "IA32 -a X64"
=C2=A0 =C2=A0 =C2=A0ElfToolChain =3D 'CLANGDWARF'

=C2=A0 =C2=A0 =C2=A0EntryModuleInf =3D os.path.normpath("UefiPayloadPk= g/UefiPayloadEntry/UniversalPayloadEntry.inf")
@@ -87,7 +88,7 @@ def BuildUniversalPayload(Args, MacroList):
=C2=A0 =C2=A0 =C2=A0#
=C2=A0 =C2=A0 =C2=A0# Building Universal Payload entry.
=C2=A0 =C2=A0 =C2=A0#
-=C2=A0 =C2=A0 BuildModule =3D f"build -p {DscPath} -b {BuildTarget} -= a X64 -m {EntryModuleInf} -t {ElfToolChain} -y {ModuleReportPath}"
+=C2=A0 =C2=A0 BuildModule =3D f"build -p {DscPath} -b {BuildTarget} -= a {BuildArch} -m {EntryModuleInf} -t {ElfToolChain} -y {ModuleReportPath}&q= uot;
=C2=A0 =C2=A0 =C2=A0BuildModule +=3D Defines
=C2=A0 =C2=A0 =C2=A0RunCommand(BuildModule)

@@ -116,6 +117,7 @@ def main():
=C2=A0 =C2=A0 =C2=A0parser =3D argparse.ArgumentParser(description=3D'F= or building Universal Payload')
=C2=A0 =C2=A0 =C2=A0parser.add_argument('-t', '--ToolChain'= )
=C2=A0 =C2=A0 =C2=A0parser.add_argument('-b', '--Target', d= efault=3D'DEBUG')
+=C2=A0 =C2=A0 parser.add_argument('-a', '--Arch', choices= =3D['IA32', 'X64'], help=3D'Specify the ARCH for payloa= d entry module. Default build X64 image.', default =3D'X64') =C2=A0 =C2=A0 =C2=A0parser.add_argument("-D", "--Macro"= , action=3D"append", default=3D["UNIVERSAL_PAYLOAD=3DTRUE&qu= ot;])
=C2=A0 =C2=A0 =C2=A0parser.add_argument('-i', '--ImageId', = type=3Dstr, help=3D'Specify payload ID (16 bytes maximal).', defaul= t =3D'UEFI')
=C2=A0 =C2=A0 =C2=A0MacroList =3D {}
--
2.35.1.windows.2

--000000000000548d3305db5ef6a7--