From 4f381b1aaac3519a5772d6bec6fa4e6b06bb37ab Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Thu, 1 May 2014 23:32:49 +0200 Subject: ARM: change signature of barebox_arm_entry Mostly to make it clear that boarddata needs to be something we can dereference. As this is a pretty invasive change, use the opportunity to make the signature 64bit safe. Signed-off-by: Lucas Stach Signed-off-by: Sascha Hauer --- arch/arm/boards/datamodul-edm-qmx6/lowlevel.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'arch/arm/boards/datamodul-edm-qmx6') diff --git a/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c b/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c index 81b6ac4cbe..071918cb53 100644 --- a/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c +++ b/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c @@ -140,13 +140,14 @@ extern char __dtb_imx6q_dmo_edmqmx6_end[]; ENTRY_FUNCTION(start_imx6_realq7, r0, r1, r2) { - unsigned long fdt, sdram = 0x10000000; + unsigned long sdram = 0x10000000; + void *fdt; arm_cpu_lowlevel_init(); arm_setup_stack(0x00940000 - 8); - fdt = (unsigned long)__dtb_imx6q_dmo_edmqmx6_start - get_runtime_offset(); + fdt = __dtb_imx6q_dmo_edmqmx6_start - get_runtime_offset(); if (get_pc() < 0x10000000) { sdram_init(); @@ -158,10 +159,9 @@ ENTRY_FUNCTION(start_imx6_realq7, r0, r1, r2) * Copy the devicetree blob to sdram so that the barebox code finds it * inside valid SDRAM instead of SRAM. */ - memcpy((void *)sdram, (void *)fdt, - __dtb_imx6q_dmo_edmqmx6_end - - __dtb_imx6q_dmo_edmqmx6_start); - fdt = sdram; + memcpy((void*)sdram, fdt, __dtb_imx6q_dmo_edmqmx6_end - + __dtb_imx6q_dmo_edmqmx6_start); + fdt = (void *)sdram; } barebox_arm_entry(sdram, SZ_2G, fdt); -- cgit v1.2.3