diff options
| author | Ariel D'Alessandro <ariel@vanguardiasur.com.ar> | 2015-11-16 08:15:51 -0300 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-12-01 08:07:22 -0700 |
| commit | cd3187d6b2a6bc83f4613a865a3609f5233434d4 (patch) | |
| tree | 59b27ad24cdb955e2a3ca26071b527c5473db000 /arch/arm/mach-rockchip | |
| parent | 1d5a69684e863adf1d689cfb506ab464f1a1e645 (diff) | |
| download | blackbird-obmc-uboot-cd3187d6b2a6bc83f4613a865a3609f5233434d4.tar.gz blackbird-obmc-uboot-cd3187d6b2a6bc83f4613a865a3609f5233434d4.zip | |
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>
Diffstat (limited to 'arch/arm/mach-rockchip')
| -rw-r--r-- | arch/arm/mach-rockchip/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 961a40264a..aef1a455ae 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 |
