From patchwork Mon Jul 4 14:25:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9212749 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 E20FB60467 for ; Mon, 4 Jul 2016 14:23:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D40CB2871D for ; Mon, 4 Jul 2016 14:23:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C88ED28720; Mon, 4 Jul 2016 14:23:35 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7EF62871D for ; Mon, 4 Jul 2016 14:23:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750935AbcGDOXe (ORCPT ); Mon, 4 Jul 2016 10:23:34 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:52842 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750713AbcGDOXd (ORCPT ); Mon, 4 Jul 2016 10:23:33 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MVd8x-1annSD2YT1-00Z2zK; Mon, 04 Jul 2016 16:23:10 +0200 From: Arnd Bergmann To: Michal Marek , "Yann E. MORIN" Cc: Masahiro Yamada , Josh Triplett , Darren Hart , linux-kbuild@vger.kernel.org, kernel-build-reports@lists.linaro.org, Arnd Bergmann , Michal Marek , Thiago Macieira , linux-kernel@vger.kernel.org Subject: [PATCH] [RFC] Kbuild: avoid "make tinyconfig" warnings Date: Mon, 4 Jul 2016 16:25:55 +0200 Message-Id: <20160704142608.2069991-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:YBMhHty7zaH0tK9GKBcDrbv7Zpiu2g/uVufnXDupoLiiXowBgp5 kkBD8E2jyChLJbBat1OB/Fnz79VX4UXhpudp58ORq11Hz1a1LvEKKDduukhYarO5dMO5pbc hZHj3LGLEalXMeKGUJaCCCXN30uiSrotc3qivwp1yBl1TY9k3SSElS9STkvzbc2TwS+IteL 1H6/7VIyUjFow/24RiX1w== X-UI-Out-Filterresults: notjunk:1; V01:K0:JNzovY4syn4=:cdOxUrJIoOrPHslJc/+oS9 gNFrqHJjtmS/rYYdRVnIxio3BkHkkphO0EnG86GJlvCAay8KrlxjhbY7QBH3M2Muo+g6rhamu jVOS0bHQXdrGpMq5dsdAwsJ7BQIIyD6aCwpE06NOYCAM52CtR8UKmLY2L3rhUKQ2mTE2Ganch FLQoDTvOhzhEl1Qv80MM9v0aQINSyzwKhq4kIszXZnGqNXB/gN3+gsxCJZbF7RyHjmR67MDVZ UtzXonpAGCizRXHL5TzkkTz/49Gz8e1LIJdRvucDyQz2Y0Aq/N8v4/RimqQMNoqkmdDQ4H3rw Pi+++AUErHOj1mxp3ivA04Khnu5PcnnzMk1MzQdVqRuN8htYzYMRoaaiVRsjxkDRV0uYhgipD +NCfx6Q/kujJZbMApkRwjCuPAQO13RoA9zNsbDD6jaMJpdwCMiER/c9SlxSe/jFPirbPNgJdY cbs/IeT/oJBC3WbHFnm7LHGgd8ukeKR8MJ/pbUsfWPqlmHXgR/mduPBz61okh0X4OLs1C99E/ m4XV2swTDANA7d2fU89OzWRraOE9hcIJ/vYogyBcpKVtwOl99A7N6zwSgXdZIBUw1Wxp6lRgE j/98JCDbw0wSM1qB8uWmcgh0OQgx9tIC+c63d908BkTgQqzVvG3Bv3i5/Ux28FMi6dgZI8uH4 ScK0OabIMpq1ep543iR9NV6FigRh0B3qDjF3DJXp/bM7Apwisb18fCmW7qlGAC0zDrV4= Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The introduction of "make *.config" as a shorthand for merging configuration files unfortunately introduced some build warnings that we see in every single run of the various build bots testing tinyconfig: .config:966:warning: override: NOHIGHMEM changes choice state .config:965:warning: override: SLOB changes choice state .config:963:warning: override: KERNEL_XZ changes choice state .config:962:warning: override: CC_OPTIMIZE_FOR_SIZE changes choice state .config:933:warning: override: SLOB changes choice state .config:930:warning: override: CC_OPTIMIZE_FOR_SIZE changes choice state .config:870:warning: override: SLOB changes choice state .config:868:warning: override: KERNEL_XZ changes choice state .config:867:warning: override: CC_OPTIMIZE_FOR_SIZE changes choice state This changes the behavior for tinyconfig again, so we call the special allnoconfig target directly, with the fragment as the KCONFIG_ALLCONFIG file so it gets merged into the configuration. The disadvantage of this approach is that we cannot pass another KCONFIG_ALLCONFIG on the command line, that would again have to be done using the mergeconfig script afterwards. Signed-off-by: Arnd Bergmann Fixes: 63a91033d52e ("kbuild: add generic mergeconfig target, %.config") Link: https://storage.kernelci.org/mainline/v4.7-rc6/x86-tinyconfig/build.log Reviewed-by: Josh Triplett --- scripts/kconfig/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index ebced77deb9c..35d0e191fe3f 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -125,8 +125,8 @@ xenconfig: xen.config @: PHONY += tinyconfig -tinyconfig: - $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config +tinyconfig: $(obj)/conf + $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig KCONFIG_ALLCONFIG=$(wildcard $(srctree)/kernel/configs/tiny.config $(srctree)/arch/$(SRCARCH)/configs/tiny.config) # Help text used by make help help: