From patchwork Tue Dec 6 12:38:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 9462535 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C6F8560236 for ; Tue, 6 Dec 2016 12:56:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB13628335 for ; Tue, 6 Dec 2016 12:56:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE7C22838C; Tue, 6 Dec 2016 12:56:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 90FF928335 for ; Tue, 6 Dec 2016 12:56:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEFGk-0007vl-N0; Tue, 06 Dec 2016 12:54:50 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEF3x-0003Pk-HA for linux-arm-kernel@lists.infradead.org; Tue, 06 Dec 2016 12:41:47 +0000 Received: from epcpsbgm2new.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OHR01XG7KKI5P90@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 06 Dec 2016 21:41:13 +0900 (KST) X-AuditID: cbfee61b-f796f6d000004092-a8-5846b1e9333a Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 05.09.16530.9E1B6485; Tue, 6 Dec 2016 21:41:13 +0900 (KST) Received: from AMDC3058.DIGITAL.local ([106.120.53.102]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OHR00KOOKH1JQ10@mmp1.samsung.com>; Tue, 06 Dec 2016 21:41:13 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 15/23] arm: use kconfig fragments for ARCH_PXA defconfigs (part 1) Date: Tue, 06 Dec 2016 13:38:50 +0100 Message-id: <1481027938-31831-16-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1481027938-31831-1-git-send-email-b.zolnierkie@samsung.com> References: <1481027938-31831-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeLIzCtJLcpLzFFi42I5/e+xgO7LjW4RBicf61j8nXSM3WLjjPWs FscvvGK3aPr7isXiwjpzi02Pr7FaXN41h83i9mVei1PXP7NZzHoj7MDl0dLcw+bx+9ckRo/+ dZ9ZPXbOusvusXlJvceVE02sHn1bVjF6fN4k57F993KWAM4oN5uM1MSU1CKF1Lzk/JTMvHRb pdAQN10LJYW8xNxUW6UIXd+QICWFssScUiDPyAANODgHuAcr6dsluGV8Os1V8CKo4tHj32wN jAs8uhg5OSQETCT6P2xjh7DFJC7cW8/WxcjFISSwlFHi0csJ7BDOL0aJ+d33WEGq2ASsJCa2 r2IEsUUENCSmdD0GK2IW2McksWf2JyaQhLBAhMT30y3MIDaLgKpEw4J3QHEODl4BT4lP31Uh tslJnDw2GWwmJ1D4+pY1YDOFBDwkdl79zj6BkXcBI8MqRonUguSC4qT0XKO81HK94sTc4tK8 dL3k/NxNjOCIeCa9g/HwLvdDjAIcjEo8vB7NrhFCrIllxZW5hxglOJiVRHjXb3CLEOJNSays Si3Kjy8qzUktPsRoCnTXRGYp0eR8YLTmlcQbmpibmBsbWJhbWpoYKYnzNs5+Fi4kkJ5Ykpqd mlqQWgTTx8TBKdXAaJA6PauleEbm2o1LNSxyG3/nN/Fm/LuQ/yH8aOyEzcf49V2j9y5MTONw XmHLeXWD1gbRE3/TpRhq1FsemD917Jqz6UIOv4bonnTFGpXu52W/07+f/zmptCz0+s5WVnfZ wIMyU43qOJckLAp9t+b/zvqVJa0RKs9fxT78fjv/m8ip07tZFm5XVWIpzkg01GIuKk4EAD2x uKyeAgAA X-MTR: 20000000000000000@CPGS X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161206_044138_367054_E5B7D912 X-CRM114-Status: GOOD ( 15.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Russell King , Arnd Bergmann , b.zolnierkie@samsung.com, linux-kernel@vger.kernel.org, Haojian Zhuang , Olof Johansson , Robert Jarzmik , Cyril Bur , Daniel Mack MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Replace [lpd270,lubbock,mainstone,pxa255-idp]_defconfig-s with a Makefile target using merge_config. The patch was verified with doing: $ make [lpd270,...]_defconfig $ make savedefconfig and comparing resulting defconfig files (before/after the patch). Cc: Daniel Mack Cc: Haojian Zhuang Cc: Robert Jarzmik Cc: Cyril Bur Signed-off-by: Bartlomiej Zolnierkiewicz --- arch/arm/Makefile | 16 +++++++ arch/arm/configs/lpd270.config | 20 ++++++++ arch/arm/configs/lpd270_defconfig | 56 ---------------------- arch/arm/configs/lubbock.config | 11 +++++ arch/arm/configs/lubbock_defconfig | 47 ------------------ arch/arm/configs/mainstone.config | 11 +++++ arch/arm/configs/pxa255-idp.config | 14 ++++++ arch/arm/configs/pxa255-idp_defconfig | 50 ------------------- .../{mainstone_defconfig => pxa_basic1_defconfig} | 11 ----- 9 files changed, 72 insertions(+), 164 deletions(-) create mode 100644 arch/arm/configs/lpd270.config delete mode 100644 arch/arm/configs/lpd270_defconfig create mode 100644 arch/arm/configs/lubbock.config delete mode 100644 arch/arm/configs/lubbock_defconfig create mode 100644 arch/arm/configs/mainstone.config create mode 100644 arch/arm/configs/pxa255-idp.config delete mode 100644 arch/arm/configs/pxa255-idp_defconfig rename arch/arm/configs/{mainstone_defconfig => pxa_basic1_defconfig} (72%) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index d4def05..58890a9 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -406,6 +406,22 @@ PHONY += nuc960_defconfig nuc960_defconfig: $(call merge_into_defconfig,nuc910_defconfig,nuc960) +PHONY += lpd270_defconfig +lpd270_defconfig: + $(call merge_into_defconfig,pxa_basic1_defconfig,lpd270) + +PHONY += lubbock_defconfig +lubbock_defconfig: + $(call merge_into_defconfig,pxa_basic1_defconfig,lubbock) + +PHONY += mainstone_defconfig +mainstone_defconfig: + $(call merge_into_defconfig,pxa_basic1_defconfig,mainstone) + +PHONY += pxa255-idp_defconfig +pxa255-idp_defconfig: + $(call merge_into_defconfig,pxa_basic1_defconfig,pxa255-idp) + PHONY += vdso_install vdso_install: ifeq ($(CONFIG_VDSO),y) diff --git a/arch/arm/configs/lpd270.config b/arch/arm/configs/lpd270.config new file mode 100644 index 0000000..e70b144 --- /dev/null +++ b/arch/arm/configs/lpd270.config @@ -0,0 +1,20 @@ +CONFIG_SLAB=y +CONFIG_MACH_LOGICPD_PXA270=y +CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200 mem=64M" +CONFIG_IP_PNP_BOOTP=y +# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET6_XFRM_MODE_TUNNEL is not set +# CONFIG_INET6_XFRM_MODE_BEET is not set +# CONFIG_IPV6_SIT is not set +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_BLK_DEV_NBD=y +# CONFIG_INPUT_MOUSE is not set +# CONFIG_HW_RANDOM is not set +CONFIG_FB=y +CONFIG_FB_PXA=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_LOGO=y +CONFIG_SOUND=y +CONFIG_SND=y +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_PXA2XX_AC97=y diff --git a/arch/arm/configs/lpd270_defconfig b/arch/arm/configs/lpd270_defconfig deleted file mode 100644 index be58e42..0000000 --- a/arch/arm/configs/lpd270_defconfig +++ /dev/null @@ -1,56 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_ARCH_PXA=y -CONFIG_MACH_LOGICPD_PXA270=y -# CONFIG_ARM_THUMB is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200 mem=64M" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_IPV6_SIT is not set -CONFIG_MTD=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_CFI_I1 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_BLK_DEV_NBD=y -CONFIG_NETDEVICES=y -CONFIG_SMC91X=y -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -CONFIG_SOUND=y -CONFIG_SND=y -# CONFIG_SND_SUPPORT_OLD_API is not set -CONFIG_SND_PXA2XX_AC97=y -CONFIG_EXT2_FS=y -CONFIG_MSDOS_FS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_INFO=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/lubbock.config b/arch/arm/configs/lubbock.config new file mode 100644 index 0000000..e16e2ee --- /dev/null +++ b/arch/arm/configs/lubbock.config @@ -0,0 +1,11 @@ +CONFIG_ARCH_LUBBOCK=y +CONFIG_PCCARD=y +CONFIG_PCMCIA_PXA2XX=y +CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200 mem=64M" +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IPV6 is not set +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_PCMCIA_PCNET=y +CONFIG_SERIO_SA1111=y +CONFIG_USB_GADGET=y +CONFIG_USB_G_SERIAL=m diff --git a/arch/arm/configs/lubbock_defconfig b/arch/arm/configs/lubbock_defconfig deleted file mode 100644 index ca68a88..0000000 --- a/arch/arm/configs/lubbock_defconfig +++ /dev/null @@ -1,47 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_MODULES=y -CONFIG_ARCH_PXA=y -CONFIG_ARCH_LUBBOCK=y -# CONFIG_ARM_THUMB is not set -CONFIG_PCCARD=y -CONFIG_PCMCIA_PXA2XX=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200 mem=64M" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_CFI_I1 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_NETDEVICES=y -CONFIG_PCMCIA_PCNET=y -CONFIG_SMC91X=y -CONFIG_INPUT_EVDEV=y -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIO_SA1111=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_USB_GADGET=y -CONFIG_USB_G_SERIAL=m -CONFIG_EXT2_FS=y -CONFIG_MSDOS_FS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_INFO=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/mainstone.config b/arch/arm/configs/mainstone.config new file mode 100644 index 0000000..6aafb26 --- /dev/null +++ b/arch/arm/configs/mainstone.config @@ -0,0 +1,11 @@ +CONFIG_MACH_MAINSTONE=y +CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200 mem=64M" +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IPV6 is not set +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_IDE=y +# CONFIG_INPUT_MOUSE is not set +CONFIG_FB=y +CONFIG_FB_PXA=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_LOGO=y diff --git a/arch/arm/configs/pxa255-idp.config b/arch/arm/configs/pxa255-idp.config new file mode 100644 index 0000000..528f4b2 --- /dev/null +++ b/arch/arm/configs/pxa255-idp.config @@ -0,0 +1,14 @@ +CONFIG_ARCH_PXA_IDP=y +CONFIG_CMDLINE="root=/dev/nfs ip=dhcp console=ttyS0,115200 mem=64M" +CONFIG_IP_PNP_DHCP=y +# CONFIG_IPV6 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set +# CONFIG_INPUT_MOUSE is not set +CONFIG_FB=y +CONFIG_FB_PXA=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_LOGO=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y diff --git a/arch/arm/configs/pxa255-idp_defconfig b/arch/arm/configs/pxa255-idp_defconfig deleted file mode 100644 index 4d71e2e..0000000 --- a/arch/arm/configs/pxa255-idp_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_MODULES=y -CONFIG_ARCH_PXA=y -CONFIG_ARCH_PXA_IDP=y -# CONFIG_ARM_THUMB is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs ip=dhcp console=ttyS0,115200 mem=64M" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set -# CONFIG_MTD_CFI_I1 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_NETDEVICES=y -CONFIG_SMC91X=y -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -CONFIG_EXT2_FS=y -CONFIG_MSDOS_FS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_INFO=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y diff --git a/arch/arm/configs/mainstone_defconfig b/arch/arm/configs/pxa_basic1_defconfig similarity index 72% rename from arch/arm/configs/mainstone_defconfig rename to arch/arm/configs/pxa_basic1_defconfig index 73ac07d..9fffb40 100644 --- a/arch/arm/configs/mainstone_defconfig +++ b/arch/arm/configs/pxa_basic1_defconfig @@ -2,38 +2,27 @@ CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_MODULES=y CONFIG_ARCH_PXA=y -CONFIG_MACH_MAINSTONE=y # CONFIG_ARM_THUMB is not set CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200 mem=64M" CONFIG_FPE_NWFPE=y CONFIG_NET=y CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set CONFIG_MTD=y -CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_ADV_OPTIONS=y CONFIG_MTD_CFI_GEOMETRY=y # CONFIG_MTD_CFI_I1 is not set CONFIG_MTD_CFI_INTELEXT=y -CONFIG_IDE=y CONFIG_NETDEVICES=y CONFIG_SMC91X=y CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO_SERPORT is not set CONFIG_SERIAL_PXA=y CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y CONFIG_EXT2_FS=y CONFIG_MSDOS_FS=y CONFIG_JFFS2_FS=y