public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Gerd Hoffmann" <kraxel@redhat.com>
To: devel@edk2.groups.io
Cc: "Baoqi Zhang" <zhangbaoqi@loongson.cn>,
	"Leif Lindholm" <quic_llindhol@quicinc.com>,
	"Michael D Kinney" <michael.d.kinney@intel.com>,
	"Bob Feng" <bob.c.feng@intel.com>,
	"Pawel Polawski" <ppolawsk@redhat.com>,
	"Dongyan Qian" <qiandongyan@loongson.cn>,
	"Zhiguang Liu" <zhiguang.liu@intel.com>,
	"Sunil V L" <sunilvl@ventanamicro.com>,
	"Liming Gao" <gaoliming@byosoft.com.cn>,
	"Marvin Häuser" <mhaeuser@posteo.de>,
	"Chao Li" <lichao@loongson.cn>,
	"Ard Biesheuvel" <ardb+tianocore@kernel.org>,
	"Yuwei Chen" <yuwei.chen@intel.com>,
	"Daniel Schaefer" <git@danielschaefer.me>,
	"Oliver Steffen" <osteffen@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [PATCH v2 5/8] BaseTools: drop IMAGE_FILE_MACHINE_ARM hacks
Date: Tue, 11 Apr 2023 17:45:53 +0200	[thread overview]
Message-ID: <20230411154556.835538-6-kraxel@redhat.com> (raw)
In-Reply-To: <20230411154556.835538-1-kraxel@redhat.com>

The #define for IMAGE_FILE_MACHINE_ARM is not present in MdePkg,
this looks like a relic not used any more.  Remove.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 BaseTools/Source/C/Common/BasePeCoff.c | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/BaseTools/Source/C/Common/BasePeCoff.c b/BaseTools/Source/C/Common/BasePeCoff.c
index b8bfb7b58b91..0172370174b6 100644
--- a/BaseTools/Source/C/Common/BasePeCoff.c
+++ b/BaseTools/Source/C/Common/BasePeCoff.c
@@ -176,25 +176,10 @@ PeCoffLoaderCheckImageType (
       ImageContext->Machine != EFI_IMAGE_MACHINE_AARCH64 && \
       ImageContext->Machine != EFI_IMAGE_MACHINE_RISCV64 && \
       ImageContext->Machine != EFI_IMAGE_MACHINE_LOONGARCH64) {
-    if (ImageContext->Machine == IMAGE_FILE_MACHINE_ARM) {
-      //
-      // There are two types of ARM images. Pure ARM and ARM/Thumb.
-      // If we see the ARM say it is the ARM/Thumb so there is only
-      // a single machine type we need to check for ARM.
-      //
-      ImageContext->Machine = EFI_IMAGE_MACHINE_ARMT;
-      if (ImageContext->IsTeImage == FALSE) {
-        PeHdr->Pe32.FileHeader.Machine = ImageContext->Machine;
-      } else {
-        TeHdr->Machine = ImageContext->Machine;
-      }
-
-    } else {
-      //
-      // unsupported PeImage machine type
-      //
-      return RETURN_UNSUPPORTED;
-    }
+    //
+    // unsupported PeImage machine type
+    //
+    return RETURN_UNSUPPORTED;
   }
 
   //
-- 
2.39.2


  parent reply	other threads:[~2023-04-11 15:46 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-11 15:45 [PATCH v2 0/8] BaseTools: remove duplicate includes Gerd Hoffmann
2023-04-11 15:45 ` [PATCH v2 1/8] BaseTools: remove WinNtInclude.h Gerd Hoffmann
2023-04-11 15:45 ` [PATCH v2 2/8] BaseTools: remove duplicate includes: <arch>/ProcessorBind.h Gerd Hoffmann
2023-04-11 15:45 ` [PATCH v2 3/8] BaseTools: remove duplicate includes: IndustryStandard/Acpi*.h Gerd Hoffmann
2023-04-11 15:45 ` [PATCH v2 4/8] MdePkg/PeImage.h: add bits from BaseTools version Gerd Hoffmann
2023-04-11 15:45 ` Gerd Hoffmann [this message]
2023-04-11 15:45 ` [PATCH v2 6/8] BaseTools: switch from EFI_IMAGE_MACHINE_* to IMAGE_FILE_MACHINE_* Gerd Hoffmann
2023-04-11 15:45 ` [PATCH v2 7/8] BaseTools: remove duplicate includes: IndustryStandard/PeImage.h Gerd Hoffmann
2023-04-11 15:45 ` [PATCH v2 8/8] BaseTools: remove duplicate includes: IndustryStandard/*.h Gerd Hoffmann
2023-04-11 17:46 ` [edk2-devel] [PATCH v2 0/8] BaseTools: remove duplicate includes Rebecca Cran

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230411154556.835538-6-kraxel@redhat.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox