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

arm: Move initrd upper to leave more space for kernel

Browse source 
This patch allows to have bigger kernels. If the kernel grows, then it will
overwrite the initrd when it is extracted.

Signed-off-by: Guillaume GARDET <guillaume.gardet@arm.com>
Acked-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Guillaume GARDET 2019-01-29 09:09:45 +01:00 committed by Vincent Batts
parent afe3a6799e
commit 94701ab4a5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,7 +48,7 @@ static const void *current_fdt;
typedef void (*kernel_entry_t) (int, unsigned long, void *); typedef void (*kernel_entry_t) (int, unsigned long, void *);
#define LINUX_PHYS_OFFSET (0x00008000) #define LINUX_PHYS_OFFSET (0x00008000)
#define LINUX_INITRD_PHYS_OFFSET (LINUX_PHYS_OFFSET + 0x02000000) #define LINUX_INITRD_PHYS_OFFSET (LINUX_PHYS_OFFSET + 0x03000000)
#define LINUX_FDT_PHYS_OFFSET (LINUX_INITRD_PHYS_OFFSET - 0x10000) #define LINUX_FDT_PHYS_OFFSET (LINUX_INITRD_PHYS_OFFSET - 0x10000)
static grub_size_t static grub_size_t

4
include/grub/arm/linux.h
View file

@ -42,7 +42,7 @@ struct linux_arm_kernel_header {
#if defined GRUB_MACHINE_UBOOT #if defined GRUB_MACHINE_UBOOT
# include <grub/uboot/uboot.h> # include <grub/uboot/uboot.h>
# define LINUX_ADDRESS (start_of_ram + 0x8000) # define LINUX_ADDRESS (start_of_ram + 0x8000)
# define LINUX_INITRD_ADDRESS (start_of_ram + 0x02000000) # define LINUX_INITRD_ADDRESS (start_of_ram + 0x03000000)
# define LINUX_FDT_ADDRESS (LINUX_INITRD_ADDRESS - 0x10000) # define LINUX_FDT_ADDRESS (LINUX_INITRD_ADDRESS - 0x10000)
# define grub_arm_firmware_get_boot_data grub_uboot_get_boot_data # define grub_arm_firmware_get_boot_data grub_uboot_get_boot_data
# define grub_arm_firmware_get_machine_type grub_uboot_get_machine_type # define grub_arm_firmware_get_machine_type grub_uboot_get_machine_type
@ -50,7 +50,7 @@ struct linux_arm_kernel_header {
#include <grub/fdtbus.h> #include <grub/fdtbus.h>
#include <grub/arm/coreboot/kernel.h> #include <grub/arm/coreboot/kernel.h>
# define LINUX_ADDRESS (start_of_ram + 0x8000) # define LINUX_ADDRESS (start_of_ram + 0x8000)
# define LINUX_INITRD_ADDRESS (start_of_ram + 0x02000000) # define LINUX_INITRD_ADDRESS (start_of_ram + 0x03000000)
# define LINUX_FDT_ADDRESS (LINUX_INITRD_ADDRESS - 0x10000) # define LINUX_FDT_ADDRESS (LINUX_INITRD_ADDRESS - 0x10000)
static inline const void * static inline const void *
grub_arm_firmware_get_boot_data (void) grub_arm_firmware_get_boot_data (void)