From patchwork Tue Dec 6 12:38:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 9462469 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 14F6E60231 for ; Tue, 6 Dec 2016 12:43:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A08327CAF for ; Tue, 6 Dec 2016 12:43:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F24B12838D; Tue, 6 Dec 2016 12:43:04 +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 73E9127CAF for ; Tue, 6 Dec 2016 12:43:04 +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 1cEF3n-0003dl-MG; Tue, 06 Dec 2016 12:41:27 +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 1cEF2W-0001WD-Ix for linux-arm-kernel@lists.infradead.org; Tue, 06 Dec 2016 12:40:11 +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 <0OHR00GS1KI72SA0@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 06 Dec 2016 21:39:45 +0900 (KST) X-AuditID: cbfee61a-f79916d0000062de-02-5846b191985d Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 45.B4.25310.191B6485; Tue, 6 Dec 2016 21:39:45 +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:39:45 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 02/23] arm: use kconfig fragments for ARCH_ASPEED defconfigs Date: Tue, 06 Dec 2016 13:38:37 +0100 Message-id: <1481027938-31831-3-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+NgFvrNLMWRmVeSWpSXmKPExsVy+t9jAd2JG90iDJYsVLT4O+kYu8XGGetZ LY5feMVu8fv8X2aLTY+vsVpc3jWHzeL2ZV6LU9c/szlweLQ097B5/P41idFj56y77B4XPx5j 9ti8pN7jyokmVo++LasYPT5vkgvgiHKzyUhNTEktUkjNS85PycxLt1UKDXHTtVBSyEvMTbVV itD1DQlSUihLzCkF8owM0ICDc4B7sJK+XYJbxpl5UQUfNCsuzP3P2sA4V6WLkYNDQsBEonlH aBcjJ5ApJnHh3nq2LkYuDiGBpYwS9383sIMkhAR+MUo8X2kFYrMJWElMbF/FCGKLCGhITOl6 zA4yh1ngGaPExXqQsLBAgMSzhb1grSwCqhJbdvxjBbF5BTwkni9bxwaxS07i5LHJYHFOAU+J 61vWMEKs8pDYefU7+wRG3gWMDKsYJVILkguKk9JzDfNSy/WKE3OLS/PS9ZLzczcxggP+mdQO xoO73A8xCnAwKvHwfmhwjRBiTSwrrsw9xCjBwawkwrt+g1uEEG9KYmVValF+fFFpTmrxIUZT oMMmMkuJJucDozGvJN7QxNzE3NjAwtzS0sRISZy3cfazcCGB9MSS1OzU1ILUIpg+Jg5OqQZG 5qs+nusLnXqCVnFPS/pT4CbZ1WYpEd4qkCJ1U3ZR/fzJAresrRRsLk1YNlErU9+vdFfMhbL8 irjbAs6ifsJ1EmeeKF0+5/df6LbMhR8n/H23H7JjMsriN5xzluFkZYaX/tb67bfj5Htel+fY 7/IpFeLk5+lkuvzSzNGKc1+mV5+7IKvsdiWW4oxEQy3mouJEAOFsfAeOAgAA X-MTR: 20000000000000000@CPGS X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161206_044009_037325_B1B81919 X-CRM114-Status: GOOD ( 15.52 ) 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, Joel Stanley , 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 aspeed_g[45]_defconfig with a Makefile target using merge_config. The patch was verified by doing: $ make aspeed_g[45]_defconfig $ make savedefconfig and comparing resulting defconfig files (before/after the patch). Cc: Joel Stanley Cc: Cyril Bur Signed-off-by: Bartlomiej Zolnierkiewicz --- arch/arm/Makefile | 8 ++ ...{aspeed_g4_defconfig => aspeed_basic_defconfig} | 1 - arch/arm/configs/aspeed_g4.config | 1 + arch/arm/configs/aspeed_g5.config | 3 + arch/arm/configs/aspeed_g5_defconfig | 88 ---------------------- 5 files changed, 12 insertions(+), 89 deletions(-) rename arch/arm/configs/{aspeed_g4_defconfig => aspeed_basic_defconfig} (98%) create mode 100644 arch/arm/configs/aspeed_g4.config create mode 100644 arch/arm/configs/aspeed_g5.config delete mode 100644 arch/arm/configs/aspeed_g5_defconfig diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f2c0683..abe8a60 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -354,6 +354,14 @@ define merge_into_defconfig +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig endef +PHONY += aspeed_g4_defconfig +aspeed_g4_defconfig: + $(call merge_into_defconfig,aspeed_basic_defconfig,aspeed_g4) + +PHONY += aspeed_g5_defconfig +aspeed_g5_defconfig: + $(call merge_into_defconfig,aspeed_basic_defconfig,aspeed_g5) + PHONY += vdso_install vdso_install: ifeq ($(CONFIG_VDSO),y) diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_basic_defconfig similarity index 98% rename from arch/arm/configs/aspeed_g4_defconfig rename to arch/arm/configs/aspeed_basic_defconfig index ca39c04..0846e85 100644 --- a/arch/arm/configs/aspeed_g4_defconfig +++ b/arch/arm/configs/aspeed_basic_defconfig @@ -24,7 +24,6 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_BLOCK is not set # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_ASPEED=y -CONFIG_MACH_ASPEED_G4=y CONFIG_DEBUG_RODATA=y CONFIG_AEABI=y CONFIG_UACCESS_WITH_MEMCPY=y diff --git a/arch/arm/configs/aspeed_g4.config b/arch/arm/configs/aspeed_g4.config new file mode 100644 index 0000000..d9586c5 --- /dev/null +++ b/arch/arm/configs/aspeed_g4.config @@ -0,0 +1 @@ +CONFIG_MACH_ASPEED_G4=y diff --git a/arch/arm/configs/aspeed_g5.config b/arch/arm/configs/aspeed_g5.config new file mode 100644 index 0000000..7ca5bc1 --- /dev/null +++ b/arch/arm/configs/aspeed_g5.config @@ -0,0 +1,3 @@ +CONFIG_ARCH_MULTI_V6=y +CONFIG_MACH_ASPEED_G5=y +CONFIG_UBSAN_ALIGNMENT=y diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig deleted file mode 100644 index 4f366b0..0000000 --- a/arch/arm/configs/aspeed_g5_defconfig +++ /dev/null @@ -1,88 +0,0 @@ -CONFIG_KERNEL_XZ=y -CONFIG_SYSVIPC=y -CONFIG_USELIB=y -CONFIG_IRQ_DOMAIN_DEBUG=y -CONFIG_NO_HZ_IDLE=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_CGROUPS=y -CONFIG_BLK_DEV_INITRD=y -# CONFIG_RD_BZIP2 is not set -# CONFIG_RD_LZMA is not set -# CONFIG_RD_LZO is not set -# CONFIG_RD_LZ4 is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_BPF_SYSCALL=y -# CONFIG_SHMEM is not set -# CONFIG_AIO is not set -CONFIG_EMBEDDED=y -# CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y -CONFIG_CC_STACKPROTECTOR_STRONG=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLOCK is not set -CONFIG_ARCH_MULTI_V6=y -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_ARCH_ASPEED=y -CONFIG_MACH_ASPEED_G5=y -CONFIG_DEBUG_RODATA=y -CONFIG_AEABI=y -CONFIG_UACCESS_WITH_MEMCPY=y -CONFIG_SECCOMP=y -# CONFIG_ATAGS is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ARM_APPENDED_DTB=y -CONFIG_ARM_ATAG_DTB_COMPAT=y -CONFIG_KEXEC=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -# CONFIG_INPUT is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -# CONFIG_LEGACY_PTYS is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=6 -CONFIG_SERIAL_8250_RUNTIME_UARTS=6 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_HW_RANDOM is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_IOMMU_SUPPORT is not set -CONFIG_FIRMWARE_MEMMAP=y -CONFIG_FANOTIFY=y -CONFIG_PRINTK_TIME=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_STRIP_ASM_SYMS=y -CONFIG_PAGE_POISONING=y -CONFIG_DEBUG_KMEMLEAK=y -CONFIG_DEBUG_SHIRQ=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_WQ_WATCHDOG=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_SCHED_STACK_END_CHECK=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y -# CONFIG_FTRACE is not set -CONFIG_MEMTEST=y -CONFIG_UBSAN=y -CONFIG_UBSAN_ALIGNMENT=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -CONFIG_DEBUG_LL_UART_8250=y -CONFIG_DEBUG_UART_PHYS=0x1e784000 -CONFIG_DEBUG_UART_VIRT=0xe8784000 -CONFIG_EARLY_PRINTK=y -CONFIG_DEBUG_SET_MODULE_RONX=y -# CONFIG_XZ_DEC_X86 is not set -# CONFIG_XZ_DEC_POWERPC is not set -# CONFIG_XZ_DEC_IA64 is not set -# CONFIG_XZ_DEC_SPARC is not set