Skip to content
Snippets Groups Projects
Commit cd3187d6 authored by Ariel D'Alessandro's avatar Ariel D'Alessandro Committed by Simon Glass
Browse files

rockchip: move SYS_MALLOC_SIMPLE to mach-rockchip Kconfig


Commit 1eb0c03c 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: default avatarAriel D'Alessandro <ariel@vanguardiasur.com.ar>
Acked-by: default avatarSimon Glass <sjg@chromium.org>
parent 1d5a6968
Branches
Tags
No related merge requests found
......@@ -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
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment