random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-19 15:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

rockchip: move SYS_MALLOC_SIMPLE to mach-rockchip Kconfig

Browse Source 
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>
This commit is contained in:
Ariel D'Alessandro 2015-11-16 08:15:51 -03:00 committed by Simon Glass
parent 1d5a69684e
commit cd3187d6b2
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-rockchip/Kconfig
View File

@ -35,6 +35,9 @@ config ROCKCHIP_MAX_SPL_SIZE
config SYS_MALLOC_F config SYS_MALLOC_F
default y default y
config SPL_SYS_MALLOC_SIMPLE
default y
config SPL_DM config SPL_DM
default y default y

4
include/configs/rk3036_common.h
View File

@ -27,10 +27,6 @@
#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_MEM32 #define CONFIG_SYS_NS16550_MEM32
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MALLOC_SIMPLE
#endif
#define CONFIG_SYS_TEXT_BASE 0x60000000 #define CONFIG_SYS_TEXT_BASE 0x60000000
#define CONFIG_SYS_INIT_SP_ADDR 0x60100000 #define CONFIG_SYS_INIT_SP_ADDR 0x60100000
#define CONFIG_SYS_LOAD_ADDR 0x60800800 #define CONFIG_SYS_LOAD_ADDR 0x60800800

4
include/configs/rk3288_common.h
View File

@ -32,10 +32,6 @@
#define CONFIG_SYS_NS16550_MEM32 #define CONFIG_SYS_NS16550_MEM32
#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_BOARD_INIT
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MALLOC_SIMPLE
#endif
#define CONFIG_SYS_TEXT_BASE 0x00100000 #define CONFIG_SYS_TEXT_BASE 0x00100000
#define CONFIG_SYS_INIT_SP_ADDR 0x00100000 #define CONFIG_SYS_INIT_SP_ADDR 0x00100000
#define CONFIG_SYS_LOAD_ADDR 0x00800800 #define CONFIG_SYS_LOAD_ADDR 0x00800800