diff options
| author | Peter Hoyes <[email protected]> | 2021-11-11 09:26:01 +0000 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-01-04 22:48:48 -0500 |
| commit | 90f262a6951f530ec60bf78a681b117f625cbe3f (patch) | |
| tree | b257749f58efd887c2003a3666f3ddf9e1455d73 /include | |
| parent | 17fe55fd6fe9d32270380f574b33ff0bc15bb47e (diff) | |
vexpress64: Clean up BASE_FVP boot configuration
Move env var address values to #defines so they can be reused elsewhere.
Rename env var names to those recommended in the README and modify
addresses to allow more space for the kernel.
Fix issue where fdt is called with invalid arguments when booting
without a ramdisk.
Signed-off-by: Peter Hoyes <[email protected]>
Reviewed-by: Andre Przywara <[email protected]>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/vexpress_aemv8.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h index 52fc15d5fc8..5f7d19daad3 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h @@ -7,6 +7,8 @@ #ifndef __VEXPRESS_AEMV8_H #define __VEXPRESS_AEMV8_H +#include <linux/stringify.h> + #define CONFIG_REMAKE_ELF /* Link Definitions */ @@ -172,15 +174,22 @@ BOOTENV #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP + +#define VEXPRESS_KERNEL_ADDR 0x80080000 +#define VEXPRESS_FDT_ADDR 0x8fc00000 +#define VEXPRESS_BOOT_ADDR 0x8fd00000 +#define VEXPRESS_RAMDISK_ADDR 0x8fe00000 + #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_name=Image\0" \ - "kernel_addr=0x80080000\0" \ - "initrd_name=ramdisk.img\0" \ - "initrd_addr=0x88000000\0" \ - "fdtfile=devtree.dtb\0" \ - "fdt_addr=0x83000000\0" \ - "boot_name=boot.img\0" \ - "boot_addr=0x8007f800\0" + "kernel_addr_r=" __stringify(VEXPRESS_KERNEL_ADDR) "\0" \ + "ramdisk_name=ramdisk.img\0" \ + "ramdisk_addr_r=" __stringify(VEXPRESS_RAMDISK_ADDR) "\0" \ + "fdtfile=devtree.dtb\0" \ + "fdt_addr_r=" __stringify(VEXPRESS_FDT_ADDR) "\0" \ + "boot_name=boot.img\0" \ + "boot_addr_r=" __stringify(VEXPRESS_BOOT_ADDR) "\0" + #endif /* Monitor Command Prompt */ |