From patchwork Tue Oct 21 19:03:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 401678 X-Patchwork-Delegate: ijc@hellion.org.uk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 1098614007B for ; Wed, 22 Oct 2014 06:04:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B8898A740E; Tue, 21 Oct 2014 21:04:08 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mpsEX9KPvFX4; Tue, 21 Oct 2014 21:04:08 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 15AC2A73ED; Tue, 21 Oct 2014 21:04:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5F7A9A73ED for ; Tue, 21 Oct 2014 21:04:04 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DcT-vEqBwvld for ; Tue, 21 Oct 2014 21:04:04 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from benson.vm.bytemark.co.uk (benson.vm.bytemark.co.uk [212.110.190.137]) by theia.denx.de (Postfix) with ESMTPS id 40D10A73EC for ; Tue, 21 Oct 2014 21:04:00 +0200 (CEST) Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginm.net ([86.6.25.227] helo=dagon.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1Xgeiu-0007Fn-8X; Tue, 21 Oct 2014 20:04:00 +0100 Message-ID: <1413918239.20604.36.camel@hellion.org.uk> From: Ian Campbell To: Hans de Goede Date: Tue, 21 Oct 2014 20:03:59 +0100 In-Reply-To: <1413148636.11505.70.camel@hellion.org.uk> References: <1413137238-27251-1-git-send-email-hdegoede@redhat.com> <1413137238-27251-7-git-send-email-hdegoede@redhat.com> <1413148636.11505.70.camel@hellion.org.uk> X-Mailer: Evolution 3.12.6-1 Mime-Version: 1.0 Cc: u-boot@lists.denx.de, linux-sunxi@googlegroups.com Subject: Re: [U-Boot] [PATCH v3 6/6] sunxi: Kconfig: Unify sunxi Kconfig code X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 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 ^ 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 --- board/sunxi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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