回复: [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT match new version machine defines

["gaoliming" <gaoliming@byosoft.com.cn>]

Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----邮件原件-----
> 发件人: Yuwei Chen <yuwei.chen@intel.com>
> 发送时间: 2023年6月27日 10:54
> 收件人: devel@edk2.groups.io
> 抄送: Rebecca Cran <rebecca@bsdio.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Bob Feng <bob.c.feng@intel.com>
> 主题: [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 <rebecca@bsdio.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Signed-off-by: Yuwei Chen <yuwei.chen@intel.com>
> ---
> 
> 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 == EFI_IMAGE_MACHINE_ARMT) ||
> 
> -    //  (ImageContext.Machine == EFI_IMAGE_MACHINE_AARCH64)) {
> 
> +    //if ((ImageContext.Machine ==
> IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) ||
> 
> +    //  (ImageContext.Machine == IMAGE_FILE_MACHINE_ARM64)) {
> 
>      //  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_ARMTHUMB_MIXED) ||
> 
> +    //  (ImageContext.Machine == IMAGE_FILE_MACHINE_ARM64)) {
> 
>      //  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_I386) && (*MachineType !=
> IMAGE_FILE_MACHINE_X64) && (*MachineType !=
> IMAGE_FILE_MACHINE_EBC) &&
> 
> +      (*MachineType != IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) &&
> (*MachineType != IMAGE_FILE_MACHINE_ARM64)) {
> 
>      Error (NULL, 0, 3000, "Invalid", "Unrecognized machine type in the
PE32
> file.");
> 
>      return EFI_UNSUPPORTED;
> 
>    }
> 
> --
> 2.27.0.windows.1