From: Simon Glass <sjg@chromium.org>
Date: Wed, 8 Oct 2014 04:01:52 +0000 (-0600)
Subject: exynos: Enable pre-relocation malloc()
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=2ecd779742e3eda5b8d1355b56ddc1ea836c8407;p=u-boot.git

exynos: Enable pre-relocation malloc()

Enable this feature to support driver model before relocation.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---

diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index 54b61d71a5..371f32d840 100644
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -38,8 +38,9 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_ENV_OVERWRITE
 
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (80 * SZ_1M))
+/* Size of malloc() pool before and after relocation */
+#define CONFIG_SYS_MALLOC_F_LEN		(1 << 10)
+#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (80 << 20))
 
 /* select serial console configuration */
 #define CONFIG_BAUDRATE			115200
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 07a2ff69ca..b928af839e 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -37,8 +37,6 @@
 #define CONFIG_SYS_TEXT_BASE		0x43e00000
 
 #include <linux/sizes.h>
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (80 * SZ_1M))
 
 /* select serial console configuration */
 #define CONFIG_SERIAL1
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index feb4d7670b..0c6e9c7878 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -39,8 +39,9 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_CMDLINE_EDITING
 
-/* Size of malloc() pool.*/
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 80 * SZ_1M)
+/* Size of malloc() pool before and after relocation */
+#define CONFIG_SYS_MALLOC_F_LEN		(1 << 10)
+#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (80 << 20))
 
 /*
  * select serial console configuration
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 566028dd25..22835ffd64 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -47,6 +47,10 @@
  * 1MB = 0x100000, 0x100000 = 1024 * 1024
  */
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (1 << 20))
+
+/* Small malloc pool before relocation */
+#define CONFIG_SYS_MALLOC_F_LEN		(1 << 10)
+
 /*
  * select serial console configuration
  */