From patchwork Tue Jul 13 23:04:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 111857 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6DN6Fab001825 for ; Tue, 13 Jul 2010 23:06:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753979Ab0GMXGO (ORCPT ); Tue, 13 Jul 2010 19:06:14 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:54064 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752714Ab0GMXGN (ORCPT ); Tue, 13 Jul 2010 19:06:13 -0400 Received: by pxi14 with SMTP id 14so2480566pxi.19 for ; Tue, 13 Jul 2010 16:06:13 -0700 (PDT) Received: by 10.142.142.15 with SMTP id p15mr16306695wfd.208.1279062301443; Tue, 13 Jul 2010 16:05:01 -0700 (PDT) Received: from angua (S01060002b3d79728.cg.shawcable.net [70.72.87.49]) by mx.google.com with ESMTPS id c23sm6380873rvf.0.2010.07.13.16.04.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 13 Jul 2010 16:05:00 -0700 (PDT) Received: from [127.0.1.1] (unknown [IPv6:::1]) by angua (Postfix) with ESMTP id 272E73C0129; Tue, 13 Jul 2010 17:04:58 -0600 (MDT) Subject: [RFC PATCH] Kconfig: Enable Kconfig fragments to be used for defconfig To: linuxppc-dev@lists.ozlabs.org, Nicolas Pitre , Benjamin Herrenschmidt , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linus Torvalds , Russell King From: Grant Likely Cc: Tony Lindgren , Daniel Walker , Uwe =?utf-8?q?Kleine-K=C3=B6nig?= Date: Tue, 13 Jul 2010 17:04:58 -0600 Message-ID: <20100713230352.6781.18644.stgit@angua> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 13 Jul 2010 23:06:15 +0000 (UTC) diff --git a/arch/powerpc/configs/mpc5200.Kconfig b/arch/powerpc/configs/mpc5200.Kconfig new file mode 100644 index 0000000..1281dd1 --- /dev/null +++ b/arch/powerpc/configs/mpc5200.Kconfig @@ -0,0 +1,24 @@ +config generateconfig_MPC5200_YES + def_bool y + select PPC_MPC52xx + select PPC_MPC5200_SIMPLE + select PPC_EFIKA + select PPC_LITE5200 + select PPC_MEDIA5200 + select PPC_MPC5200_BUGFIX + select PPC_MPC5200_GPIO + select PPC_MPC5200_LPBFIFO + select PPC_BESTCOMM + select SIMPLE_GPIO + select SERIAL_MPC52xx + select SERIAL_MPC52xx_CONSOLE + select MTD + select PATA_MPC52xx + select SPI_MPC52xx + select SPI_MPC52xx_PSC + select I2C_MPC + select FEC_MPC52xx + select LXT_PHY + select WATCHDOG + +source arch/powerpc/configs/ppc32.Kconfig diff --git a/arch/powerpc/configs/mpc83xx.Kconfig b/arch/powerpc/configs/mpc83xx.Kconfig new file mode 100644 index 0000000..818fdec --- /dev/null +++ b/arch/powerpc/configs/mpc83xx.Kconfig @@ -0,0 +1,35 @@ +config generateconfig_MPC83xx_YES + def_bool y + select PPC_83xx + select EMBEDDED + select MPC831x_RDB + select MPC832x_MDS + select MPC832x_RDB + select MPC834x_MDS + select MPC834x_ITX + select MPC836x_MDS + select MPC836x_RDK + select MPC837x_MDS + select MPC837x_RDB + select SBC834x + select ASP834x + select QUICC_ENGINE + select OE_GPIO + select MATH_EMULATION + select SATA_FSL + select SATA_SIL + select MARVELL_PHY + select DAVICOM_PHY + select VITESSE_PHY + select ICPLUS_PHY + select FIXED_PHY + select FSL_PQ_MDIO + select GIANFAR + select UCC_GETH + select SERIAL_8250 + select SERIAL_8250_CONSOLE + select I2C_MPC + select GPIOLIB + select WATCHDOG + +source arch/powerpc/configs/ppc32.Kconfig diff --git a/arch/powerpc/configs/ppc32.Kconfig b/arch/powerpc/configs/ppc32.Kconfig new file mode 100644 index 0000000..66e39f0 --- /dev/null +++ b/arch/powerpc/configs/ppc32.Kconfig @@ -0,0 +1,39 @@ +config generateconfig_PPC32_YES + def_bool y + select EXPERIMENTAL + select DEVTMPFS + select PPC32 + select SYSVIPC + select BLK_DEV_INITRD + select NO_HZ + select HIGH_RES_TIMERS + select GPIO + select SPI + select SPI_SPIDEV + select I2C + select I2C_CHARDEV + select USB + select NET + select SCSI + select BLK_DEV_SD + select ATA + select PACKET + select UNIX + select INET + select IP_MULTICAST + select IP_PNP + select IP_PNP_DHCP + select NETDEVICES + select NET_ETHERNET + select PROC_DEVICETREE + select INOTIFY + select TMPFS + select NFS_FS + select ROOT_NFS + select PRINTK_TIME + +config generateconfig_PPC32_MODULE + def_tristate m + +source arch/powerpc/Kconfig + diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 7ea649d..4e9afd9 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -117,7 +117,23 @@ else $(Q)$< -D arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) endif -%_defconfig: $(obj)/conf +# New-style defconfig using Kconfig fragments +%_defconfig: $(obj)/conf arch/$(SRCARCH)/configs/%.Kconfig + $(Q)$< -D /dev/null arch/$(SRCARCH)/configs/$*.Kconfig + $(Q)sed '/^#/d;/^CONFIG_generateconfig_/d' $(objtree)/.config > $(objtree)/.config-diff1 + $(Q)$< -o $(Kconfig) > /dev/null # oldconfig test to make sure it doesn't change + $(Q)sed '/^#/d' $(objtree)/.config > $(objtree)/.config-diff2 + $(Q)diff -u $(objtree)/.config-diff1 $(objtree)/.config-diff2 + +# This is kind of useful. The new-style defconfig using Kconfig fragments +# can also be used to successively pull in the options a defconfig cares +# about overtop of the current config. +%_oldconfig: $(obj)/conf arch/$(SRCARCH)/configs/%.Kconfig + $(Q)$< -o arch/$(SRCARCH)/configs/$*.Kconfig + $(Q)$< -o $(Kconfig) > /dev/null # oldconfig to clear out the temporary items + +# Old-style defconfig using full (or trimmed) .config files. +%_defconfig: $(obj)/conf arch/$(SRCARCH)/configs/%_defconfig $(Q)$< -D arch/$(SRCARCH)/configs/$@ $(Kconfig) # Help text used by make help