From nobody Mon Sep 16 20:05:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+105257+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+105257+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684937179; cv=none; d=zohomail.com; s=zohoarc; b=eHhQJhFiqr5x2PALHmGmNFCACVpxRzUUizvTOMA80ou4Er/unB4vcGkcLyC2VuE/htix2w5xyo9+O0S4wLtUUdxu+/bVsCc250jSbIFv/Jf4yamBa6f6DSHAxR0gAs6EoRtak8x7DajeJIWeX7kXV587l/thwV+JmRZ/d55V6fU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684937179; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=cJHK8apMXWdWw15XLa7FJfc9dwQEcdi9CIOqWQ65lsg=; b=eLt4kpq4stBoygM6JsnNbpTSNoB5hiyIPhV3XFveF00GnXXawbamqvj/aHmstdIQ7pLgCOIzWGYG83omzPqfXkWyz22lF0XIFK/rh7DZQ+tWhv7OJnFLm5tmmlgVnsCE2HIhdEJr1borqPkf42HmOFgvCgCodmyTEMld1CPkeRc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+105257+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 168493717990365.59346406956388; Wed, 24 May 2023 07:06:19 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id w3ZWYY1788612xrBnZlS79g5; Wed, 24 May 2023 07:06:19 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.9769.1684937178738316837 for ; Wed, 24 May 2023 07:06:19 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-138-2p94VJLxOzS-_YaR9Cl-FA-1; Wed, 24 May 2023 10:06:13 -0400 X-MC-Unique: 2p94VJLxOzS-_YaR9Cl-FA-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5177785A5A8; Wed, 24 May 2023 14:06:11 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EEB81140EBD7; Wed, 24 May 2023 14:06:09 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C37A3180615B; Wed, 24 May 2023 16:06:00 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Daniel Schaefer , =?UTF-8?q?Marvin=20H=C3=A4user?= , Rebecca Cran , Oliver Steffen , Liming Gao , Pawel Polawski , Chao Li , Ard Biesheuvel , Bob Feng , Sunil V L , Michael D Kinney , Leif Lindholm , Dongyan Qian , Yuwei Chen , Baoqi Zhang , Zhiguang Liu , Gerd Hoffmann Subject: [edk2-devel] [PATCH v6 09/11] BaseTools: switch from EFI_IMAGE_MACHINE_* to IMAGE_FILE_MACHINE_* Date: Wed, 24 May 2023 16:05:58 +0200 Message-Id: <20230524140600.1432056-10-kraxel@redhat.com> In-Reply-To: <20230524140600.1432056-1-kraxel@redhat.com> References: <20230524140600.1432056-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: 1I3wkvmjpm79cxju0H1gC8RMx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1684937179; bh=SS08E1hVv4Bv64e6M8fnks8l7G8SRsrFV7t7P7Ng2X4=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Ayf4WnQm6DEMqAzEjDk4qyX0yIoG3ozO1hywL/xIwc92WKbMvoGYfWYuiADvugtHkI8 wHtyELnOmx1S5kEif0nhYOG7436SdMeux18+DLAhMNxvZhqwpEBRhnNee7lt8/rVuj4Tf fXJU1SlZKV0lDzHuCpN1SHrxF8tzDlHCEgw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1684937181606100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Use the newer versions of the machine #defines. Signed-off-by: Gerd Hoffmann Reviewed-by: Chao Li Reviewed-by: Liming Gao Reviewed-by: Rebecca Cran --- BaseTools/Source/C/EfiRom/EfiRom.h | 10 ++--- .../C/Include/IndustryStandard/PeImage.h | 1 + BaseTools/Source/C/Common/BasePeCoff.c | 28 ++++++------- BaseTools/Source/C/GenFv/GenFvInternalLib.c | 42 +++++++++---------- BaseTools/Source/C/GenFw/Elf32Convert.c | 6 +-- BaseTools/Source/C/GenFw/Elf64Convert.c | 10 ++--- BaseTools/Source/C/GenFw/GenFw.c | 8 +--- 7 files changed, 50 insertions(+), 55 deletions(-) diff --git a/BaseTools/Source/C/EfiRom/EfiRom.h b/BaseTools/Source/C/EfiRom= /EfiRom.h index 0b39e2af2e0c..887a6a51e25b 100644 --- a/BaseTools/Source/C/EfiRom/EfiRom.h +++ b/BaseTools/Source/C/EfiRom/EfiRom.h @@ -108,11 +108,11 @@ typedef struct { // Machine Types // static STRING_LOOKUP mMachineTypes[] =3D { - { EFI_IMAGE_MACHINE_IA32, "IA32" }, - { EFI_IMAGE_MACHINE_X64, "X64" }, - { EFI_IMAGE_MACHINE_EBC, "EBC" }, - { EFI_IMAGE_MACHINE_ARMT, "ARM" }, - { EFI_IMAGE_MACHINE_AARCH64, "AA64" }, + { IMAGE_FILE_MACHINE_I386, "IA32" }, + { IMAGE_FILE_MACHINE_X64, "X64" }, + { IMAGE_FILE_MACHINE_EBC, "EBC" }, + { IMAGE_FILE_MACHINE_ARMTHUMB_MIXED, "ARM" }, + { IMAGE_FILE_MACHINE_ARM64, "AA64" }, { 0, NULL } }; =20 diff --git a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h b/BaseTo= ols/Source/C/Include/IndustryStandard/PeImage.h index 22161edf443d..fb867b5660a9 100644 --- a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h +++ b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h @@ -42,6 +42,7 @@ #define IMAGE_FILE_MACHINE_X64 0x8664 #define IMAGE_FILE_MACHINE_ARM 0x01c0 // Thumb only #define IMAGE_FILE_MACHINE_ARMT 0x01c2 // 32bit Mixed ARM and Thum= b/Thumb 2 Little Endian +#define IMAGE_FILE_MACHINE_ARMTHUMB_MIXED IMAGE_FILE_MACHINE_ARMT #define IMAGE_FILE_MACHINE_ARM64 0xAA64 // 64bit ARM Architecture, = Little Endian #define IMAGE_FILE_MACHINE_RISCV64 0x5064 // 64bit RISC-V ISA #define IMAGE_FILE_MACHINE_LOONGARCH64 0x6264 // 64bit LoongArch Architec= ture diff --git a/BaseTools/Source/C/Common/BasePeCoff.c b/BaseTools/Source/C/Co= mmon/BasePeCoff.c index 0172370174b6..038bb054e57a 100644 --- a/BaseTools/Source/C/Common/BasePeCoff.c +++ b/BaseTools/Source/C/Common/BasePeCoff.c @@ -169,13 +169,13 @@ PeCoffLoaderCheckImageType ( ImageContext->Machine =3D TeHdr->Machine; } =20 - if (ImageContext->Machine !=3D EFI_IMAGE_MACHINE_IA32 && \ - ImageContext->Machine !=3D EFI_IMAGE_MACHINE_X64 && \ - ImageContext->Machine !=3D EFI_IMAGE_MACHINE_ARMT && \ - ImageContext->Machine !=3D EFI_IMAGE_MACHINE_EBC && \ - ImageContext->Machine !=3D EFI_IMAGE_MACHINE_AARCH64 && \ - ImageContext->Machine !=3D EFI_IMAGE_MACHINE_RISCV64 && \ - ImageContext->Machine !=3D EFI_IMAGE_MACHINE_LOONGARCH64) { + if (ImageContext->Machine !=3D IMAGE_FILE_MACHINE_I386 && \ + ImageContext->Machine !=3D IMAGE_FILE_MACHINE_X64 && \ + ImageContext->Machine !=3D IMAGE_FILE_MACHINE_ARMTHUMB_MIXED && \ + ImageContext->Machine !=3D IMAGE_FILE_MACHINE_EBC && \ + ImageContext->Machine !=3D IMAGE_FILE_MACHINE_ARM64 && \ + ImageContext->Machine !=3D IMAGE_FILE_MACHINE_RISCV64 && \ + ImageContext->Machine !=3D IMAGE_FILE_MACHINE_LOONGARCH64) { // // unsupported PeImage machine type // @@ -759,16 +759,16 @@ PeCoffLoaderRelocateImage ( =20 default: switch (MachineType) { - case EFI_IMAGE_MACHINE_IA32: + case IMAGE_FILE_MACHINE_I386: Status =3D PeCoffLoaderRelocateIa32Image (Reloc, Fixup, &FixupDa= ta, Adjust); break; - case EFI_IMAGE_MACHINE_ARMT: + case IMAGE_FILE_MACHINE_ARMTHUMB_MIXED: Status =3D PeCoffLoaderRelocateArmImage (&Reloc, Fixup, &FixupDa= ta, Adjust); break; - case EFI_IMAGE_MACHINE_RISCV64: + case IMAGE_FILE_MACHINE_RISCV64: Status =3D PeCoffLoaderRelocateRiscVImage (Reloc, Fixup, &FixupD= ata, Adjust); break; - case EFI_IMAGE_MACHINE_LOONGARCH64: + case IMAGE_FILE_MACHINE_LOONGARCH64: Status =3D PeCoffLoaderRelocateLoongArch64Image (Reloc, Fixup, &= FixupData, Adjust); break; default: @@ -1255,14 +1255,14 @@ PeCoffLoaderGetPdbPointer ( // generate PE32+ image with PE32 Magic. // switch (Hdr.Pe32->FileHeader.Machine) { - case EFI_IMAGE_MACHINE_IA32: - case EFI_IMAGE_MACHINE_ARMT: + case IMAGE_FILE_MACHINE_I386: + case IMAGE_FILE_MACHINE_ARMTHUMB_MIXED: // // Assume PE32 image with IA32 Machine field. // Magic =3D EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC; break; - case EFI_IMAGE_MACHINE_X64: + case IMAGE_FILE_MACHINE_X64: // // Assume PE32+ image with X64 Machine field // diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source= /C/GenFv/GenFvInternalLib.c index c8d5cac8e26e..f466324d6192 100644 --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c @@ -1655,8 +1655,8 @@ Routine Description: =20 if ( Vtf0Detected && - (MachineType =3D=3D EFI_IMAGE_MACHINE_IA32 || - MachineType =3D=3D EFI_IMAGE_MACHINE_X64) + (MachineType =3D=3D IMAGE_FILE_MACHINE_I386 || + MachineType =3D=3D IMAGE_FILE_MACHINE_X64) ) { // // If the SEC core code is IA32 or X64 and the VTF-0 signature @@ -1714,7 +1714,7 @@ Routine Description: DebugMsg (NULL, 0, 9, "PeiCore physical entry point address", "Address= =3D 0x%llX", (unsigned long long) PeiCorePhysicalAddress); } =20 -if (MachineType =3D=3D EFI_IMAGE_MACHINE_IA32 || MachineType =3D=3D EFI_IM= AGE_MACHINE_X64) { +if (MachineType =3D=3D IMAGE_FILE_MACHINE_I386 || MachineType =3D=3D IMAGE= _FILE_MACHINE_X64) { if (PeiCorePhysicalAddress !=3D 0) { // // Get the location to update @@ -1804,12 +1804,12 @@ if (MachineType =3D=3D EFI_IMAGE_MACHINE_IA32 || Ma= chineType =3D=3D EFI_IMAGE_MACHINE_X6 // Ia32ResetAddressPtr =3D (UINT32 *) ((UINTN) FvImage->Eof - 8); *Ia32ResetAddressPtr =3D IpiVector; - } else if (MachineType =3D=3D EFI_IMAGE_MACHINE_ARMT) { + } else if (MachineType =3D=3D IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) { // // Since the ARM reset vector is in the FV Header you really don't nee= d a // Volume Top File, but if you have one for some reason don't crash... // - } else if (MachineType =3D=3D EFI_IMAGE_MACHINE_AARCH64) { + } else if (MachineType =3D=3D IMAGE_FILE_MACHINE_ARM64) { // // Since the AArch64 reset vector is in the FV Header you really don't= need a // Volume Top File, but if you have one for some reason don't crash... @@ -2204,7 +2204,7 @@ Routine Description: return EFI_SUCCESS; } =20 - if (MachineType =3D=3D EFI_IMAGE_MACHINE_ARMT) { + if (MachineType =3D=3D IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) { // ARM: Array of 4 UINT32s: // 0 - is branch relative to SEC entry point // 1 - PEI Entry Point @@ -2258,7 +2258,7 @@ Routine Description: // memcpy(FvImage->FileImage, ResetVector, sizeof (ResetVector)); =20 - } else if (MachineType =3D=3D EFI_IMAGE_MACHINE_AARCH64) { + } else if (MachineType =3D=3D IMAGE_FILE_MACHINE_ARM64) { // AArch64: Used as UINT64 ResetVector[2] // 0 - is branch relative to SEC entry point // 1 - PEI Entry Point @@ -2377,7 +2377,7 @@ Routine Description: return EFI_ABORTED; } =20 - if (MachineType !=3D EFI_IMAGE_MACHINE_RISCV64) { + if (MachineType !=3D IMAGE_FILE_MACHINE_RISCV64) { Error(NULL, 0, 3000, "Invalid", "Could not update SEC core because Mac= hine type is not RiscV."); return EFI_ABORTED; } @@ -2478,7 +2478,7 @@ Routine Description: if (!UpdateVectorSec) return EFI_SUCCESS; =20 - if (MachineType =3D=3D EFI_IMAGE_MACHINE_LOONGARCH64) { + if (MachineType =3D=3D IMAGE_FILE_MACHINE_LOONGARCH64) { UINT32 ResetVector[1]; =20 memset(ResetVector, 0, sizeof (ResetVector)); @@ -2595,9 +2595,9 @@ Routine Description: // // Verify machine type is supported // - if ((*MachineType !=3D EFI_IMAGE_MACHINE_IA32) && (*MachineType !=3D EF= I_IMAGE_MACHINE_X64) && (*MachineType !=3D EFI_IMAGE_MACHINE_EBC) && - (*MachineType !=3D EFI_IMAGE_MACHINE_ARMT) && (*MachineType !=3D EFI= _IMAGE_MACHINE_AARCH64) && - (*MachineType !=3D EFI_IMAGE_MACHINE_RISCV64) && (*MachineType !=3D = EFI_IMAGE_MACHINE_LOONGARCH64)) { + if ((*MachineType !=3D IMAGE_FILE_MACHINE_I386) && (*MachineType !=3D I= MAGE_FILE_MACHINE_X64) && (*MachineType !=3D IMAGE_FILE_MACHINE_EBC) && + (*MachineType !=3D IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) && (*MachineTy= pe !=3D IMAGE_FILE_MACHINE_ARM64) && + (*MachineType !=3D IMAGE_FILE_MACHINE_RISCV64) && (*MachineType !=3D= IMAGE_FILE_MACHINE_LOONGARCH64)) { Error (NULL, 0, 3000, "Invalid", "Unrecognized machine type in the PE3= 2 file."); return EFI_UNSUPPORTED; } @@ -3547,13 +3547,13 @@ Routine Description: } =20 // machine type is ARM, set a flag so ARM reset vector processing oc= curs - if ((MachineType =3D=3D EFI_IMAGE_MACHINE_ARMT) || (MachineType =3D= =3D EFI_IMAGE_MACHINE_AARCH64)) { + if ((MachineType =3D=3D IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) || (Machi= neType =3D=3D IMAGE_FILE_MACHINE_ARM64)) { VerboseMsg("Located ARM/AArch64 SEC/PEI core in child FV"); mArm =3D TRUE; } =20 // Machine type is LOONGARCH64, set a flag so LoongArch64 reset vect= or processed. - if (MachineType =3D=3D EFI_IMAGE_MACHINE_LOONGARCH64) { + if (MachineType =3D=3D IMAGE_FILE_MACHINE_LOONGARCH64) { VerboseMsg("Located LoongArch64 SEC core in child FV"); mLoongArch =3D TRUE; } @@ -3706,16 +3706,16 @@ Routine Description: return Status; } =20 - 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; } =20 - if (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_RISCV64) { + if (ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_RISCV64) { mRiscV =3D TRUE; } =20 - if (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_LOONGARCH64) { + if (ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_LOONGARCH64) { mLoongArch =3D TRUE; } =20 @@ -3991,12 +3991,12 @@ Routine Description: return Status; } =20 - 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; } =20 - if (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_LOONGARCH64) { + if (ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_LOONGARCH64) { mLoongArch =3D TRUE; } =20 diff --git a/BaseTools/Source/C/GenFw/Elf32Convert.c b/BaseTools/Source/C/G= enFw/Elf32Convert.c index e9fb3593a91b..de198e58db07 100644 --- a/BaseTools/Source/C/GenFw/Elf32Convert.c +++ b/BaseTools/Source/C/GenFw/Elf32Convert.c @@ -553,16 +553,16 @@ ScanSections32 ( =20 switch (mEhdr->e_machine) { case EM_386: - NtHdr->Pe32.FileHeader.Machine =3D EFI_IMAGE_MACHINE_IA32; + NtHdr->Pe32.FileHeader.Machine =3D IMAGE_FILE_MACHINE_I386; NtHdr->Pe32.OptionalHeader.Magic =3D EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC; break; case EM_ARM: - NtHdr->Pe32.FileHeader.Machine =3D EFI_IMAGE_MACHINE_ARMT; + NtHdr->Pe32.FileHeader.Machine =3D IMAGE_FILE_MACHINE_ARMTHUMB_MIXED; NtHdr->Pe32.OptionalHeader.Magic =3D EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC; break; default: VerboseMsg ("%s unknown e_machine type %hu. Assume IA-32", mInImageNam= e, mEhdr->e_machine); - NtHdr->Pe32.FileHeader.Machine =3D EFI_IMAGE_MACHINE_IA32; + NtHdr->Pe32.FileHeader.Machine =3D IMAGE_FILE_MACHINE_I386; NtHdr->Pe32.OptionalHeader.Magic =3D EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC; } =20 diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/G= enFw/Elf64Convert.c index dfcb100a594f..d53ecb176721 100644 --- a/BaseTools/Source/C/GenFw/Elf64Convert.c +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c @@ -1137,25 +1137,25 @@ ScanSections64 ( =20 switch (mEhdr->e_machine) { case EM_X86_64: - NtHdr->Pe32Plus.FileHeader.Machine =3D EFI_IMAGE_MACHINE_X64; + NtHdr->Pe32Plus.FileHeader.Machine =3D IMAGE_FILE_MACHINE_X64; NtHdr->Pe32Plus.OptionalHeader.Magic =3D EFI_IMAGE_NT_OPTIONAL_HDR64_M= AGIC; break; case EM_AARCH64: - NtHdr->Pe32Plus.FileHeader.Machine =3D EFI_IMAGE_MACHINE_AARCH64; + NtHdr->Pe32Plus.FileHeader.Machine =3D IMAGE_FILE_MACHINE_ARM64; NtHdr->Pe32Plus.OptionalHeader.Magic =3D EFI_IMAGE_NT_OPTIONAL_HDR64_M= AGIC; break; case EM_RISCV64: - NtHdr->Pe32Plus.FileHeader.Machine =3D EFI_IMAGE_MACHINE_RISCV64; + NtHdr->Pe32Plus.FileHeader.Machine =3D IMAGE_FILE_MACHINE_RISCV64; NtHdr->Pe32Plus.OptionalHeader.Magic =3D EFI_IMAGE_NT_OPTIONAL_HDR64_M= AGIC; break; case EM_LOONGARCH: - NtHdr->Pe32Plus.FileHeader.Machine =3D EFI_IMAGE_MACHINE_LOONGARCH64; + NtHdr->Pe32Plus.FileHeader.Machine =3D IMAGE_FILE_MACHINE_LOONGARCH64; NtHdr->Pe32Plus.OptionalHeader.Magic =3D EFI_IMAGE_NT_OPTIONAL_HDR64_M= AGIC; break; =20 default: VerboseMsg ("%u unknown e_machine type. Assume X64", (UINTN)mEhdr->e_m= achine); - NtHdr->Pe32Plus.FileHeader.Machine =3D EFI_IMAGE_MACHINE_X64; + NtHdr->Pe32Plus.FileHeader.Machine =3D IMAGE_FILE_MACHINE_X64; NtHdr->Pe32Plus.OptionalHeader.Magic =3D EFI_IMAGE_NT_OPTIONAL_HDR64_M= AGIC; } =20 diff --git a/BaseTools/Source/C/GenFw/GenFw.c b/BaseTools/Source/C/GenFw/Ge= nFw.c index 0da25fd05541..0289c8ef8a5c 100644 --- a/BaseTools/Source/C/GenFw/GenFw.c +++ b/BaseTools/Source/C/GenFw/GenFw.c @@ -2197,12 +2197,6 @@ Routine Description: } } =20 - if (PeHdr->Pe32.FileHeader.Machine =3D=3D IMAGE_FILE_MACHINE_ARM) { - // Some tools kick out IMAGE_FILE_MACHINE_ARM (0x1c0) vs IMAGE_FILE_MA= CHINE_ARMT (0x1c2) - // so patch back to the official UEFI value. - PeHdr->Pe32.FileHeader.Machine =3D IMAGE_FILE_MACHINE_ARMT; - } - // // Set new base address into image // @@ -3117,7 +3111,7 @@ Routine Description: // Get Debug, Export and Resource EntryTable RVA address. // Resource Directory entry need to review. // - if (FileHdr->Machine =3D=3D EFI_IMAGE_MACHINE_IA32) { + if (FileHdr->Machine =3D=3D IMAGE_FILE_MACHINE_I386) { Optional32Hdr =3D (EFI_IMAGE_OPTIONAL_HEADER32 *) ((UINT8*) FileHdr + = sizeof (EFI_IMAGE_FILE_HEADER)); SectionHeader =3D (EFI_IMAGE_SECTION_HEADER *) ((UINT8 *) Optional32Hd= r + FileHdr->SizeOfOptionalHeader); if (Optional32Hdr->NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_EXP= ORT && \ --=20 2.40.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#105257): https://edk2.groups.io/g/devel/message/105257 Mute This Topic: https://groups.io/mt/99109305/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-