diff mbox series

[u-boot-marvell,11/12] arm: mvebu: turris_omnia: Move SPL's SYS_MALLOC_SIMPLE to Kconfig

Message ID 20211009173346.7859-12-kabel@kernel.org
State Accepted
Commit 2c8a4e4d7613bb053342e67edf19dc46c21e20fe
Delegated to: Stefan Roese
Headers show
Series Small Turris MOX and Omnia changes | expand

Commit Message

Marek Behún Oct. 9, 2021, 5:33 p.m. UTC 
From: Marek Behún <marek.behun@nic.cz>

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>
---
 arch/arm/mach-mvebu/Kconfig    | 1 +
 include/configs/turris_omnia.h | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

Comments

Stefan Roese Oct. 21, 2021, 5:34 a.m. UTC | #1 
On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> 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>

Thanks,
Stefan

> ---
>   arch/arm/mach-mvebu/Kconfig    | 1 +
>   include/configs/turris_omnia.h | 4 ----
>   2 files changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> index 54dff9986b..8365305733 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 8646633ea4..562b49327f 100644
> --- a/include/configs/turris_omnia.h
> +++ b/include/configs/turris_omnia.h
> @@ -36,10 +36,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
> 


Viele Grüße,
Stefan
diff mbox series

Patch

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 54dff9986b..8365305733 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 8646633ea4..562b49327f 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -36,10 +36,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