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

arm-efi: Fix compilation

Browse source
This commit is contained in:
Vladimir Serbinenko 2017-07-09 21:48:37 +00:00 • committed by Vincent Batts
parent 8efa8a0e94
commit 0c4852ea0e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
grub-core/loader/arm/linux.c
View file

@ -252,12 +252,12 @@ linux_boot (void)
#ifdef GRUB_MACHINE_EFI #ifdef GRUB_MACHINE_EFI
grub_size_t size; grub_size_t size;
if (fdt_valid) if (fdt_valid)
size = grub_fdt_get_totalsize (fdt_addr); size = grub_fdt_get_totalsize (current_fdt);
else else
size = 4 * get_atag_size (atag_orig); size = 4 * get_atag_size (current_fdt);
size += grub_strlen (linux_args) + 256; size += grub_strlen (linux_args) + 256;
target_fdt = grub_efi_allocate_loader_memory (LINUX_FDT_PHYS_OFFSET, size); target_fdt = grub_efi_allocate_loader_memory (LINUX_FDT_PHYS_OFFSET, size);
if (!fdt_addr) if (!target_fdt)
return grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory")); return grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
#else #else
target_fdt = (void *) LINUX_FDT_ADDRESS; target_fdt = (void *) LINUX_FDT_ADDRESS;
@ -522,7 +522,7 @@ GRUB_MOD_INIT (linux)
/* TRANSLATORS: DTB stands for device tree blob. */ /* TRANSLATORS: DTB stands for device tree blob. */
0, N_("Load DTB file.")); 0, N_("Load DTB file."));
my_mod = mod; my_mod = mod;
current_fdt = grub_arm_firmware_get_boot_data (); current_fdt = (const void *) grub_arm_firmware_get_boot_data ();
machine_type = grub_arm_firmware_get_machine_type (); machine_type = grub_arm_firmware_get_machine_type ();
} }