diff mbox

[U-Boot,v3,6/6] sunxi: Kconfig: Unify sunxi Kconfig code

Message ID 1413918239.20604.36.camel@hellion.org.uk
State Accepted
Delegated to: Ian Campbell
Headers show

Commit Message

Ian Campbell Oct. 21, 2014, 7:03 p.m. UTC 
On Sun, 2014-10-12 at 22:17 +0100, Ian Campbell wrote:
> > -if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I
> > +	default "sun4i" if TARGET_SUN4I
> > +	default "sun5i" if TARGET_SUN5I
> > +	default "sun6i" if TARGET_SUN5I

There is a typo here which is apparent with "MAKEALL -s sunxi", since it
causes Colombus_defconfig not to build.

Patch is below but given the breakage is only in u-boot-sunxi.git#next
right now I think it would be better to fold it into the original patch.

Ian.

8<----------------------------

From 59d0b88a5025b2846227c0bde6ccdbb2e1bf916b Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Tue, 21 Oct 2014 20:00:28 +0100
Subject: [PATCH] sunxi: Fix build breakage for sun6i

u-boot-sunxi.git#next currently fails with:

In file included from /local/scratch/ijc/development/u-boot.git/include/common.h:18:0:
include/config.h:5:22: fatal error: configs/.h: No such file or directory
 #include <configs/.h>
                      ^
This is due to a typo in board/sunxi/Kconfig which causes
CONFIG_SYS_CONFIG_NAME to be undefined for sun6i platforms.

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
---
 board/sunxi/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tom Rini Oct. 21, 2014, 7:25 p.m. UTC | #1 
On Tue, Oct 21, 2014 at 08:03:59PM +0100, Ian Campbell wrote:
> On Sun, 2014-10-12 at 22:17 +0100, Ian Campbell wrote:
> > > -if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I
> > > +	default "sun4i" if TARGET_SUN4I
> > > +	default "sun5i" if TARGET_SUN5I
> > > +	default "sun6i" if TARGET_SUN5I
> 
> There is a typo here which is apparent with "MAKEALL -s sunxi", since it
> causes Colombus_defconfig not to build.
> 
> Patch is below but given the breakage is only in u-boot-sunxi.git#next
> right now I think it would be better to fold it into the original patch.

Yes, fold it in, thanks!
Hans de Goede Oct. 22, 2014, 12:18 p.m. UTC | #2 
Hi,

On 10/21/2014 09:03 PM, Ian Campbell wrote:
> On Sun, 2014-10-12 at 22:17 +0100, Ian Campbell wrote:
>>> -if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I
>>> +	default "sun4i" if TARGET_SUN4I
>>> +	default "sun5i" if TARGET_SUN5I
>>> +	default "sun6i" if TARGET_SUN5I
> 
> There is a typo here which is apparent with "MAKEALL -s sunxi", since it
> causes Colombus_defconfig not to build.
> 
> Patch is below but given the breakage is only in u-boot-sunxi.git#next
> right now I think it would be better to fold it into the original patch.

Good catch thanks, I've squashed this into the original commit and
done a forced push to u-boot-sunxi/next with this.

Regards,

Hans
diff mbox

Patch

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 4ac562c..9892a34 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -4,7 +4,7 @@  config SYS_CONFIG_NAME
 	string
 	default "sun4i" if TARGET_SUN4I
 	default "sun5i" if TARGET_SUN5I
-	default "sun6i" if TARGET_SUN5I
+	default "sun6i" if TARGET_SUN6I
 	default "sun7i" if TARGET_SUN7I
 
 config SYS_CPU