summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2017-08-08 13:10:24 (GMT)
committerTom Rini <trini@konsulko.com>2017-08-11 15:34:12 (GMT)
commit21fd01b8b5cc93167fc26c6c6a1ba8049096bfca (patch)
treeff94661a753d7aa2b3f2407fc5c1de667ba3882c
parentf07515578be131a71773f836b761cf135527c2dc (diff)
downloadu-boot-fsl-qoriq-21fd01b8b5cc93167fc26c6c6a1ba8049096bfca.tar.xz
at91, smartweb: use SPL_SYS_MALLOC_F_LEN
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>
-rw-r--r--configs/smartweb_defconfig1
-rw-r--r--include/configs/smartweb.h3
2 files changed, 1 insertions, 3 deletions
diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
index 1db2acc..92359f4 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 a80d290..5b50468 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -199,9 +199,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,