merge the kernel config parts at dump time, so that overrides that disable certain...

SVN-Revision: 7812

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 83d0d5e6ebffbe12856db6c55cb66d30c89cf995..40884220883c371fdc2d351b1a2094b22f3b0531 100644 (file)
--- 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
 
 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
 
 ifneq ($(CONFIG_ATM),)
   FEATURES += atm