From patchwork Tue Dec 6 12:38:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 9462487 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 255D760231 for ; Tue, 6 Dec 2016 12:45:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 19E1927CAF for ; Tue, 6 Dec 2016 12:45:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E7742838C; Tue, 6 Dec 2016 12:45:37 +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, UPPERCASE_50_75 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 DB0F227CAF for ; Tue, 6 Dec 2016 12:45:35 +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 1cEF5y-0005Wu-8q; Tue, 06 Dec 2016 12:43:42 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEF2d-0001WD-Rf for linux-arm-kernel@lists.infradead.org; Tue, 06 Dec 2016 12:40:20 +0000 Received: from epcpsbgm1new.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OHR00CUWKIMU3B0@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 06 Dec 2016 21:40:01 +0900 (KST) X-AuditID: cbfee61a-f79916d0000062de-1b-5846b1a107a9 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 68.B4.25310.1A1B6485; Tue, 6 Dec 2016 21:40:01 +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:40:01 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 04/23] arm: use kconfig fragments for ARCH_ASPEED defconfigs Date: Tue, 06 Dec 2016 13:38:39 +0100 Message-id: <1481027938-31831-5-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+NgFvrPLMWRmVeSWpSXmKPExsVy+t9jAd2FG90iDE5tsrD4O+kYu8XGGetZ LY5feMVucejybCaLTY+vsVpc3jWHzeL2ZV6LU9c/szlweLQ097B5/P41idFj56y77B6bl9R7 XDnRxOrRt2UVo8e2Q5wenzfJBXBEudlkpCampBYppOYl56dk5qXbKoWGuOlaKCnkJeam2ipF 6PqGBCkplCXmlAJ5RgZowME5wD1YSd8uwS2jafFttoIJwRVnZ3azNjCe8+hi5OSQEDCRaD6+ lhnCFpO4cG89WxcjF4eQwFJGiXdbD7JCOL8YJSa1X2AHqWITsJKY2L6KEcQWEdCQmNL1mB2k iFngBaPEr3Vb2UASwgIBEv0r9oGNZRFQlXi+YwYriM0r4CExefV/qHVyEiePTQaLcwp4Slzf sgZsqBBQzc6r39knMPIuYGRYxSiRWpBcUJyUnmuYl1quV5yYW1yal66XnJ+7iREc+M+kdjAe 3OV+iFGAg1GJh/dDg2uEEGtiWXFl7iFGCQ5mJRHe9RvcIoR4UxIrq1KL8uOLSnNSiw8xmgId NpFZSjQ5HxiVeSXxhibmJubGBhbmlpYmRkrivI2zn4ULCaQnlqRmp6YWpBbB9DFxcEo1MIrx lHXdfhYnMfV4QVjTq2myV7ffUTOyCj60Tt/Z6oj/dsmNvzbzZ1zS/xH099szzoBlrZtuioa7 XrqgNLP+/82UQ/37/UyTly0OXH517QmLzt2PDxU9z3uwJif2RtuygwLbvT9OecvjvCx0YfX6 pcsuP/o81eaLumPQ9y3vy+xvzJKzn6AvKfJfiaU4I9FQi7moOBEAwjX0kpICAAA= X-MTR: 20000000000000000@CPGS X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161206_044016_210271_9564CDC0 X-CRM114-Status: GOOD ( 14.43 ) 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, Greg Ungerer , Olof Johansson , Cyril Bur 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 [acs5k,acs5k_tiny,ks8695]_defconfig-s with a Makefile target using merge_config. The patch was verified with doing: $ make [acs5k,acs5k_tiny,ks8695]_defconfig $ make savedefconfig and comparing resulting defconfig files (before/after the patch). Cc: Greg Ungerer Cc: Cyril Bur Signed-off-by: Bartlomiej Zolnierkiewicz --- arch/arm/Makefile | 12 ++++ arch/arm/configs/acs5k.config | 32 ++++++++++ arch/arm/configs/acs5k_defconfig | 74 ---------------------- arch/arm/configs/acs5k_tiny.config | 24 +++++++ arch/arm/configs/acs5k_tiny_defconfig | 66 ------------------- arch/arm/configs/ks8695.config | 21 ++++++ .../{ks8695_defconfig => ks8695_basic_defconfig} | 21 ------ 7 files changed, 89 insertions(+), 161 deletions(-) create mode 100644 arch/arm/configs/acs5k.config delete mode 100644 arch/arm/configs/acs5k_defconfig create mode 100644 arch/arm/configs/acs5k_tiny.config delete mode 100644 arch/arm/configs/acs5k_tiny_defconfig create mode 100644 arch/arm/configs/ks8695.config rename arch/arm/configs/{ks8695_defconfig => ks8695_basic_defconfig} (67%) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index abe8a60..91eab72b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -362,6 +362,18 @@ PHONY += aspeed_g5_defconfig aspeed_g5_defconfig: $(call merge_into_defconfig,aspeed_basic_defconfig,aspeed_g5) +PHONY += acs5k_defconfig +acs5k_defconfig: + $(call merge_into_defconfig,ks8695_basic_defconfig,acs5k) + +PHONY += acs5k_tiny_defconfig +acs5k_tiny_defconfig: + $(call merge_into_defconfig,ks8695_basic_defconfig,acs5k_tiny) + +PHONY += ks8695_defconfig +ks8695_defconfig: + $(call merge_into_defconfig,ks8695_basic_defconfig,ks8695) + PHONY += vdso_install vdso_install: ifeq ($(CONFIG_VDSO),y) diff --git a/arch/arm/configs/acs5k.config b/arch/arm/configs/acs5k.config new file mode 100644 index 0000000..eb8c70e --- /dev/null +++ b/arch/arm/configs/acs5k.config @@ -0,0 +1,32 @@ +CONFIG_POSIX_MQUEUE=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_MACH_KS8695=y +CONFIG_MACH_DSM320=y +CONFIG_MACH_ACS5K=y +CONFIG_PCI=y +CONFIG_PCI_DEBUG=y +CONFIG_PCCARD=y +CONFIG_YENTA=y +CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev/ram0 rw" +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_ARM_KS8695_ETHER=y +CONFIG_PRISM54=m +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_GPIO=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_PCA953X=y +CONFIG_WATCHDOG=y +CONFIG_KS8695_WATCHDOG=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_PCF8563=y +CONFIG_EXT2_FS=y +CONFIG_CRAMFS=y +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y +CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/acs5k_defconfig b/arch/arm/configs/acs5k_defconfig deleted file mode 100644 index 8840d2c..0000000 --- a/arch/arm/configs/acs5k_defconfig +++ /dev/null @@ -1,74 +0,0 @@ -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_KS8695=y -CONFIG_MACH_KS8695=y -CONFIG_MACH_DSM320=y -CONFIG_MACH_ACS5K=y -# CONFIG_ARM_THUMB is not set -CONFIG_PCI=y -CONFIG_PCI_DEBUG=y -CONFIG_PCCARD=y -CONFIG_YENTA=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev/ram0 rw" -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_NETDEVICES=y -CONFIG_ARM_KS8695_ETHER=y -CONFIG_PRISM54=m -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_KS8695=y -CONFIG_SERIAL_KS8695_CONSOLE=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_PCA953X=y -CONFIG_WATCHDOG=y -CONFIG_KS8695_WATCHDOG=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PCF8563=y -CONFIG_EXT2_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_RUBIN=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_MUTEXES=y -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/acs5k_tiny.config b/arch/arm/configs/acs5k_tiny.config new file mode 100644 index 0000000..7d913e3 --- /dev/null +++ b/arch/arm/configs/acs5k_tiny.config @@ -0,0 +1,24 @@ +CONFIG_POSIX_MQUEUE=y +CONFIG_MACH_ACS5K=y +CONFIG_CMDLINE="console=ttyAM0,115200 init=/bin/sh" +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_AMDSTD=y +# CONFIG_BLK_DEV is not set +CONFIG_ARM_KS8695_ETHER=y +# CONFIG_HW_RANDOM is not set +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_GPIO=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_PCA953X=y +# CONFIG_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_KS8695_WATCHDOG=y +# CONFIG_USB_SUPPORT is not set +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_PCF8563=y +CONFIG_SQUASHFS=y +# CONFIG_NETWORK_FILESYSTEMS is not set diff --git a/arch/arm/configs/acs5k_tiny_defconfig b/arch/arm/configs/acs5k_tiny_defconfig deleted file mode 100644 index a8e115c..0000000 --- a/arch/arm/configs/acs5k_tiny_defconfig +++ /dev/null @@ -1,66 +0,0 @@ -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_KS8695=y -CONFIG_MACH_ACS5K=y -# CONFIG_ARM_THUMB is not set -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyAM0,115200 init=/bin/sh" -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -# CONFIG_BLK_DEV is not set -CONFIG_NETDEVICES=y -CONFIG_ARM_KS8695_ETHER=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_KS8695=y -CONFIG_SERIAL_KS8695_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_PCA953X=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_KS8695_WATCHDOG=y -# CONFIG_USB_SUPPORT is not set -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PCF8563=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_RUBIN=y -CONFIG_SQUASHFS=y -# CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_MUTEXES=y -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y diff --git a/arch/arm/configs/ks8695.config b/arch/arm/configs/ks8695.config new file mode 100644 index 0000000..58b6577 --- /dev/null +++ b/arch/arm/configs/ks8695.config @@ -0,0 +1,21 @@ +CONFIG_BLK_DEV_INITRD=y +CONFIG_MACH_KS8695=y +CONFIG_MACH_DSM320=y +CONFIG_PCI=y +CONFIG_PCI_DEBUG=y +CONFIG_PCCARD=y +CONFIG_YENTA=y +CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev/ram0 rw" +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_PRISM54=m +# CONFIG_HWMON is not set +CONFIG_EXT2_FS=y +CONFIG_CRAMFS=y +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y +CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/ks8695_defconfig b/arch/arm/configs/ks8695_basic_defconfig similarity index 67% rename from arch/arm/configs/ks8695_defconfig rename to arch/arm/configs/ks8695_basic_defconfig index b5ef2b4..c9ee223 100644 --- a/arch/arm/configs/ks8695_defconfig +++ b/arch/arm/configs/ks8695_basic_defconfig @@ -1,7 +1,6 @@ # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y @@ -9,55 +8,35 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_KS8695=y -CONFIG_MACH_KS8695=y -CONFIG_MACH_DSM320=y # CONFIG_ARM_THUMB is not set -CONFIG_PCI=y -CONFIG_PCI_DEBUG=y -CONFIG_PCCARD=y -CONFIG_YENTA=y CONFIG_AEABI=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev/ram0 rw" CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_MTD=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_PHYSMAP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_NETDEVICES=y -CONFIG_PRISM54=m # CONFIG_INPUT_MOUSEDEV_PSAUX is not set # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set CONFIG_SERIAL_KS8695=y CONFIG_SERIAL_KS8695_CONSOLE=y -# CONFIG_HWMON is not set -CONFIG_EXT2_FS=y CONFIG_TMPFS=y CONFIG_JFFS2_FS=y CONFIG_JFFS2_SUMMARY=y CONFIG_JFFS2_COMPRESSION_OPTIONS=y CONFIG_JFFS2_RUBIN=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_MUTEXES=y # CONFIG_FTRACE is not set CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y