From 7a76f0607bef50e4439d162e577007aa74f51a5f Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 7 Mar 2013 12:58:39 +0100
Subject: x86: initialize malloc pool before start_barebox()

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/x86/boot/main_entry.c | 4 ++--
 arch/x86/lib/memory.c      | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'arch/x86')

diff --git a/arch/x86/boot/main_entry.c b/arch/x86/boot/main_entry.c
index f7f4710c44..afb7e32dfc 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 43b6931258..de0e5d907f 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);
-- 
cgit v1.2.3