vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add arm64-efi recognition to grub-file.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-12-23 05:33:44 +01:00
parent 4cd0b55fd0
commit 260632161f
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-12-23 Vladimir Serbinenko <phcoder@gmail.com>
Add arm64-efi recognition to grub-file.
2013-12-23 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-23 Vladimir Serbinenko <phcoder@gmail.com>
Fix ia64-efi recognition in grub-file. Fix ia64-efi recognition in grub-file.

10
grub-core/commands/file.c
View file

@ -82,6 +82,8 @@ static const struct grub_arg_option options[] = {
N_("Check if FILE is x86_64 EFI file"), 0, 0}, N_("Check if FILE is x86_64 EFI file"), 0, 0},
{"is-ia64-efi", 0, 0, {"is-ia64-efi", 0, 0,
N_("Check if FILE is IA64 EFI file"), 0, 0}, N_("Check if FILE is IA64 EFI file"), 0, 0},
{"is-arm64-efi", 0, 0,
N_("Check if FILE is ARM64 EFI file"), 0, 0},
{"is-arm-efi", 0, 0, {"is-arm-efi", 0, 0,
N_("Check if FILE is ARM EFI file"), 0, 0}, N_("Check if FILE is ARM EFI file"), 0, 0},
{"is-hibernated-hiberfil", 0, 0, {"is-hibernated-hiberfil", 0, 0,
@ -121,6 +123,7 @@ enum
IS_32_EFI, IS_32_EFI,
IS_64_EFI, IS_64_EFI,
IS_IA_EFI, IS_IA_EFI,
IS_ARM64_EFI,
IS_ARM_EFI, IS_ARM_EFI,
IS_HIBERNATED, IS_HIBERNATED,
IS_XNU64, IS_XNU64,
@ -546,6 +549,7 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
case IS_32_EFI: case IS_32_EFI:
case IS_64_EFI: case IS_64_EFI:
case IS_IA_EFI: case IS_IA_EFI:
case IS_ARM64_EFI:
case IS_ARM_EFI: case IS_ARM_EFI:
{ {
char signature[4]; char signature[4];
@ -584,11 +588,15 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
&& coff_head.machine != && coff_head.machine !=
grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_IA64)) grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_IA64))
break; break;
if (type == IS_ARM64_EFI
&& coff_head.machine !=
grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_ARM64))
break;
if (type == IS_ARM_EFI if (type == IS_ARM_EFI
&& coff_head.machine != && coff_head.machine !=
grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_ARMTHUMB_MIXED)) grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_ARMTHUMB_MIXED))
break; break;
if (type == IS_IA_EFI || type == IS_64_EFI) if (type == IS_IA_EFI || type == IS_64_EFI || type == IS_ARM64_EFI)
{ {
struct grub_pe64_optional_header o64; struct grub_pe64_optional_header o64;
if (grub_file_read (file, &o64, sizeof (o64)) != sizeof (o64)) if (grub_file_read (file, &o64, sizeof (o64)) != sizeof (o64))