diff options
Diffstat (limited to 'arch/arm/boards/vexpress/lowlevel.c')
| -rw-r--r-- | arch/arm/boards/vexpress/lowlevel.c | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/arch/arm/boards/vexpress/lowlevel.c b/arch/arm/boards/vexpress/lowlevel.c index 204d29d8f0..9fe7c836b7 100644 --- a/arch/arm/boards/vexpress/lowlevel.c +++ b/arch/arm/boards/vexpress/lowlevel.c @@ -9,14 +9,44 @@ #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <asm/system_info.h> +#include <asm/unaligned.h> #include <linux/amba/sp804.h> -void __naked barebox_arm_reset_vector(void) +static inline void start_vexpress_common(void *internal_dt) { + void *fdt = internal_dt - get_runtime_offset(); + unsigned long membase, memsize = SZ_512M; + arm_cpu_lowlevel_init(); if (amba_is_arm_sp804(IOMEM(0x10011000))) - barebox_arm_entry(0x60000000, SZ_512M, NULL); + membase = 0x60000000; else - barebox_arm_entry(0x80000000, SZ_512M, NULL); + membase = 0x80000000; + + /* QEMU may put a DTB at the start of RAM */ + if (IS_ENABLED(CONFIG_OFDEVICE) && + get_unaligned_be32((void*)membase) == FDT_MAGIC) { + fdt = (void*)membase; + /* + * Need to move membase a bit as the PBL wants to relocate + * to the start of RAM, which would overwrite the DTB. + */ + membase += SZ_4M; + memsize -= SZ_4M; + } + + barebox_arm_entry(membase, memsize, fdt); +} + +extern char __dtb_vexpress_v2p_ca9_start[]; +ENTRY_FUNCTION(start_vexpress_ca9, r0, r1, r2) +{ + start_vexpress_common(__dtb_vexpress_v2p_ca9_start); +} + +extern char __dtb_vexpress_v2p_ca15_start[]; +ENTRY_FUNCTION(start_vexpress_ca15, r0, r1, r2) +{ + start_vexpress_common(__dtb_vexpress_v2p_ca15_start); } |