mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-01-27 15:51:07 +02:00
merge the kernel config parts at dump time, so that overrides that disable certain features work
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7812 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
03043dc1e9
commit
5ea9a24830
@ -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_DIR ?= ./config$(shell [ -d "./config-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
|
||||||
LINUX_CONFIG ?= $(LINUX_CONFIG_DIR)/default
|
LINUX_CONFIG ?= $(LINUX_CONFIG_DIR)/default
|
||||||
|
|
||||||
-include $(GENERIC_LINUX_CONFIG)
|
ifneq ($(DUMP),)
|
||||||
-include $(LINUX_CONFIG)
|
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),)
|
ifneq ($(CONFIG_ATM),)
|
||||||
FEATURES += atm
|
FEATURES += atm
|
||||||
|
Loading…
x
Reference in New Issue
Block a user