From: Siva Durga Prasad Paladugu Date: Thu, 14 Sep 2017 11:15:57 +0000 (+0530) Subject: Kconfig: Move config SYS_MALLOC_LEN to Kconfig for zynq X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1c0c032c5162f2421558c4f2f59d7ad973ee617;p=thirdparty%2Fu-boot.git 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 Signed-off-by: Michal Simek --- diff --git a/Kconfig b/Kconfig index 07be853074a..e12361a00c2 100644 --- 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 af39dc7af3b..af73ffee50f 100644 --- 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 a9e057de022..0ad956450bd 100644 --- 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 d6cf3e4ee7d..a991d85d1d5 100644 --- 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 223f960838d..678b1b3e7ab 100644 --- 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 c269e46961d..a38ca05e0d5 100644 --- 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 0a85bc7b422..7487d4c6184 100644 --- 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