diff options
| author | Ariel D'Alessandro <ariel@vanguardiasur.com.ar> | 2015-11-16 11:15:51 (GMT) |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-12-01 15:07:22 (GMT) |
| commit | cd3187d6b2a6bc83f4613a865a3609f5233434d4 (patch) | |
| tree | 59b27ad24cdb955e2a3ca26071b527c5473db000 | |
| parent | 1d5a69684e863adf1d689cfb506ab464f1a1e645 (diff) | |
| download | u-boot-cd3187d6b2a6bc83f4613a865a3609f5233434d4.tar.xz | |
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>
| -rw-r--r-- | arch/arm/mach-rockchip/Kconfig | 3 | ||||
| -rw-r--r-- | include/configs/rk3036_common.h | 4 | ||||
| -rw-r--r-- | include/configs/rk3288_common.h | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 961a402..aef1a45 100644 --- 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 525fabc..f753e68 100644 --- 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 cd7477b..238711a 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 |