* [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT match new version machine defines
@ 2023-06-27 2:53 Yuwei Chen
2023-06-27 6:14 ` 回复: " gaoliming
0 siblings, 1 reply; 5+ messages in thread
From: Yuwei Chen @ 2023-06-27 2:53 UTC (permalink / raw)
To: devel; +Cc: Rebecca Cran, Liming Gao, Bob Feng
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* 回复: [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT match new version machine defines
2023-06-27 2:53 [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT match new version machine defines Yuwei Chen
@ 2023-06-27 6:14 ` gaoliming
2023-07-04 7:51 ` Yuwei Chen
0 siblings, 1 reply; 5+ messages in thread
From: gaoliming @ 2023-06-27 6:14 UTC (permalink / raw)
To: 'Yuwei Chen', devel; +Cc: 'Rebecca Cran', 'Bob Feng'
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT match new version machine defines
2023-06-27 6:14 ` 回复: " gaoliming
@ 2023-07-04 7:51 ` Yuwei Chen
2023-07-10 1:51 ` 回复: [edk2-devel] " gaoliming
0 siblings, 1 reply; 5+ messages in thread
From: Yuwei Chen @ 2023-07-04 7:51 UTC (permalink / raw)
To: Gao, Liming, devel@edk2.groups.io
Cc: 'Rebecca Cran', Feng, Bob C, Chan, Amy, Huang, Yanbo
Hi Liming and Cran,
Can you help merge the code? It is urgent for us to use. 😊
Thanks a lot~
Thanks,
Christine
> -----Original Message-----
> From: gaoliming <gaoliming@byosoft.com.cn>
> Sent: Tuesday, June 27, 2023 2:14 PM
> To: Chen, Christine <yuwei.chen@intel.com>; devel@edk2.groups.io
> Cc: 'Rebecca Cran' <rebecca@bsdio.com>; Feng, Bob C
> <bob.c.feng@intel.com>
> Subject: 回复: [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT match
> new version machine defines
>
> 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
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* 回复: [edk2-devel] [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT match new version machine defines
2023-07-04 7:51 ` Yuwei Chen
@ 2023-07-10 1:51 ` gaoliming
2023-07-10 1:59 ` Yuwei Chen
0 siblings, 1 reply; 5+ messages in thread
From: gaoliming @ 2023-07-10 1:51 UTC (permalink / raw)
To: devel, yuwei.chen
Cc: 'Rebecca Cran', 'Feng, Bob C',
'Chan, Amy', 'Huang, Yanbo'
Christine:
I just push this patch @ bab1724cdf725b7d22869c79fa2b86ed47e01110 in edk2-staging.
Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Yuwei Chen
> 发送时间: 2023年7月4日 15:52
> 收件人: Gao, Liming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io
> 抄送: 'Rebecca Cran' <rebecca@bsdio.com>; Feng, Bob C
> <bob.c.feng@intel.com>; Chan, Amy <amy.chan@intel.com>; Huang, Yanbo
> <yanbo.huang@intel.com>
> 主题: Re: [edk2-devel] [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT
> match new version machine defines
>
> Hi Liming and Cran,
>
> Can you help merge the code? It is urgent for us to use. 😊
>
> Thanks a lot~
>
> Thanks,
> Christine
>
>
> > -----Original Message-----
> > From: gaoliming <gaoliming@byosoft.com.cn>
> > Sent: Tuesday, June 27, 2023 2:14 PM
> > To: Chen, Christine <yuwei.chen@intel.com>; devel@edk2.groups.io
> > Cc: 'Rebecca Cran' <rebecca@bsdio.com>; Feng, Bob C
> > <bob.c.feng@intel.com>
> > Subject: 回复: [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT match
> > new version machine defines
> >
> > 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
> >
> >
>
>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [edk2-devel] [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT match new version machine defines
2023-07-10 1:51 ` 回复: [edk2-devel] " gaoliming
@ 2023-07-10 1:59 ` Yuwei Chen
0 siblings, 0 replies; 5+ messages in thread
From: Yuwei Chen @ 2023-07-10 1:59 UTC (permalink / raw)
To: Gao, Liming, devel@edk2.groups.io
Cc: 'Rebecca Cran', Feng, Bob C, Chan, Amy, Huang, Yanbo
Thanks Liming for your support~
Thanks,
Christine
> -----Original Message-----
> From: gaoliming <gaoliming@byosoft.com.cn>
> Sent: Monday, July 10, 2023 9:51 AM
> To: devel@edk2.groups.io; Chen, Christine <yuwei.chen@intel.com>
> Cc: 'Rebecca Cran' <rebecca@bsdio.com>; Feng, Bob C
> <bob.c.feng@intel.com>; Chan, Amy <amy.chan@intel.com>; Huang, Yanbo
> <yanbo.huang@intel.com>
> Subject: 回复: [edk2-devel] [Patch V3] [edk2-staging] BaseTools/FMMT: C
> FMMT match new version machine defines
>
> Christine:
> I just push this patch @ bab1724cdf725b7d22869c79fa2b86ed47e01110 in
> edk2-staging.
>
> Thanks
> Liming
> > -----邮件原件-----
> > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Yuwei Chen
> > 发送时间: 2023年7月4日 15:52
> > 收件人: Gao, Liming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io
> > 抄送: 'Rebecca Cran' <rebecca@bsdio.com>; Feng, Bob C
> > <bob.c.feng@intel.com>; Chan, Amy <amy.chan@intel.com>; Huang,
> Yanbo
> > <yanbo.huang@intel.com>
> > 主题: Re: [edk2-devel] [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT
> > match new version machine defines
> >
> > Hi Liming and Cran,
> >
> > Can you help merge the code? It is urgent for us to use. 😊
> >
> > Thanks a lot~
> >
> > Thanks,
> > Christine
> >
> >
> > > -----Original Message-----
> > > From: gaoliming <gaoliming@byosoft.com.cn>
> > > Sent: Tuesday, June 27, 2023 2:14 PM
> > > To: Chen, Christine <yuwei.chen@intel.com>; devel@edk2.groups.io
> > > Cc: 'Rebecca Cran' <rebecca@bsdio.com>; Feng, Bob C
> > > <bob.c.feng@intel.com>
> > > Subject: 回复: [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT match
> > > new version machine defines
> > >
> > > 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
> > >
> > >
> >
> >
> >
> >
> >
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-10 2:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-27 2:53 [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT match new version machine defines Yuwei Chen
2023-06-27 6:14 ` 回复: " gaoliming
2023-07-04 7:51 ` Yuwei Chen
2023-07-10 1:51 ` 回复: [edk2-devel] " gaoliming
2023-07-10 1:59 ` Yuwei Chen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox