diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-07 12:56:07 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-14 08:41:23 +0100 |
commit | a4c2d0259dd7f40c509e001e1ea2dfbeeac4cb99 (patch) | |
tree | af43f4aac5281a194faa6572292b9b8865b78890 | |
parent | bb80d9cd22b27d97fda2257a6dcdef1c3b67bfc7 (diff) | |
download | barebox-a4c2d0259dd7f40c509e001e1ea2dfbeeac4cb99.tar.gz barebox-a4c2d0259dd7f40c509e001e1ea2dfbeeac4cb99.tar.xz |
openrisc: initialize malloc pool before start_barebox()
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/openrisc/cpu/start.S | 2 | ||||
-rw-r--r-- | arch/openrisc/lib/board.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/openrisc/cpu/start.S b/arch/openrisc/cpu/start.S index 9109cceef1..269abc0bff 100644 --- a/arch/openrisc/cpu/start.S +++ b/arch/openrisc/cpu/start.S @@ -245,7 +245,7 @@ _start: l.andi r30, r0, 0 l.andi r31, r0, 0 - l.j start_barebox + l.j openrisc_start_barebox l.nop .size _start, .-_start diff --git a/arch/openrisc/lib/board.c b/arch/openrisc/lib/board.c index f62fbaf4a5..98033b42cf 100644 --- a/arch/openrisc/lib/board.c +++ b/arch/openrisc/lib/board.c @@ -22,17 +22,14 @@ #include <memory.h> #include <asm-generic/memory_layout.h> -int openrisc_mem_malloc_init(void) +void __noreturn openrisc_start_barebox(void) { - mem_malloc_init((void *)(OPENRISC_SOPC_TEXT_BASE - MALLOC_SIZE), (void *)(OPENRISC_SOPC_TEXT_BASE - 1)); - return 0; + start_barebox(); } -core_initcall(openrisc_mem_malloc_init); - void arch_shutdown(void) { } |