[edk2-devel] [PATCH] [edk2-staging]BaseTools/FMMT: C FMMT match new version machine defines

[Yuwei Chen]

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 <rebe...@bsdio.com>
Cc: Liming Gao <gaolim...@byosoft.com.cn>
Cc: Bob Feng <bob.c.f...@intel.com>
Signed-off-by: Yuwei Chen <yuwei.c...@intel.com>
---
 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..059f39900d 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 == EFI_IMAGE_MACHINE_ARMT) ||
-    //  (ImageContext.Machine == EFI_IMAGE_MACHINE_AARCH64)) {
+    //if ((ImageContext.Machine == IMAGE_FILE_MACHINE_ARMT) ||
+    //  (ImageContext.Machine == IMAGE_FILE_MACHINE_AARCH64)) {
     //  mArm = TRUE;
     //}
 
@@ -435,8 +435,8 @@ EFI_NOT_FOUND           No compressed sections could be 
found.
       return Status;
     }
 
-    //if ((ImageContext.Machine == EFI_IMAGE_MACHINE_ARMT) ||
-    //  (ImageContext.Machine == EFI_IMAGE_MACHINE_AARCH64)) {
+    //if ((ImageContext.Machine == IMAGE_FILE_MACHINE_ARMT) ||
+    //  (ImageContext.Machine == IMAGE_FILE_MACHINE_AARCH64)) {
     //  mArm = TRUE;
     //}
 
@@ -835,8 +835,8 @@ Returns:
   //
   // Verify machine type is supported
   //
-  if ((*MachineType != EFI_IMAGE_MACHINE_IA32) && (*MachineType != 
EFI_IMAGE_MACHINE_X64) && (*MachineType != EFI_IMAGE_MACHINE_EBC) &&
-      (*MachineType != EFI_IMAGE_MACHINE_ARMT) && (*MachineType != 
EFI_IMAGE_MACHINE_AARCH64)) {
+  if ((*MachineType != IMAGE_FILE_MACHINE_IA32) && (*MachineType != 
IMAGE_FILE_MACHINE_X64) && (*MachineType != IMAGE_FILE_MACHINE_EBC) &&
+      (*MachineType != IMAGE_FILE_MACHINE_ARMT) && (*MachineType != 
IMAGE_FILE_MACHINE_AARCH64)) {
     Error (NULL, 0, 3000, "Invalid", "Unrecognized machine type in the PE32 
file.");
     return EFI_UNSUPPORTED;
   }
-- 
2.39.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#106131): https://edk2.groups.io/g/devel/message/106131
Mute This Topic: https://groups.io/mt/99562392/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-