summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-03-07 12:57:26 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-03-14 08:41:27 +0100
commit1d9547773cd0e39472760e1eab21c3ff86c08db7 (patch)
tree0aff1d140c9d05ce1399fdb9fdd24a34863b1f9d
parenta4c2d0259dd7f40c509e001e1ea2dfbeeac4cb99 (diff)
downloadbarebox-1d9547773cd0e39472760e1eab21c3ff86c08db7.tar.gz
barebox-1d9547773cd0e39472760e1eab21c3ff86c08db7.tar.xz
blackfin: initialize malloc pool before start_barebox()
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/blackfin/cpu-bf561/start.S4
-rw-r--r--arch/blackfin/lib/board.c6
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/blackfin/cpu-bf561/start.S b/arch/blackfin/cpu-bf561/start.S
index 2664588d65..96da6b5dda 100644
--- a/arch/blackfin/cpu-bf561/start.S
+++ b/arch/blackfin/cpu-bf561/start.S
@@ -329,8 +329,8 @@ _clear_bss_skip:
[p0] = r0;
#endif
- p0.l = _start_barebox;
- p0.h = _start_barebox;
+ p0.l = _blackfin_start_barebox;
+ p0.h = _blackfin_start_barebox;
jump (p0);
reset_start:
diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c
index e335d6cbdd..88ad61871a 100644
--- a/arch/blackfin/lib/board.c
+++ b/arch/blackfin/lib/board.c
@@ -31,15 +31,13 @@
#include <asm/cpu.h>
#include <asm-generic/memory_layout.h>
-int blackfin_mem_malloc_init(void)
+void __noreturn blackfin_start_barebox(void)
{
mem_malloc_init((void *)(MALLOC_BASE),
(void *)(MALLOC_BASE + MALLOC_SIZE - 1));
- return 0;
+ start_barebox();
}
-core_initcall(blackfin_mem_malloc_init);
-
void arch_shutdown(void)
{
icache_disable();