From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from walk.intel-email.com (walk.intel-email.com [101.227.64.242]) by mx.groups.io with SMTP id smtpd.web10.30960.1688953881255757263 for ; Sun, 09 Jul 2023 18:51:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@byosoft.com.cn header.s=cloud-union header.b=VSOV2FzJ; spf=pass (domain: byosoft.com.cn, ip: 101.227.64.242, mailfrom: gaoliming@byosoft.com.cn) Received: from walk.intel-email.com (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id D8270CD1F6C0 for ; Mon, 10 Jul 2023 09:51:18 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=byosoft.com.cn; s=cloud-union; t=1688953878; bh=VGHEBi9WdssO94F1exAu0l42KynUMg1ZVp6W6LlLrSU=; h=From:To:Cc:References:In-Reply-To:Subject:Date; b=VSOV2FzJxoE80uuwoPW32q4b6/A+shx9fOikZ6kz3vRb5vunc2PC1jN4umQYZyWrL rm7rh43/isjAVJ8rXSvePoOWAZrh9MakFM2YyGHp8GEz6zqJv8gmCL6LsjAUyamgMO CrKRfnunBGc9xgaOtB7G5IB9UnEnLeUIf+K/54dU= Received: from localhost (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id D4200CD1F6A4 for ; Mon, 10 Jul 2023 09:51:18 +0800 (CST) Received: from walk.intel-email.com (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id A52FACD1F68B for ; Mon, 10 Jul 2023 09:51:18 +0800 (CST) Authentication-Results: walk.intel-email.com; none Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by walk.intel-email.com (Postfix) with SMTP id 354F2CD1F72E for ; Mon, 10 Jul 2023 09:51:16 +0800 (CST) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Mon, 10 Jul 2023 09:51:05 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 58.246.60.130 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: , Cc: "'Rebecca Cran'" , "'Feng, Bob C'" , "'Chan, Amy'" , "'Huang, Yanbo'" References: <20230627025330.1579-1-yuwei.chen@intel.com> <017d01d9a8be$996c8960$cc459c20$@byosoft.com.cn> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BhdGNoIFYzXSBbZWRrMi1zdGFnaW5nXSBCYXNlVG9vbHMvRk1NVDogQyBGTU1UIG1hdGNoIG5ldyB2ZXJzaW9uIG1hY2hpbmUgZGVmaW5lcw==?= Date: Mon, 10 Jul 2023 09:51:13 +0800 Message-ID: <009201d9b2d1$023b4cd0$06b1e670$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQHTEhfsxaJBEAPTqnMe0B1G6wLfHAHy1do+AY3b1BGvo3UHkA== Sender: "gaoliming" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Christine: I just push this patch @ bab1724cdf725b7d22869c79fa2b86ed47e01110 in edk2= -staging.=20 Thanks Liming > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > =E5=8F=91=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io = =E4=BB=A3=E8=A1=A8 Yuwei Chen > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2023=E5=B9=B47=E6=9C=884=E6=97=A5 1= 5:52 > =E6=94=B6=E4=BB=B6=E4=BA=BA: Gao, Liming ; deve= l@edk2.groups.io > =E6=8A=84=E9=80=81: 'Rebecca Cran' ; Feng, Bob C > ; Chan, Amy ; Huang, Yanbo > > =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [Patch V3] [edk2-staging] BaseTools/= FMMT: C FMMT > match new version machine defines >=20 > Hi Liming and Cran, >=20 > Can you help merge the code? It is urgent for us to use. =F0=9F=98=8A >=20 > Thanks a lot~ >=20 > Thanks, > Christine >=20 >=20 > > -----Original Message----- > > From: gaoliming > > Sent: Tuesday, June 27, 2023 2:14 PM > > To: Chen, Christine ; devel@edk2.groups.io > > Cc: 'Rebecca Cran' ; Feng, Bob C > > > > Subject: =E5=9B=9E=E5=A4=8D: [Patch V3] [edk2-staging] BaseTools/FMMT: = C FMMT match > > new version machine defines > > > > Reviewed-by: Liming Gao > > > > > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > > > =E5=8F=91=E4=BB=B6=E4=BA=BA: Yuwei Chen > > > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2023=E5=B9=B46=E6=9C=8827=E6=97= =A5 10:54 > > > =E6=94=B6=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io > > > =E6=8A=84=E9=80=81: Rebecca Cran ; Liming Gao > > > ; Bob Feng > > > =E4=B8=BB=E9=A2=98: [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT = match new > > version > > > machine defines > > > > > > BaseTools have switch from EFI_IMAGE_MACHINE_* to > > > IMAGE_FILE_MACHINE_*. Thus, match the FCE & FMMT tool in edk2- > > staging > > > repo with the new version define. > > > > > > Cc: Rebecca Cran > > > Cc: Liming Gao > > > Cc: Bob Feng > > > Signed-off-by: Yuwei Chen > > > --- > > > > > > V3 modify the patch with the correct define > > > BaseTools/Source/C/FMMT/Rebase.c | 12 ++++++------ > > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > > > diff --git a/BaseTools/Source/C/FMMT/Rebase.c > > > b/BaseTools/Source/C/FMMT/Rebase.c > > > index d32217d18c..20f8e5a3fc 100644 > > > --- a/BaseTools/Source/C/FMMT/Rebase.c > > > +++ b/BaseTools/Source/C/FMMT/Rebase.c > > > @@ -159,8 +159,8 @@ EFI_NOT_FOUND No compressed > > > sections could be found. > > > return Status; > > > > > > } > > > > > > > > > > > > - //if ((ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_ARMT) || > > > > > > - // (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_AARCH64)) { > > > > > > + //if ((ImageContext.Machine =3D=3D > > > IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) || > > > > > > + // (ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_ARM64)) { > > > > > > // mArm =3D TRUE; > > > > > > //} > > > > > > > > > > > > @@ -435,8 +435,8 @@ EFI_NOT_FOUND No compressed > > > sections could be found. > > > return Status; > > > > > > } > > > > > > > > > > > > - //if ((ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_ARMT) || > > > > > > - // (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_AARCH64)) { > > > > > > + //if ((ImageContext.Machine =3D=3D > > > IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) || > > > > > > + // (ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_ARM64)) { > > > > > > // mArm =3D TRUE; > > > > > > //} > > > > > > > > > > > > @@ -835,8 +835,8 @@ Returns: > > > // > > > > > > // Verify machine type is supported > > > > > > // > > > > > > - if ((*MachineType !=3D EFI_IMAGE_MACHINE_IA32) && > (*MachineType !=3D > > > EFI_IMAGE_MACHINE_X64) && (*MachineType !=3D > > > EFI_IMAGE_MACHINE_EBC) && > > > > > > - (*MachineType !=3D EFI_IMAGE_MACHINE_ARMT) && > > > (*MachineType !=3D EFI_IMAGE_MACHINE_AARCH64)) { > > > > > > + if ((*MachineType !=3D IMAGE_FILE_MACHINE_I386) && > (*MachineType !=3D > > > IMAGE_FILE_MACHINE_X64) && (*MachineType !=3D > > > IMAGE_FILE_MACHINE_EBC) && > > > > > > + (*MachineType !=3D IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) > && > > > (*MachineType !=3D IMAGE_FILE_MACHINE_ARM64)) { > > > > > > Error (NULL, 0, 3000, "Invalid", "Unrecognized machine type in > > > the > > PE32 > > > file."); > > > > > > return EFI_UNSUPPORTED; > > > > > > } > > > > > > -- > > > 2.27.0.windows.1 > > > > >=20 >=20 >=20 >=20 >=20