From 5fe020342032679a1b1a7ee84f6151a48ea00928 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 30 Jun 2007 21:49:25 +0000
Subject: [PATCH] merge the kernel config parts at dump time, so that overrides
 that disable certain features work

SVN-Revision: 7812
---
 include/kernel-build.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 83d0d5e6eb..4088422088 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -15,8 +15,13 @@ GENERIC_LINUX_CONFIG:=$(GENERIC_PLATFORM_DIR)/config-$(shell [ -f "$(GENERIC_PLA
 LINUX_CONFIG_DIR ?= ./config$(shell [ -d "./config-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
 LINUX_CONFIG ?= $(LINUX_CONFIG_DIR)/default
 
--include $(GENERIC_LINUX_CONFIG)
--include $(LINUX_CONFIG)
+ifneq ($(DUMP),)
+  TMP_CONFIG:=$(TMP_DIR)/.kconfig-$(BOARD)-$(KERNEL)
+  $(TMP_CONFIG): $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG)
+	$(SCRIPT_DIR)/config.pl + $^ > $@
+  -include $(TMP_CONFIG)
+  .SILENT: $(TMP_CONFIG)
+endif
 
 ifneq ($(CONFIG_ATM),)
   FEATURES += atm