From cd3187d6b2a6bc83f4613a865a3609f5233434d4 Mon Sep 17 00:00:00 2001 From: Ariel D'Alessandro Date: Mon, 16 Nov 2015 08:15:51 -0300 Subject: 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 Acked-by: Simon Glass --- include/configs/rk3288_common.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/configs/rk3288_common.h') diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index cd7477be18..238711a699 100644 --- 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 -- cgit v1.2.3