| Message ID | 20160909072356.4746-1-lersek@redhat.com |
|---|---|
| State | Accepted |
| Commit | 2d41ea3aed4ea1935fc63df35b834e9626f896df |
| Headers | show |
On 09/09/16 09:25, Gao, Liming wrote: > Reviewed-by: Liming Gao <liming.gao@intel.com> Thanks. Ard, are you OK with this patch? (You were OK with "ARM" in advance, but the AARCH64 string also changed in this version.) Thanks Laszlo >> -----Original Message----- >> From: Laszlo Ersek [mailto:lersek@redhat.com] >> Sent: Friday, September 09, 2016 3:24 PM >> To: edk2-devel-01 <edk2-devel@ml01.01.org> >> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>; Gao, Liming >> <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com> >> Subject: [PATCH v2] BaseTools/EfiRom: supply missing machine type lookup >> strings >> >> "EfiRom --dump" does not recognize the 0x8664 machine type: >> >>> EFI ROM header contents >>> EFI Signature 0x0EF1 >>> Compression Type 0x0001 (compressed) >>> Machine type 0x8664 (unknown) >>> Subsystem 0x000B (EFI boot service driver) >>> EFI image offset 0x0050 (@0xF650) >> >> Add lookup strings for the remaining EFI_IMAGE_MACHINE_* numeric >> macros >> that can be found in >> "BaseTools/Source/C/Include/IndustryStandard/PeImage.h". The strings >> follow Table 12. "UEFI Image Types" from the UEFI v2.6 spec. >> >> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> Cc: Liming Gao <liming.gao@intel.com> >> Cc: Yonghong Zhu <yonghong.zhu@intel.com> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Laszlo Ersek <lersek@redhat.com> >> --- >> >> Notes: >> v2: >> - use ARM for ARM [Ard, Liming] >> - use AA64 for AARCH64 [Liming] >> - reference Table 12 in the commit message [Liming] >> >> BaseTools/Source/C/EfiRom/EfiRom.h | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/BaseTools/Source/C/EfiRom/EfiRom.h >> b/BaseTools/Source/C/EfiRom/EfiRom.h >> index 1214700826de..6763d6b1ec28 100644 >> --- a/BaseTools/Source/C/EfiRom/EfiRom.h >> +++ b/BaseTools/Source/C/EfiRom/EfiRom.h >> @@ -117,6 +117,9 @@ static STRING_LOOKUP mMachineTypes[] = { >> { EFI_IMAGE_MACHINE_IA32, "IA32" }, >> { EFI_IMAGE_MACHINE_IA64, "IA64" }, >> { EFI_IMAGE_MACHINE_EBC, "EBC" }, >> + { EFI_IMAGE_MACHINE_X64, "X64" }, >> + { EFI_IMAGE_MACHINE_ARMT, "ARM" }, >> + { EFI_IMAGE_MACHINE_AARCH64, "AA64" }, >> { 0, NULL } >> }; >> >> -- >> 2.9.2 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
On 9 September 2016 at 09:26, Laszlo Ersek <lersek@redhat.com> wrote: > On 09/09/16 09:25, Gao, Liming wrote: >> Reviewed-by: Liming Gao <liming.gao@intel.com> > > Thanks. > > Ard, are you OK with this patch? (You were OK with "ARM" in advance, but > the AARCH64 string also changed in this version.) > Yes, perfectly acceptable to me. Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >>> -----Original Message----- >>> From: Laszlo Ersek [mailto:lersek@redhat.com] >>> Sent: Friday, September 09, 2016 3:24 PM >>> To: edk2-devel-01 <edk2-devel@ml01.01.org> >>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>; Gao, Liming >>> <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com> >>> Subject: [PATCH v2] BaseTools/EfiRom: supply missing machine type lookup >>> strings >>> >>> "EfiRom --dump" does not recognize the 0x8664 machine type: >>> >>>> EFI ROM header contents >>>> EFI Signature 0x0EF1 >>>> Compression Type 0x0001 (compressed) >>>> Machine type 0x8664 (unknown) >>>> Subsystem 0x000B (EFI boot service driver) >>>> EFI image offset 0x0050 (@0xF650) >>> >>> Add lookup strings for the remaining EFI_IMAGE_MACHINE_* numeric >>> macros >>> that can be found in >>> "BaseTools/Source/C/Include/IndustryStandard/PeImage.h". The strings >>> follow Table 12. "UEFI Image Types" from the UEFI v2.6 spec. >>> >>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> >>> Cc: Liming Gao <liming.gao@intel.com> >>> Cc: Yonghong Zhu <yonghong.zhu@intel.com> >>> Contributed-under: TianoCore Contribution Agreement 1.0 >>> Signed-off-by: Laszlo Ersek <lersek@redhat.com> >>> --- >>> >>> Notes: >>> v2: >>> - use ARM for ARM [Ard, Liming] >>> - use AA64 for AARCH64 [Liming] >>> - reference Table 12 in the commit message [Liming] >>> >>> BaseTools/Source/C/EfiRom/EfiRom.h | 3 +++ >>> 1 file changed, 3 insertions(+) >>> >>> diff --git a/BaseTools/Source/C/EfiRom/EfiRom.h >>> b/BaseTools/Source/C/EfiRom/EfiRom.h >>> index 1214700826de..6763d6b1ec28 100644 >>> --- a/BaseTools/Source/C/EfiRom/EfiRom.h >>> +++ b/BaseTools/Source/C/EfiRom/EfiRom.h >>> @@ -117,6 +117,9 @@ static STRING_LOOKUP mMachineTypes[] = { >>> { EFI_IMAGE_MACHINE_IA32, "IA32" }, >>> { EFI_IMAGE_MACHINE_IA64, "IA64" }, >>> { EFI_IMAGE_MACHINE_EBC, "EBC" }, >>> + { EFI_IMAGE_MACHINE_X64, "X64" }, >>> + { EFI_IMAGE_MACHINE_ARMT, "ARM" }, >>> + { EFI_IMAGE_MACHINE_AARCH64, "AA64" }, >>> { 0, NULL } >>> }; >>> >>> -- >>> 2.9.2 >> > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
On 09/09/16 10:27, Ard Biesheuvel wrote: > On 9 September 2016 at 09:26, Laszlo Ersek <lersek@redhat.com> wrote: >> On 09/09/16 09:25, Gao, Liming wrote: >>> Reviewed-by: Liming Gao <liming.gao@intel.com> >> >> Thanks. >> >> Ard, are you OK with this patch? (You were OK with "ARM" in advance, but >> the AARCH64 string also changed in this version.) >> > > Yes, perfectly acceptable to me. > > Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Thanks. Commit 2d41ea3aed4e. _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/BaseTools/Source/C/EfiRom/EfiRom.h b/BaseTools/Source/C/EfiRom/EfiRom.h index 1214700826de..6763d6b1ec28 100644 --- a/BaseTools/Source/C/EfiRom/EfiRom.h +++ b/BaseTools/Source/C/EfiRom/EfiRom.h @@ -117,6 +117,9 @@ static STRING_LOOKUP mMachineTypes[] = { { EFI_IMAGE_MACHINE_IA32, "IA32" }, { EFI_IMAGE_MACHINE_IA64, "IA64" }, { EFI_IMAGE_MACHINE_EBC, "EBC" }, + { EFI_IMAGE_MACHINE_X64, "X64" }, + { EFI_IMAGE_MACHINE_ARMT, "ARM" }, + { EFI_IMAGE_MACHINE_AARCH64, "AA64" }, { 0, NULL } };