Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
arch/openrisc/cpu/start.S | 2 +-
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 9109cce..269abc0 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 f62fbaf..98033b4 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)
{
}
--
1.8.2.rc2
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
