diff mbox

[U-Boot] sunxi: Correct select's of SPL_STACK_R and SPL_SYS_MALLOC_SIMPLE

Message ID 1498046212-30109-1-git-send-email-trini@konsulko.com
State Accepted
Commit ab43de803644fd74d1fc93dc53b163c7d3b38000
Delegated to: Tom Rini
Headers show

Commit Message

Tom Rini June 21, 2017, 11:56 a.m. UTC
On ARCH_SUNXI we've been selecting these targets for a long time if
SUPPORT_SPL is set.  However, Lichee Pi Zero is the first platform we've
added that does support SPL but does not build SPL and has exposed a
latent bug.  Both of these symbols depend on SPL not SUPPORT_SPL, so we
need to update our select here otherwise we get a Kconfig warning.

Fixes: f02abb0608fe ("sunxi: add support for Lichee Pi Zero")
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Tom Rini June 21, 2017, 11:05 p.m. UTC | #1
On Wed, Jun 21, 2017 at 07:56:52AM -0400, Tom Rini wrote:

> On ARCH_SUNXI we've been selecting these targets for a long time if
> SUPPORT_SPL is set.  However, Lichee Pi Zero is the first platform we've
> added that does support SPL but does not build SPL and has exposed a
> latent bug.  Both of these symbols depend on SPL not SUPPORT_SPL, so we
> need to update our select here otherwise we get a Kconfig warning.
> 
> Fixes: f02abb0608fe ("sunxi: add support for Lichee Pi Zero")
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dce41055619b..46183ae90091 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -666,8 +666,8 @@  config ARCH_SUNXI
 	select OF_BOARD_SETUP
 	select OF_CONTROL
 	select OF_SEPARATE
-	select SPL_STACK_R if SUPPORT_SPL
-	select SPL_SYS_MALLOC_SIMPLE if SUPPORT_SPL
+	select SPL_STACK_R if SPL
+	select SPL_SYS_MALLOC_SIMPLE if SPL
 	select SYS_NS16550
 	select SPL_SYS_THUMB_BUILD if !ARM64
 	select USB if DISTRO_DEFAULTS