From patchwork Fri Dec 12 16:02:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 420584 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7381514009B for ; Sat, 13 Dec 2014 04:12:55 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 710B828C24A; Fri, 12 Dec 2014 18:09:27 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id D597E28C239 for ; Fri, 12 Dec 2014 18:08:29 +0100 (CET) X-policyd-weight: using cached result; rate:hard: -4.2 Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by arrakis.dune.hu (Postfix) with ESMTP for ; Fri, 12 Dec 2014 18:08:25 +0100 (CET) Received: by mail.free-electrons.com (Postfix, from userid 106) id 7362E7FC; Fri, 12 Dec 2014 18:10:11 +0100 (CET) Received: from localhost (181.123.101.84.rev.sfr.net [84.101.123.181]) by mail.free-electrons.com (Postfix) with ESMTPSA id B7DDB421; Fri, 12 Dec 2014 18:10:10 +0100 (CET) From: Maxime Ripard To: openwrt-devel@lists.openwrt.org Date: Fri, 12 Dec 2014 17:02:21 +0100 Message-Id: <1418400142-6918-4-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.2.0 In-Reply-To: <1418400142-6918-1-git-send-email-maxime.ripard@free-electrons.com> References: <1418400142-6918-1-git-send-email-maxime.ripard@free-electrons.com> Cc: Thomas Petazzoni Subject: [OpenWrt-Devel] [PATCH v4 3/4] kernel: Use defconfig instead of full fledged kernel configuration X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Rely on the Kconfig defconfig mechanism to fill all the missing options, instead of needing to set them all in the kernel configurations like what was previously done. This will allow to trim down a lot the configuration files, avoid carrying unused configuration options and preserve the developers mental health. Signed-off-by: Maxime Ripard --- include/kernel-defaults.mk | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index d6c892462359..cc03e31efab4 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -100,16 +100,24 @@ define Kernel/SetNoInitramfs echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config endef +DEFCONFIG_DIR = $(LINUX_DIR)/arch/$(LINUX_KARCH)/configs +DEFCONFIG_NAME = openwrt_defconfig + define Kernel/Configure/Default - $(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target + $(LINUX_CONF_CMD) > $(DEFCONFIG_DIR)/$(DEFCONFIG_NAME).target # copy CONFIG_KERNEL_* settings over to .config.target - awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target - echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target - echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target - echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(LINUX_DIR)/.config.target - echo "# CONFIG_KPROBES is not set" >> $(LINUX_DIR)/.config.target - $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override - $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config + awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' \ + $(TOPDIR)/.config >> $(DEFCONFIG_DIR)/$(DEFCONFIG_NAME).target + echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(DEFCONFIG_DIR)/$(DEFCONFIG_NAME).target + echo "# CONFIG_KALLSYMS_ALL is not set" >> $(DEFCONFIG_DIR)/$(DEFCONFIG_NAME).target + echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(DEFCONFIG_DIR)/$(DEFCONFIG_NAME).target + echo "# CONFIG_KPROBES is not set" >> $(DEFCONFIG_DIR)/$(DEFCONFIG_NAME).target + $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > \ + $(DEFCONFIG_DIR)/$(DEFCONFIG_NAME).override + $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(DEFCONFIG_DIR)/$(DEFCONFIG_NAME).target \ + /dev/null $(DEFCONFIG_DIR)/$(DEFCONFIG_NAME).override > \ + $(DEFCONFIG_DIR)/$(DEFCONFIG_NAME) + +$(MAKE) $(KERNEL_MAKEOPTS) $(DEFCONFIG_NAME) $(call Kernel/SetNoInitramfs) rm -rf $(KERNEL_BUILD_DIR)/modules $(_SINGLE) [ -d $(LINUX_DIR)/user_headers ] || $(MAKE) $(KERNEL_MAKEOPTS) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install