diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2017-10-12 12:26:52 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-10-17 08:46:06 +0200 |
| commit | 51bf6848bc309f4e1111a756f8800a9586c3e3dd (patch) | |
| tree | 163f079116c32b31ddb7b300b335c84d2231306b /arch/arm/boards/vexpress/lowlevel.c | |
| parent | 22c64af6863b97556b9dc08b04a45350d1794f29 (diff) | |
| download | barebox-51bf6848bc309f4e1111a756f8800a9586c3e3dd.tar.gz barebox-51bf6848bc309f4e1111a756f8800a9586c3e3dd.tar.xz | |
ARM: vexpress: switch to DT probe and multi-image build
This switches the VExpress support to use an internal DT, instead
of probing the peripherals from a board file. It also switches to
a multi-iamge build with both CA9 and CA15 variants of the VExpress
board being supported.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/vexpress/lowlevel.c')
| -rw-r--r-- | arch/arm/boards/vexpress/lowlevel.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/arch/arm/boards/vexpress/lowlevel.c b/arch/arm/boards/vexpress/lowlevel.c index 204d29d8f0..0a226b295c 100644 --- a/arch/arm/boards/vexpress/lowlevel.c +++ b/arch/arm/boards/vexpress/lowlevel.c @@ -11,12 +11,26 @@ #include <asm/system_info.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(); + arm_cpu_lowlevel_init(); if (amba_is_arm_sp804(IOMEM(0x10011000))) - barebox_arm_entry(0x60000000, SZ_512M, NULL); + barebox_arm_entry(0x60000000, SZ_512M, fdt); else - barebox_arm_entry(0x80000000, SZ_512M, NULL); + barebox_arm_entry(0x80000000, SZ_512M, 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); } |