From patchwork Wed Jul 26 14:52:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 126445 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp479117vqo; Wed, 26 Jul 2023 08:26:23 -0700 (PDT) X-Google-Smtp-Source: APBJJlG2p6GNRe3jx+P3fQJmVaWXPxDl3WfFlQDO2ttOTvB5Pu5XV4eBPO3wHc6p8XCs4t+Vvlix X-Received: by 2002:a19:3857:0:b0:4fb:8eec:ce47 with SMTP id d23-20020a193857000000b004fb8eecce47mr1655728lfj.58.1690385183547; Wed, 26 Jul 2023 08:26:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690385183; cv=none; d=google.com; s=arc-20160816; b=Phqt8WzUALPHkAuPsqG1qeVmLxPkoR8+/3MSU0MiuWTRJcRj7S9PPhDqdoUJeDrcLN I6NB44eO8UGJUNGHoR/pjvc+COxMByyO6aEuGCsx42ilohYC/Jk3hNHdyykyI6D46qlm m6VkoW63qHH1g6jRonfIbQSm4EInCDBdDAP/znI6sYlUfBV5EcaMKC3+OOJWAQxOjdGz Fi5pnDtdV9uNpedKNYYYXNfX15SJx9zhO8rRN8JSrt+1qWZDAWeEu/sTNxBgGAhRdQOR R2wyjFgAR/jsslTj5h6pmEGhgl96fIQoDAWhAVDDLfJbw84xnxweLwokoF2tHkPmxzwn qQ9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=47UW8CKJ47dXPy6gpwt7KpvWQ+J4mj2CYkzzsci72oI=; fh=+UJGAEU2Zd20Ffzlyw2DOtwfBiThnaWweXJeIpZW2cQ=; b=KKUYUuBGOczE9vPWkYAwkviXQ3e9RFuSyvkXVYwZxZZq3W8MWd6kjUtwDzG3OeSFTU lohsgg5sMwATap7UHab95RpZGfAM5/N6nrXfVBx+DKCSnWjisuxhFdX79M8CXPnDdL+m c9QeCyzR0CaIijDypNbidWV9xFK68nrI4geGd1B1WHbMmhyIdv6SzjP+Wt3E74RxgzTW gpbP17l/KCBdZTDTzaXsEqtW5QTbboCQso/TuPHks/4VX2meVVgJ1Ir1nesdREh397OK LAzwF+Rec1EVLvOcmpfb39pW3fXVKvwzCwl76pL1/oa6k6ucWViE1pN1XtnmzbRo9AAh jPxA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d1-20020a05640208c100b0052229b7741fsi4941965edz.424.2023.07.26.08.25.57; Wed, 26 Jul 2023 08:26:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233951AbjGZOxc (ORCPT + 99 others); Wed, 26 Jul 2023 10:53:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233896AbjGZOxa (ORCPT ); Wed, 26 Jul 2023 10:53:30 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.54.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5C181FDD; Wed, 26 Jul 2023 07:53:27 -0700 (PDT) X-QQ-mid: bizesmtp81t1690383196tg3gh1y1 Received: from linux-lab-host.localdomain ( [61.141.78.189]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 26 Jul 2023 22:53:15 +0800 (CST) X-QQ-SSF: 01200000000000D0X000000A0000000 X-QQ-FEAT: CR3LFp2JE4lR8uPfZDf/0uFir0EsUHKoIwJEyr/UBQkcQtyYyGJy+e/6T2bhl ZIJRDpqjWmsEvMhs7TxXstjU/eRcQx+Luc8vn+wo2GlERyOOmhZlkyrA7rCWWu3ysV3Hh5I UU8ha4Ud4zqLREeTs0H1/xM7MXjt6HsVs81LVJLtY2KyZHbiem9ohokvXd/i211/VBPrP9F +OdRuATSNtWxecawtfJb6H179BBcc4xS9yMDAQDYKlW6aCjNfYy7J7++YZUSNun3rXu7aI5 2gfuXzzAhcprbvxAynbM0fN2eK83hWvon+GU4BHxvbIQ6kWPxNEphh0+vHGVPyK7sIz4tGR /Z3y5Wyeb+QS2e8Ly474VQH5TNpPj+voCBKRn8SmHq7xm11eXgdQb+pSzN3dXzON9v0UGrj X-QQ-GoodBg: 0 X-BIZMAIL-ID: 13127243865508606372 From: Zhangjin Wu To: w@1wt.eu Cc: falcon@tinylab.org, arnd@arndb.de, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, thomas@t-8ch.de, =?utf-8?q?Thomas_Wei?= =?utf-8?q?=C3=9Fschuh?= Subject: [PATCH v2 3/7] selftests/nolibc: add extra configs customize support Date: Wed, 26 Jul 2023 22:52:56 +0800 Message-Id: <06d7db26484ca13e583ddad43af1bc0e4a99674f.1690373704.git.falcon@tinylab.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrgz:qybglogicsvrgz5a-1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772497334083470839 X-GMAIL-MSGID: 1772497334083470839 The default DEFCONFIG_ may not always work for all architectures, some architectures require to add extra kernel config options, this allows to add extra options in the defconfig target. It allows to customize extra kernel config options via the common common.config and the architecture specific .config, at last trigger 'allnoconfig' to let them take effect with missing config options as disabled. The scripts/kconfig/merge_config.sh tool is used to merge the extra config files. Suggested-by: Thomas Weißschuh Link: https://lore.kernel.org/lkml/67eb70d4-c9ff-4afc-bac7-7f36cc2c81bc@t-8ch.de/ Reviewed-by: Thomas Weißschuh Signed-off-by: Zhangjin Wu --- tools/testing/selftests/nolibc/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index f42adef87e12..9576f1a0a98d 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -39,6 +39,9 @@ DEFCONFIG_s390 = defconfig DEFCONFIG_loongarch = defconfig DEFCONFIG = $(DEFCONFIG_$(ARCH)) +# extra kernel config files under configs/, include common + architecture specific +EXTCONFIG = common.config $(ARCH).config + # optional tests to run (default = all) TEST = @@ -161,6 +164,8 @@ initramfs: nolibc-test defconfig: $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) mrproper $(DEFCONFIG) prepare + $(Q)$(srctree)/scripts/kconfig/merge_config.sh -O "$(srctree)" -m "$(srctree)/.config" $(foreach c,$(EXTCONFIG),$(wildcard $(CURDIR)/configs/$c)) + $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) KCONFIG_ALLCONFIG="$(srctree)/.config" allnoconfig kernel: initramfs $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) CONFIG_INITRAMFS_SOURCE=$(CURDIR)/initramfs