diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2014-05-01 23:32:49 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 15:09:09 +0200 |
| commit | 4f381b1aaac3519a5772d6bec6fa4e6b06bb37ab (patch) | |
| tree | 806f60a86676a8b03541038dc53bd64292e5f801 /arch/arm/boards/beaglebone | |
| parent | 0668b9fe0a0d24dfc873829d8d882176e08e15ae (diff) | |
| download | barebox-4f381b1aaac3519a5772d6bec6fa4e6b06bb37ab.tar.gz barebox-4f381b1aaac3519a5772d6bec6fa4e6b06bb37ab.tar.xz | |
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 <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/beaglebone')
| -rw-r--r-- | arch/arm/boards/beaglebone/lowlevel.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/arch/arm/boards/beaglebone/lowlevel.c b/arch/arm/boards/beaglebone/lowlevel.c index 92389a9557..0869cb9f15 100644 --- a/arch/arm/boards/beaglebone/lowlevel.c +++ b/arch/arm/boards/beaglebone/lowlevel.c @@ -119,18 +119,19 @@ extern char __dtb_am335x_bone_end[]; */ static noinline int beaglebone_sram_init(void) { - uint32_t fdt, fdt_end, sdram_start, sdram_size; + uint32_t sdram_start, sdram_size; + void *fdt, *fdt_end; sdram_start = 0x80000000; if (is_beaglebone_black()) { sdram_size = SZ_512M; - fdt = (uint32_t)__dtb_am335x_boneblack_start; - fdt_end = (uint32_t)__dtb_am335x_boneblack_end; + fdt = __dtb_am335x_boneblack_start; + fdt_end = __dtb_am335x_boneblack_end; } else { sdram_size = SZ_256M; - fdt = (uint32_t)__dtb_am335x_bone_start; - fdt_end = (uint32_t)__dtb_am335x_bone_end; + fdt = __dtb_am335x_bone_start; + fdt_end = __dtb_am335x_bone_end; } /* WDT1 is already running when the bootloader gets control @@ -161,7 +162,7 @@ static noinline int beaglebone_sram_init(void) * Copy the devicetree blob to sdram so that the barebox code finds it * inside valid SDRAM instead of SRAM. */ - memcpy((void *)sdram_start, (void *)fdt, fdt_end - fdt); + memcpy((void *)sdram_start, fdt, fdt_end - fdt); fdt = sdram_start; barebox_arm_entry(sdram_start, sdram_size, fdt); @@ -183,14 +184,15 @@ ENTRY_FUNCTION(start_am33xx_beaglebone_sram, bootinfo, r1, r2) ENTRY_FUNCTION(start_am33xx_beaglebone_sdram, r0, r1, r2) { - uint32_t fdt, sdram_size; + uint32_t sdram_size; + void *fdt; if (is_beaglebone_black()) { sdram_size = SZ_512M; - fdt = (uint32_t)__dtb_am335x_boneblack_start; + fdt = __dtb_am335x_boneblack_start; } else { sdram_size = SZ_256M; - fdt = (uint32_t)__dtb_am335x_bone_start; + fdt = __dtb_am335x_bone_start; } fdt -= get_runtime_offset(); |