|
 |
bc092b9 |
From cb8b7e4e36bf32dccbbba8252aa44ad3ada4fbc1 Mon Sep 17 00:00:00 2001
|
|
|
bc092b9 |
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
bc092b9 |
Date: Sun, 9 Jul 2017 21:48:37 +0000
|
|
|
6f1e3d5 |
Subject: [PATCH 048/198] arm-efi: Fix compilation
|
|
|
bc092b9 |
|
|
|
bc092b9 |
---
|
|
|
bc092b9 |
grub-core/loader/arm/linux.c | 8 ++++----
|
|
|
bc092b9 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
bc092b9 |
|
|
|
bc092b9 |
diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
|
|
|
bc092b9 |
index 260cbf068..e64c79a95 100644
|
|
|
bc092b9 |
--- a/grub-core/loader/arm/linux.c
|
|
|
bc092b9 |
+++ b/grub-core/loader/arm/linux.c
|
|
|
bc092b9 |
@@ -252,12 +252,12 @@ linux_boot (void)
|
|
|
bc092b9 |
#ifdef GRUB_MACHINE_EFI
|
|
|
bc092b9 |
grub_size_t size;
|
|
|
bc092b9 |
if (fdt_valid)
|
|
|
bc092b9 |
- size = grub_fdt_get_totalsize (fdt_addr);
|
|
|
bc092b9 |
+ size = grub_fdt_get_totalsize (current_fdt);
|
|
|
bc092b9 |
else
|
|
|
bc092b9 |
- size = 4 * get_atag_size (atag_orig);
|
|
|
bc092b9 |
+ size = 4 * get_atag_size (current_fdt);
|
|
|
bc092b9 |
size += grub_strlen (linux_args) + 256;
|
|
|
bc092b9 |
target_fdt = grub_efi_allocate_loader_memory (LINUX_FDT_PHYS_OFFSET, size);
|
|
|
bc092b9 |
- if (!fdt_addr)
|
|
|
bc092b9 |
+ if (!target_fdt)
|
|
|
bc092b9 |
return grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
|
|
|
bc092b9 |
#else
|
|
|
bc092b9 |
target_fdt = (void *) LINUX_FDT_ADDRESS;
|
|
|
bc092b9 |
@@ -522,7 +522,7 @@ GRUB_MOD_INIT (linux)
|
|
|
bc092b9 |
/* TRANSLATORS: DTB stands for device tree blob. */
|
|
|
bc092b9 |
0, N_("Load DTB file."));
|
|
|
bc092b9 |
my_mod = mod;
|
|
|
bc092b9 |
- current_fdt = grub_arm_firmware_get_boot_data ();
|
|
|
bc092b9 |
+ current_fdt = (const void *) grub_arm_firmware_get_boot_data ();
|
|
|
bc092b9 |
machine_type = grub_arm_firmware_get_machine_type ();
|
|
|
bc092b9 |
}
|
|
|
bc092b9 |
|
|
|
bc092b9 |
--
|
|
|
da63b36 |
2.14.3
|
|
|
bc092b9 |
|