Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- arch/x86/boot/main_entry.c | 4 ++-- arch/x86/lib/memory.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/x86/boot/main_entry.c b/arch/x86/boot/main_entry.c index f7f4710..afb7e32 100644 --- a/arch/x86/boot/main_entry.c +++ b/arch/x86/boot/main_entry.c @@ -22,7 +22,7 @@ #include <string.h> #include <asm/sections.h> -extern void start_barebox(void); +extern void x86_start_barebox(void); /** * Called plainly from assembler that switches from real to flat mode @@ -33,5 +33,5 @@ void uboot_entry(void) { /* clear the BSS first */ memset(__bss_start, 0x00, __bss_stop - __bss_start); - start_barebox(); + x86_start_barebox(); } diff --git a/arch/x86/lib/memory.c b/arch/x86/lib/memory.c index 43b6931..de0e5d9 100644 --- a/arch/x86/lib/memory.c +++ b/arch/x86/lib/memory.c @@ -21,6 +21,7 @@ * @brief Memory management */ +#include <common.h> #include <init.h> #include <stdio.h> #include <memory.h> @@ -36,7 +37,7 @@ * - memory above 0x100000 */ -static int x86_mem_malloc_init(void) +int x86_start_barebox(void) { #ifdef CONFIG_MEMORY_LAYOUT_DEFAULT unsigned long memory_size; @@ -57,7 +58,5 @@ static int x86_mem_malloc_init(void) mem_malloc_init((void *)MALLOC_BASE, (void *)(MALLOC_BASE + MALLOC_SIZE - 1)); #endif - return 0; + start_barebox(); } - -core_initcall(x86_mem_malloc_init); -- 1.8.2.rc2 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox