| Message ID | 1447672551-2930-3-git-send-email-ariel@vanguardiasur.com.ar |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 16 November 2015 at 04:15, Ariel D'Alessandro <ariel@vanguardiasur.com.ar> wrote: > 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> > --- > arch/arm/mach-rockchip/Kconfig | 3 +++ > include/configs/rk3036_common.h | 4 ---- > include/configs/rk3288_common.h | 4 ---- > 3 files changed, 3 insertions(+), 8 deletions(-) Acked-by: Simon Glass <sjg@chromium.org>
On 16 November 2015 at 14:08, Simon Glass <sjg@chromium.org> wrote: > On 16 November 2015 at 04:15, Ariel D'Alessandro > <ariel@vanguardiasur.com.ar> wrote: >> 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> >> --- >> arch/arm/mach-rockchip/Kconfig | 3 +++ >> include/configs/rk3036_common.h | 4 ---- >> include/configs/rk3288_common.h | 4 ---- >> 3 files changed, 3 insertions(+), 8 deletions(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-rockchip, thanks!
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 6dddbab..607cb71 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -31,6 +31,9 @@ config ROCKCHIP_MAX_INIT_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 b7f78d5..4d3610f 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 5ba084d..74c7ee1 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -34,10 +34,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
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> --- arch/arm/mach-rockchip/Kconfig | 3 +++ include/configs/rk3036_common.h | 4 ---- include/configs/rk3288_common.h | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-)