diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-10-12 12:26:55 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-10-17 08:46:08 +0200 |
| commit | 6690cb957d6d45cae785b41f24502ddaf25efbb3 (patch) | |
| tree | 802f0b40eb2f06308b6ca5bd4d86aa5a7e9a476c /arch | |
| parent | d3c34d608bc2d6ae51f11658e345814a77ed8da6 (diff) | |
| download | barebox-6690cb957d6d45cae785b41f24502ddaf25efbb3.tar.gz barebox-6690cb957d6d45cae785b41f24502ddaf25efbb3.tar.xz | |
vexpress: use device tree provided by QEMU if available
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/vexpress/lowlevel.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/arch/arm/boards/vexpress/lowlevel.c b/arch/arm/boards/vexpress/lowlevel.c index 0a226b295c..9fe7c836b7 100644 --- a/arch/arm/boards/vexpress/lowlevel.c +++ b/arch/arm/boards/vexpress/lowlevel.c @@ -9,18 +9,34 @@ #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> 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, fdt); + membase = 0x60000000; else - barebox_arm_entry(0x80000000, SZ_512M, fdt); + 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[]; |