On 20.7.2018 11:41, Vipul Kumar wrote: > From: Siva Durga Prasad Paladugu <siva.durga.palad...@xilinx.com> > > 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 <siva.durga.palad...@xilinx.com> > Signed-off-by: Vipul Kumar <vipul.ku...@xilinx.com> > --- > Kconfig | 7 +++++++ > arch/arm/mach-zynq/Kconfig | 3 +++ > configs/zynq_cse_nand_defconfig | 1 + > configs/zynq_cse_nor_defconfig | 1 + > configs/zynq_cse_qspi_defconfig | 1 + > include/configs/zynq-common.h | 2 -- > include/configs/zynq_cse.h | 3 --- > 7 files changed, 13 insertions(+), 5 deletions(-) > > diff --git a/Kconfig b/Kconfig > index c8b86cd..61795e3 100644 > --- a/Kconfig > +++ b/Kconfig > @@ -136,6 +136,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 > + > config SPL_SYS_MALLOC_F_LEN > hex "Size of malloc() pool in SPL before relocation" > depends on SYS_MALLOC_F > diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig > index 1352359..a599ed6 100644 > --- a/arch/arm/mach-zynq/Kconfig > +++ b/arch/arm/mach-zynq/Kconfig > @@ -57,6 +57,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 eb7e574..d228f9a 100644 > --- a/configs/zynq_cse_nand_defconfig > +++ b/configs/zynq_cse_nand_defconfig > @@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x100000 > CONFIG_ENV_SIZE=0x190 > CONFIG_SPL=y > CONFIG_SPL_STACK_R_ADDR=0x200000 > +CONFIG_SYS_MALLOC_LEN=0x1000 > CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nand" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_SPL_STACK_R=y > diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig > index 95b31a0..3052c5b 100644 > --- a/configs/zynq_cse_nor_defconfig > +++ b/configs/zynq_cse_nor_defconfig > @@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0xFFFC0000 > CONFIG_ENV_SIZE=0x190 > CONFIG_SPL=y > CONFIG_SPL_STACK_R_ADDR=0x200000 > +CONFIG_SYS_MALLOC_LEN=0x1000 > CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nor" > CONFIG_BOOTDELAY=-1 > # CONFIG_DISPLAY_CPUINFO is not set > diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig > index c094a5e..2410806 100644 > --- a/configs/zynq_cse_qspi_defconfig > +++ b/configs/zynq_cse_qspi_defconfig > @@ -8,6 +8,7 @@ CONFIG_DEBUG_UART_BASE=0x0 > CONFIG_DEBUG_UART_CLOCK=0 > CONFIG_SPL_STACK_R_ADDR=0x200000 > # CONFIG_ZYNQ_DDRC_INIT is not set > +CONFIG_SYS_MALLOC_LEN=0x1000 > # CONFIG_CMD_ZYNQ is not set > CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-qspi-single" > CONFIG_DEBUG_UART=y > diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h > index c41dc2c..3c2987b 100644 > --- a/include/configs/zynq-common.h > +++ b/include/configs/zynq-common.h > @@ -236,8 +236,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 0x1000 > #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 36fbe0e..c4587a1 100644 > --- a/include/configs/zynq_cse.h > +++ b/include/configs/zynq_cse.h > @@ -36,7 +36,4 @@ > #define CONFIG_SPL_BSS_START_ADDR 0x20000 > #define CONFIG_SPL_BSS_MAX_SIZE 0x8000 > > -#undef CONFIG_SYS_MALLOC_LEN > -#define CONFIG_SYS_MALLOC_LEN 0x1000 > - > #endif /* __CONFIG_ZYNQ_CSE_H */ >
Applied. M _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
