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

ARM64 grub-file and grub-mkconfig support.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-12-23 17:35:18 +01:00
parent 0c930a841e
commit a4d610026f
3 changed files with 24 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>
ARM64 grub-file and grub-mkconfig support.
2013-12-23 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-23 Vladimir Serbinenko <phcoder@gmail.com>
Remove leftover options defines. Remove leftover options defines.

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

@ -48,6 +48,8 @@ static const struct grub_arg_option options[] = {
N_("Check if FILE can be used as x86 multiboot2 kernel"), 0, 0}, N_("Check if FILE can be used as x86 multiboot2 kernel"), 0, 0},
{"is-arm-linux", 0, 0, {"is-arm-linux", 0, 0,
N_("Check if FILE is ARM Linux"), 0, 0}, N_("Check if FILE is ARM Linux"), 0, 0},
{"is-arm64-linux", 0, 0,
N_("Check if FILE is ARM64 Linux"), 0, 0},
{"is-ia64-linux", 0, 0, {"is-ia64-linux", 0, 0,
N_("Check if FILE is IA64 Linux"), 0, 0}, N_("Check if FILE is IA64 Linux"), 0, 0},
{"is-mips-linux", 0, 0, {"is-mips-linux", 0, 0,
@ -107,6 +109,7 @@ enum
IS_MULTIBOOT, IS_MULTIBOOT,
IS_MULTIBOOT2, IS_MULTIBOOT2,
IS_ARM_LINUX, IS_ARM_LINUX,
IS_ARM64_LINUX,
IS_IA64_LINUX, IS_IA64_LINUX,
IS_MIPS_LINUX, IS_MIPS_LINUX,
IS_MIPSEL_LINUX, IS_MIPSEL_LINUX,
@ -401,6 +404,21 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
} }
break; break;
} }
case IS_ARM64_LINUX:
{
grub_uint32_t sig;
if (grub_file_seek (file, 0x38) == (grub_size_t) -1)
break;
if (grub_file_read (file, &sig, 4) != 4)
break;
if (sig == grub_cpu_to_le32_compile_time (0x644d5241))
{
ret = 1;
break;
}
break;
}
case IS_PAE_DOMU ... IS_DOM0: case IS_PAE_DOMU ... IS_DOM0:
{ {
struct grub_xen_file_info xen_inf; struct grub_xen_file_info xen_inf;

3
util/grub-mkconfig.in
View file

@ -273,7 +273,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
*/\#*\#) ;; */\#*\#) ;;
*) *)
if grub_file_is_not_garbage "$i" && test -x "$i" ; then if grub_file_is_not_garbage "$i" && test -x "$i" ; then
for platform in x86 i386-xen-pae x86_64-xen mips mipsel sparc64 powerpc ia64 arm; do for platform in x86 i386-xen-pae x86_64-xen mips mipsel sparc64 powerpc ia64 arm arm64; do
GRUB_PLATFORM=$platform GRUB_PLATFORM=$platform
export GRUB_PLATFORM export GRUB_PLATFORM
buf="$($i)" buf="$($i)"