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/cpu/start-pbl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'arch/arm/cpu/start-pbl.c') diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c index 3ef0118521..407ece5069 100644 --- a/arch/arm/cpu/start-pbl.c +++ b/arch/arm/cpu/start-pbl.c @@ -48,12 +48,12 @@ void __naked __section(.text_head_entry) pbl_start(void) extern void *input_data; extern void *input_data_end; -static noinline __noreturn void __barebox_arm_entry(uint32_t membase, - uint32_t memsize, uint32_t boarddata) +static noinline __noreturn void __barebox_arm_entry(unsigned long membase, + unsigned long memsize, void *boarddata) { uint32_t offset; uint32_t pg_start, pg_end, pg_len; - void __noreturn (*barebox)(uint32_t, uint32_t, uint32_t); + void __noreturn (*barebox)(unsigned long, unsigned long, void *); uint32_t endmem = membase + memsize; unsigned long barebox_base; @@ -127,8 +127,8 @@ static noinline __noreturn void __barebox_arm_entry(uint32_t membase, * Usually a TEXT_BASE of 1MiB below your lowest possible end of memory should * be fine. */ -void __naked __noreturn barebox_arm_entry(uint32_t membase, uint32_t memsize, - uint32_t boarddata) +void __naked __noreturn barebox_arm_entry(unsigned long membase, + unsigned long memsize, void *boarddata) { arm_setup_stack(membase + memsize - 16); -- cgit v1.2.3