Commit a244d9eb authored by Leif Lindholm's avatar Leif Lindholm Committed by Daniel Kiper

arm: make linux.h safe to include for non-native builds

<grub/machine/loader.h> (for machine arm/efi) and
<grub/machine/kernel.h> (for machine arm/coreboot) will not always
resolve (and will likely not be valid to) if pulled in when building
non-native commands, such as host tools or the "file" command.
So explicitly include them with their expanded pathnames.
Signed-off-by: default avatarLeif Lindholm <>
Reviewed-by: default avatarDaniel Kiper <>
parent cda03329
......@@ -43,7 +43,7 @@ struct linux_arm_kernel_header {
# define grub_arm_firmware_get_machine_type grub_uboot_get_machine_type
#elif defined GRUB_MACHINE_EFI
# include <grub/efi/efi.h>
# include <grub/machine/loader.h>
# include <grub/arm/efi/loader.h>
/* On UEFI platforms - load the images at the lowest available address not
less than *_PHYS_OFFSET from the first available memory location. */
# define LINUX_PHYS_OFFSET (0x00008000)
......@@ -57,7 +57,7 @@ grub_arm_firmware_get_machine_type (void)
#include <grub/fdtbus.h>
#include <grub/machine/kernel.h>
#include <grub/arm/coreboot/kernel.h>
# define LINUX_ADDRESS (start_of_ram + 0x8000)
# define LINUX_INITRD_ADDRESS (start_of_ram + 0x02000000)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment