Kconfig: Move config SYS_MALLOC_LEN to Kconfig for zynq

This patch moves the the config SYS_MALLOC_LEN to
Kconfig. It will be just for Zynq arch and to do
will be for all other archs.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/Kconfig b/Kconfig
index 07be853074ac90010e149ed00852dafe08cc72b3..e12361a00c22c7dc96caa84955c5f4a0237f0cd7 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -92,6 +92,13 @@ config SYS_MALLOC_F_LEN
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.
 
+config SYS_MALLOC_LEN
+       hex "Define memory for Dynamic allocation"
+       depends on ARCH_ZYNQ
+       help
+         This defines memory to be allocated for Dynamic allocation
+         TODO: Use for other architectures
+
 menuconfig EXPERT
        bool "Configure standard U-Boot features (expert users)"
        default y

diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index af39dc7af3b0b75bbbdc0f50f4cd403723e327ca..af73ffee50fb38aee2b05f3c7a9bc03753c99d0e 100644 (file)
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -53,6 +53,9 @@ config SYS_CONFIG_NAME
 config SYS_MALLOC_F_LEN
        default 0x600
 
+config SYS_MALLOC_LEN
+       default 0x1400000
+
 config BOOT_INIT_FILE
        string "boot.bin init register filename"
        default ""

diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig
index a9e057de02269945a5f53039edc1058091e08e7d..0ad956450bd2c9524f3edd9f7f91a87111a65f33 100644 (file)
--- a/configs/zynq_cse_nand_defconfig
+++ b/configs/zynq_cse_nand_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_SYS_CONFIG_NAME="zynq_cse"
 CONFIG_ARCH_ZYNQ=y
+CONFIG_SYS_MALLOC_LEN=0x1000
 # CONFIG_MMC is not set
 CONFIG_SYS_TEXT_BASE=0x100000
 CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nand"

diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig
index d6cf3e4ee7dca04b7ca17f3cbf8e06d0774190b7..a991d85d1d5fdb561ed9f3fb9cb6834a8299c6da 100644 (file)
--- a/configs/zynq_cse_nor_defconfig
+++ b/configs/zynq_cse_nor_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_SYS_CONFIG_NAME="zynq_cse"
 CONFIG_ARCH_ZYNQ=y
+CONFIG_SYS_MALLOC_LEN=0x1000
 CONFIG_ZYNQ_M29EW_WB_HACK=y
 # CONFIG_MMC is not set
 CONFIG_SYS_TEXT_BASE=0xFFFC0000

diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig
index 223f960838d1fb6d4b813f7c2bbc784b9be3816f..678b1b3e7ab1e75d503bd30c08e8e139c3e03281 100644 (file)
--- a/configs/zynq_cse_qspi_defconfig
+++ b/configs/zynq_cse_qspi_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_SYS_CONFIG_NAME="zynq_cse"
 CONFIG_ARCH_ZYNQ=y
+CONFIG_SYS_MALLOC_LEN=0x1000
 # CONFIG_MMC is not set
 CONFIG_SYS_TEXT_BASE=0xFFFC0000
 CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-qspi-single"

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index c269e46961d3d19b70cf2cce5e2005c8d6e1f448..a38ca05e0d5d0ee9df28eeec898f46403b5ec16c 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -333,8 +333,6 @@
 #define CONFIG_SYS_MEMTEST_START       0
 #define CONFIG_SYS_MEMTEST_END         0x1000
 
-#define CONFIG_SYS_MALLOC_LEN          0x1400000
-
 #define CONFIG_SYS_INIT_RAM_ADDR       0xFFFF0000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x2000
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_INIT_RAM_ADDR + \

diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h
index 0a85bc7b422f2a22ee7863bf0c30ca67ed19f190..7487d4c61842f3bc470c4287d33d92b5e2a0428e 100644 (file)
--- a/include/configs/zynq_cse.h
+++ b/include/configs/zynq_cse.h
@@ -33,7 +33,6 @@
 #undef CONFIG_BOOTCOMMAND
 #undef CONFIG_SYS_HUSH_PARSER
 #undef CONFIG_SYS_PROMPT_HUSH_PS2
-#undef CONFIG_SYS_MALLOC_LEN
 #undef CONFIG_ENV_SIZE
 #undef CONFIG_CMDLINE_EDITING
 #undef CONFIG_AUTO_COMPLETE
@@ -56,7 +55,6 @@
 #undef CONFIG_BOOTM_LINUX
 #undef CONFIG_ZYNQ_SERIAL
 
-#define CONFIG_SYS_MALLOC_LEN  0x1000
 #define CONFIG_SYS_CBSIZE      1024
 
 #define CONFIG_ENV_SIZE                400