mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-24 23:53:02 +00:00
merge the kernel config parts at dump time, so that overrides that disable certain features work
SVN-Revision: 7812
This commit is contained in:
parent
6c4ee48f92
commit
5fe0203420
@ -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…
Reference in New Issue
Block a user