summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/vexpress/lowlevel.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boards/vexpress/lowlevel.c')
-rw-r--r--arch/arm/boards/vexpress/lowlevel.c20
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);
}