From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from cxsh.intel-email.com (cxsh.intel-email.com [121.46.250.151]) by mx.groups.io with SMTP id smtpd.web10.6923.1687846467787077046 for ; Mon, 26 Jun 2023 23:14:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@byosoft.com.cn header.s=cloud-union header.b=dvwswc64; spf=pass (domain: byosoft.com.cn, ip: 121.46.250.151, mailfrom: gaoliming@byosoft.com.cn) Received: from cxsh.intel-email.com (localhost [127.0.0.1]) by cxsh.intel-email.com (Postfix) with ESMTP id 75083DDA785 for ; Tue, 27 Jun 2023 14:14:24 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=byosoft.com.cn; s=cloud-union; t=1687846464; bh=z6rb5u0kHimVzS7QTpA7bx2D5w1if2x8fcP3sTVZsfc=; h=From:To:Cc:References:In-Reply-To:Subject:Date; b=dvwswc64FfYXlLf0PNay488pwgj9U3md1Wr3LtfD/pw9Byq3T6GBo14dYHKD6IpQI wICib7XIqDX1BWojOIzDRYEJh5Gh878HHLyTKS0W+2uSXHpmB9F3EWHFfj6/DZ2ia+ z44Em2KqInVKaOKsh0GQQxJE8CQsl5h4WI6uQHqw= Received: from localhost (localhost [127.0.0.1]) by cxsh.intel-email.com (Postfix) with ESMTP id 70A82DDA7A4 for ; Tue, 27 Jun 2023 14:14:24 +0800 (CST) Received: from cxsh.intel-email.com (localhost [127.0.0.1]) by cxsh.intel-email.com (Postfix) with ESMTP id 32B90DDA7BF for ; Tue, 27 Jun 2023 14:14:24 +0800 (CST) Authentication-Results: cxsh.intel-email.com; none Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by cxsh.intel-email.com (Postfix) with SMTP id C4786DDA7D0 for ; Tue, 27 Jun 2023 14:14:20 +0800 (CST) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Tue, 27 Jun 2023 14:14:15 +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: "'Yuwei Chen'" , Cc: "'Rebecca Cran'" , "'Bob Feng'" References: <20230627025330.1579-1-yuwei.chen@intel.com> In-Reply-To: <20230627025330.1579-1-yuwei.chen@intel.com> Subject: =?UTF-8?B?5Zue5aSNOiBbUGF0Y2ggVjNdIFtlZGsyLXN0YWdpbmddIEJhc2VUb29scy9GTU1UOiBDIEZNTVQgbWF0Y2ggbmV3IHZlcnNpb24gbWFjaGluZSBkZWZpbmVz?= Date: Tue, 27 Jun 2023 14:14:14 +0800 Message-ID: <017d01d9a8be$996c8960$cc459c20$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQHTEhfsxaJBEAPTqnMe0B1G6wLfHK+rWPZQ Sender: "gaoliming" Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Reviewed-by: Liming Gao > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: Yuwei Chen > =B7=A2=CB=CD=CA=B1=BC=E4: 2023=C4=EA6=D4=C227=C8=D5 10:54 > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io > =B3=AD=CB=CD: Rebecca Cran ; Liming Gao > ; Bob Feng > =D6=F7=CC=E2: [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT match = new > version machine defines >=20 > 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. >=20 > Cc: Rebecca Cran > Cc: Liming Gao > Cc: Bob Feng > Signed-off-by: Yuwei Chen > --- >=20 > V3 modify the patch with the correct define > BaseTools/Source/C/FMMT/Rebase.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) >=20 > 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; >=20 > } >=20 >=20 >=20 > - //if ((ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_ARMT) || >=20 > - // (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_AARCH64)) { >=20 > + //if ((ImageContext.Machine =3D=3D > IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) || >=20 > + // (ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_ARM64)) { >=20 > // mArm =3D TRUE; >=20 > //} >=20 >=20 >=20 > @@ -435,8 +435,8 @@ EFI_NOT_FOUND No compressed > sections could be found. > return Status; >=20 > } >=20 >=20 >=20 > - //if ((ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_ARMT) || >=20 > - // (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_AARCH64)) { >=20 > + //if ((ImageContext.Machine =3D=3D > IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) || >=20 > + // (ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_ARM64)) { >=20 > // mArm =3D TRUE; >=20 > //} >=20 >=20 >=20 > @@ -835,8 +835,8 @@ Returns: > // >=20 > // Verify machine type is supported >=20 > // >=20 > - if ((*MachineType !=3D EFI_IMAGE_MACHINE_IA32) && (*MachineType = !=3D > EFI_IMAGE_MACHINE_X64) && (*MachineType !=3D > EFI_IMAGE_MACHINE_EBC) && >=20 > - (*MachineType !=3D EFI_IMAGE_MACHINE_ARMT) && > (*MachineType !=3D EFI_IMAGE_MACHINE_AARCH64)) { >=20 > + if ((*MachineType !=3D IMAGE_FILE_MACHINE_I386) && (*MachineType = !=3D > IMAGE_FILE_MACHINE_X64) && (*MachineType !=3D > IMAGE_FILE_MACHINE_EBC) && >=20 > + (*MachineType !=3D IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) && > (*MachineType !=3D IMAGE_FILE_MACHINE_ARM64)) { >=20 > Error (NULL, 0, 3000, "Invalid", "Unrecognized machine type in = the PE32 > file."); >=20 > return EFI_UNSUPPORTED; >=20 > } >=20 > -- > 2.27.0.windows.1