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 54b61d71a5f2f4b0e5e8c030e56b7f2e882bdd9d..371f32d84095bb803422a7f22428ed8c373b7b2d 100644 (file)
--- 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 07a2ff69ca59a254b6c464c8147f30b3c3fff4d8..b928af839e839c3070b3d2f391e80fd18a5170a0 100644 (file)
--- 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 feb4d7670b62d9c649af6695e29cfd0b6d8ddb08..0c6e9c7878477048b4e4e69bb9f3510f33f72563 100644 (file)
--- 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 566028dd25a1b583b7ae9722eb002fa6e7c4d3ec..22835ffd6403a795cb04e1bfa6390bb9c206cf5a 100644 (file)
--- 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
  */