From patchwork Sat Oct 4 08:47:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 396499 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 685B014017B for ; Sat, 4 Oct 2014 18:48:05 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1C7B5A73EC; Sat, 4 Oct 2014 10:48:02 +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 B0FuL4iOdmYF; Sat, 4 Oct 2014 10:48:01 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 841DDA73E7; Sat, 4 Oct 2014 10:48:00 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D754FA73E7 for ; Sat, 4 Oct 2014 10:47:57 +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 8oORzw3kERhU for ; Sat, 4 Oct 2014 10:47:57 +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 AB9EEA73E5 for ; Sat, 4 Oct 2014 10:47:53 +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 1XaL0E-0000iU-O8; Sat, 04 Oct 2014 09:47:46 +0100 Message-ID: <1412412466.17796.65.camel@hellion.org.uk> From: Ian Campbell To: u-boot@lists.denx.de, Ian Campbell , Hans de Goede Date: Sat, 04 Oct 2014 09:47:46 +0100 X-Mailer: Evolution 3.12.6-1 Mime-Version: 1.0 Cc: Ian Campbell Subject: [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup 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 A few simple patches which consolidate some Kconfig options and make SPL_FEL a first class .config member instead of putting it in CONFIG_SYS_EXTRA_OPTIONS. This means it is possible to do a FEL build for any board with: make _config echo CONFIG_SPL_FEL=y >> .config echo CONFIG_SPL_FEL=y >> spl/.config or better make _config sed -i -e 's/\# CONFIG_SPL_FEL is not set/CONFIG_SPL_FEL=y/g' .config spl/.config which is still one more step than I would like but still preferable IMHO to: sed -i -e 's/^CONFIG_SYS_EXTRA_OPTIONS="[^"]*/&,SPL_FEL/g' .config spl/.config I've been using a little hack (below) to MAKEALL to help build test this. There's still plenty of stuff in sunxi CONFIG_SYS_EXTRA_OPTIONS which could be moved out, but most of it is dependent on drivers/*/Kconfig switching first. Probably the board and power controller selection could be moved out without any dependencies, although the board one in particular will be quite a big patch I think it would be worth it. Ian. My MAKEALL hack, surely not upstreamable ;-) diff --git a/MAKEALL b/MAKEALL index 7c16319..3a8d1d0 100755 --- a/MAKEALL +++ b/MAKEALL @@ -660,6 +660,11 @@ build_target() { echo "Building ${target} board..." ${MAKE} -s ${target}_defconfig >/dev/null + if [ -n "$SUNXI_FORCE_FEL" ] ; then + sed -i -e 's/\# CONFIG_SPL_FEL is not set/CONFIG_SPL_FEL=y/g' \ + .config spl/.config + fi + ${MAKE} ${JOBS} ${CHECK} all \ >${LOG_DIR}/$target.MAKELOG 2> ${LOG_DIR}/$target.ERR