aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek BehĂșn <marek.behun@nic.cz>2021-10-09 19:33:45 +0200
committerStefan Roese <sr@denx.de>2021-10-21 07:39:05 +0200
commit2c8a4e4d7613bb053342e67edf19dc46c21e20fe (patch)
treebc4ca407ce3ff673ab5f5ee0883412817ffda2ca
parentdc096a5e905b1ccd53d8337ec16414ec076602ea (diff)
downloadu-boot-2c8a4e4d7613bb053342e67edf19dc46c21e20fe.zip
u-boot-2c8a4e4d7613bb053342e67edf19dc46c21e20fe.tar.gz
u-boot-2c8a4e4d7613bb053342e67edf19dc46c21e20fe.tar.bz2
arm: mvebu: turris_omnia: Move SPL's SYS_MALLOC_SIMPLE to Kconfig
Instead of declaring CONFIG_SYS_MALLOC_SIMPLE dependant on CONFIG_SPL_BUILD in board config header, select CONFIG_SPL_SYS_MALLOC_SIMPLE in Kconfig. Signed-off-by: Marek BehĂșn <marek.behun@nic.cz> Reviewed-by: Stefan Roese <sr@denx.de>
-rw-r--r--arch/arm/mach-mvebu/Kconfig1
-rw-r--r--include/configs/turris_omnia.h4
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 54dff99..8365305 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -128,6 +128,7 @@ config TARGET_TURRIS_OMNIA
select I2C_MUX
select I2C_MUX_PCA954x
select SPL_I2C_MUX
+ select SPL_SYS_MALLOC_SIMPLE
select SYS_I2C_MVTWSI
select ATSHA204A
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 8d7d5c2..273ff85 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -33,10 +33,6 @@
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_MALLOC_SIMPLE
-#endif
-
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
#define CONFIG_SPL_DRIVERS_MISC