From patchwork Tue Dec 10 12:09:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 181118 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp5700051ile; Tue, 10 Dec 2019 04:12:49 -0800 (PST) X-Google-Smtp-Source: APXvYqx5/FHVnqsV5QN9Cz3/mdkE9HxEfMqyOZgc3PuuIo+0A1xjiSK2RuexjH9Jf656/qEb8fcl X-Received: by 2002:a05:6808:356:: with SMTP id j22mr3766981oie.130.1575979968985; Tue, 10 Dec 2019 04:12:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575979968; cv=none; d=google.com; s=arc-20160816; b=JdBXiZYzAL6E9CuVDicDVM9GLDMP7/tpuEkzrs9GXbahvix4qjJXaBHRzr5PZee1Vg hi4v0CG2VsgFzAGX0KqnAO5cNg5zCAlAe5pGLz66nehp/tt8KOsH7fa6cD++SkjNJktV 0A+GgTKCKa8iIHqx7tARbIgGD6Pm6gOeqRKEeKP83DBcKsV5b3OiVdPoTPfdbJ373Phk FiGrak4N6Ctxiika8He+8kTop11mgWogUG+dne6sOJ00mPzhyPrMUgDBsyN2bpGAjMBS fEOZ1f8mszFNDtM8Q+tG3SkPDTnkUr22wvRlEoxuyi7TTuGuXHCA/k1ePJGf6qf+hdTz gXoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from; bh=jWt0B8jxaE8tRM6lT6+EbiAWw0Ie2VqjMMMtEudtXXk=; b=FJoy7yMx36jPOR+ZXE5Lxa1G9vdWfa7LReHIMpbq4OyvkTw/HNUX98mQ8bQBbCRYlq rln/WayEAldotunj0vwmLI6ZpC6xYt1cBRahZ9xpHgLwlfxHHopzA5yMuMvcb+SSl803 lx/L9fH8TigbukOjifpsgmiCXlMQPMI2a1rzhNkoRbVsR887AlM9Fef0CmUtWQfCIDKM N6bnZtRjetP49V8pNxVN3wyVXRpk82B3bcOhwOZh5r1ESM2B2YspGwW3zmRgfebcSOkj NxY1SUldT/AXOsQhAxA/m5yFHta+mnK5Cul0aWQjS3L1dRk71YLJModxdJDdLbZ3U2bp /i7g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w7si1559998oie.196.2019.12.10.04.12.48; Tue, 10 Dec 2019 04:12:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727522AbfLJMMr (ORCPT + 27 others); Tue, 10 Dec 2019 07:12:47 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:7207 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727224AbfLJMMr (ORCPT ); Tue, 10 Dec 2019 07:12:47 -0500 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 631AA4F7801B4F2AC67B; Tue, 10 Dec 2019 20:12:45 +0800 (CST) Received: from localhost.localdomain (10.69.192.58) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.439.0; Tue, 10 Dec 2019 20:12:39 +0800 From: John Garry To: CC: , , , John Garry Subject: [PATCH] merge_config.sh: Add option for allmodconfig Date: Tue, 10 Dec 2019 20:09:14 +0800 Message-ID: <1575979754-184896-1-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Recently there has been some work in reporting and fixing bugs in booting an allmodconfig kernel - here are a few examples: https://lore.kernel.org/linux-edac/304df85b-8b56-b77e-1a11-aa23769f2e7c@huawei.com/T/#t https://lore.kernel.org/linux-ide/bdf02e03-86a1-3d35-2908-28187f504495@huawei.com/T/#t https://lore.kernel.org/netdev/CADYN=9LCPfbpwdTWKw03B22-y3Text=RWXW7XP7wJBHYsMOgrA@mail.gmail.com/ https://sourceforge.net/p/openipmi/mailman/message/36871567/ If we want to boot an allmodconfig kernel we may still want to force some loadable modules built-in, like UART drivers. Or just still turn off some configs. So add an option to add add fragments to an allmodconfig kernel. Signed-off-by: John Garry -- 2.17.1 diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 63c8565206a4..01697fb6dfbe 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -23,6 +23,7 @@ clean_up() { usage() { echo "Usage: $0 [OPTIONS] [CONFIG [...]]" echo " -h display this help text" + echo " -a use allmodconfig instead of alldefconfig" echo " -m only merge the fragments, do not execute the make command" echo " -n use allnoconfig instead of alldefconfig" echo " -r list redundant entries when merging fragments" @@ -41,6 +42,11 @@ CONFIG_PREFIX=${CONFIG_-CONFIG_} while true; do case $1 in + "-a") + ALLTARGET=allmodconfig + shift + continue + ;; "-n") ALLTARGET=allnoconfig shift @@ -171,6 +177,7 @@ fi # Use the merged file as the starting point for: # alldefconfig: Fills in any missing symbols with Kconfig default +# allmodconfig: Fills in any missing symbols with =m when loadable # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET