rockchip: move SYS_MALLOC_SIMPLE to mach-rockchip Kconfig

Commit 1eb0c03c2198a7ec9de456b83dacdc4831b96cbf added
SPL_SYS_MALLOC_SIMPLE Kconfig option and changed the way it is
evaluated.

Thus, the definitions of CONFIG_SYS_MALLOC_SIMPLE in rk3***_common.h
board configs are now incorrect because CONFIG_SPL_BUILD is enabled so
CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE) will look for SPL_SYS_MALLOC_SIMPLE
instead of SYS_MALLOC_SIMPLE.

This commit fix this enabling SPL_SYS_MALLOC_SIMPLE with the new Kconfig
option by default in rockchip-mach.

Signed-off-by: Ariel D'Alessandro <ariel@vanguardiasur.com.ar>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 961a40264a55cdf31f7e3cb8c86a31792f20db03..aef1a455ae0108b079cccd7d0aea2f659fddc012 100644 (file)
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -35,6 +35,9 @@ config ROCKCHIP_MAX_SPL_SIZE
 config SYS_MALLOC_F
        default y
 
+config SPL_SYS_MALLOC_SIMPLE
+       default y
+
 config SPL_DM
        default y
 

diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index 525fabc5b7c43805acc35322f8b206461398cb8b..f753e684a6d13d53cace5f012900895d8b7986ca 100644 (file)
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -27,10 +27,6 @@
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_MEM32
 
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_MALLOC_SIMPLE
-#endif
-
 #define CONFIG_SYS_TEXT_BASE           0x60000000
 #define CONFIG_SYS_INIT_SP_ADDR                0x60100000
 #define CONFIG_SYS_LOAD_ADDR           0x60800800

diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index cd7477be187f8b6fad47a8de7dbf1d797a4b9a61..238711a699206008c940e02d84a7cb0e50ac7e00 100644 (file)
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -32,10 +32,6 @@
 #define CONFIG_SYS_NS16550_MEM32
 #define CONFIG_SPL_BOARD_INIT
 
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_MALLOC_SIMPLE
-#endif
-
 #define CONFIG_SYS_TEXT_BASE           0x00100000
 #define CONFIG_SYS_INIT_SP_ADDR                0x00100000
 #define CONFIG_SYS_LOAD_ADDR           0x00800800