summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2015-12-08 14:45:54 +0100
committerMichal Simek <michal.simek@xilinx.com>2015-12-18 13:15:58 +0100
commit4de9bbdcc893e3700f8390580258acfe9f450aad (patch)
tree992e78ec27c45b8fb759b273cf9b945b9f079205
parent4fcd0b33c7a0db2e86cccdc1831db235a6bc1b2d (diff)
downloadu-boot-imx-4de9bbdcc893e3700f8390580258acfe9f450aad.zip
u-boot-imx-4de9bbdcc893e3700f8390580258acfe9f450aad.tar.gz
u-boot-imx-4de9bbdcc893e3700f8390580258acfe9f450aad.tar.bz2
microblaze: Use malloc setting via Kconfig
Clean board specific file. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--configs/microblaze-generic_defconfig2
-rw-r--r--include/configs/microblaze-generic.h6
2 files changed, 2 insertions, 6 deletions
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 1fe2e0f..98391c8 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -1,4 +1,6 @@
CONFIG_MICROBLAZE=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_TARGET_MICROBLAZE_GENERIC=y
CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
CONFIG_SPL=y
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index a48c8d6..e0bc41c 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -113,12 +113,6 @@
#endif
#define CONFIG_SYS_MALLOC_LEN 0xC0000
-#ifndef CONFIG_SPL_BUILD
-# define CONFIG_SYS_MALLOC_F_LEN 1024
-#else
-# define CONFIG_SYS_MALLOC_SIMPLE
-# define CONFIG_SYS_MALLOC_F_LEN 0x150
-#endif
/* Stack location before relocation */
#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_TEXT_BASE - \