commit f1896c45cb2f: spl: make SPL and normal u-boot stage use independent SYS_MALLOC_F_LEN introduced independent SYS_MALLOC_F_LEN for SPL and U-Boot.
Use it on the smartweb board, as above commit broke the smartweb board.
Signed-off-by: Heiko Schocher hs@denx.de ---
configs/smartweb_defconfig | 1 + include/configs/smartweb.h | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index dd83b75095..924b164324 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -10,6 +10,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_NAND_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9260-smartweb" +CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260" CONFIG_ENV_IS_IN_NAND=y diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index cc83b98348..e504e9cd45 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -200,9 +200,6 @@ #define CONFIG_SYS_INIT_SP_ADDR 0x301000 #define CONFIG_SPL_STACK_R #define CONFIG_SPL_STACK_R_ADDR CONFIG_SYS_TEXT_BASE -/* we have only 4k sram in SPL, so cut SYS_MALLOC_F_LEN */ -#undef CONFIG_SYS_MALLOC_F_LEN -#define CONFIG_SYS_MALLOC_F_LEN 0x400 #else /* * Initial stack pointer: 4k - GENERATED_GBL_DATA_SIZE in internal SRAM,