diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-25 23:11:53 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:52:40 +0100 |
commit | c0304873015152d8c316df2b82083eea31053c04 (patch) | |
tree | 9491f67926b1efdb102e5081eae5c46bb0da9672 /arch/arm/cpu/start-pbl.c | |
parent | 91493b1b5d5fcdb95f833ebf249c892591a233df (diff) | |
download | barebox-c0304873015152d8c316df2b82083eea31053c04.tar.gz barebox-c0304873015152d8c316df2b82083eea31053c04.tar.xz |
ARM start-pbl: make board_init_lowlevel_return static
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/cpu/start-pbl.c')
-rw-r--r-- | arch/arm/cpu/start-pbl.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c index 06c0a1743f..0da4fef801 100644 --- a/arch/arm/cpu/start-pbl.c +++ b/arch/arm/cpu/start-pbl.c @@ -139,18 +139,12 @@ static void __noreturn barebox_uncompress(void *compressed_start, unsigned int l barebox(); } -/* - * Board code can jump here by either returning from board_init_lowlevel - * or by calling this function directly. - */ -void __naked __noreturn board_init_lowlevel_return(void) +static noinline __noreturn void __barebox_arm_entry(uint32_t membase, + uint32_t memsize, uint32_t boarddata) { uint32_t offset; uint32_t pg_start, pg_end, pg_len; - /* Setup the stack */ - arm_setup_stack(STACK_BASE + STACK_SIZE - 16); - /* Get offset between linked address and runtime address */ offset = get_runtime_offset(); @@ -194,5 +188,7 @@ void __naked __noreturn board_init_lowlevel_return(void) void __naked __noreturn barebox_arm_entry(uint32_t membase, uint32_t memsize, uint32_t boarddata) { - board_init_lowlevel_return(); + arm_setup_stack(STACK_BASE + STACK_SIZE - 16); + + __barebox_arm_entry(membase, memsize, boarddata); } |