From afe3a6799ea97d7fd80226e815d96d322092635f Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Tue, 22 Jan 2019 16:59:41 +0000 Subject: [PATCH] linux, efi, arm*, fdt: Break FDT extra allocation space out into a #define A certain amount of dynamic space is required for the handover from GRUB/Linux-EFI-stub. This entails things like initrd addresses, address-cells entries and associated strings. But move this into a proper centralised #define rather than live-code it in the loader. Signed-off-by: Leif Lindholm Reviewed-by: Daniel Kiper --- grub-core/loader/arm64/linux.c | 2 +- include/grub/fdt.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index 185ca6332..57b9ff816 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -73,7 +73,7 @@ finalize_params_linux (void) void *fdt; - fdt = grub_fdt_load (0x400); + fdt = grub_fdt_load (GRUB_EFI_LINUX_FDT_EXTRA_SPACE); if (!fdt) goto failure; diff --git a/include/grub/fdt.h b/include/grub/fdt.h index 158b1bc4b..e609c7e41 100644 --- a/include/grub/fdt.h +++ b/include/grub/fdt.h @@ -22,6 +22,9 @@ #include #include +/* Space required when preparing the /chosen node after boot has been called. */ +#define GRUB_EFI_LINUX_FDT_EXTRA_SPACE 0x400 + #define FDT_MAGIC 0xD00DFEED typedef struct {