diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-04-06 14:48:55 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-06 14:48:55 +0000 |
| commit | caf4747f0c0703bcae0f90c8b4885964c2a142b3 (patch) | |
| tree | 36589b8d7516d3489de0c720df72cb0c78636bd2 /include/kernel-build.mk | |
| parent | a4e59b89b8f577e9b9cdb37596206357a467768e (diff) | |
| download | upstream-caf4747f0c0703bcae0f90c8b4885964c2a142b3.tar.gz upstream-caf4747f0c0703bcae0f90c8b4885964c2a142b3.tar.bz2 upstream-caf4747f0c0703bcae0f90c8b4885964c2a142b3.zip | |
build: clean up handling of the kernel config
- support kernel config overlays in env/
- allow overriding the target kernel config with CONFIG_TARGET=platform|subtarget|env
SVN-Revision: 26498
Diffstat (limited to 'include/kernel-build.mk')
| -rw-r--r-- | include/kernel-build.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 282dc9614f..432efd6ceb 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -89,7 +89,7 @@ define BuildKernel echo; \ ) > $$@ - $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_CONFIG) $(GENERIC_LINUX_CONFIG) $(TOPDIR)/.config + $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_KCONFIG_LIST) $(TOPDIR)/.config $(Kernel/Configure) touch $$@ @@ -114,13 +114,10 @@ define BuildKernel $(MAKE) -C image compile TARGET_BUILD= oldconfig menuconfig nconfig: $(STAMP_PREPARED) $(STAMP_CHECKED) FORCE - [ -e "$(LINUX_CONFIG)" ] || touch "$(LINUX_CONFIG)" - $(LINUX_CONFCMD) > $(LINUX_DIR)/.config - touch $(LINUX_CONFIG) + rm -f $(STAMP_CONFIGURED) + $(LINUX_RECONF_CMD) > $(LINUX_DIR)/.config $(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@ - $(SCRIPT_DIR)/kconfig.pl '>' $(if $(LINUX_SUBCONFIG),'+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG),$(GENERIC_LINUX_CONFIG)) \ - $(LINUX_DIR)/.config > $(if $(LINUX_SUBCONFIG),$(LINUX_SUBCONFIG),$(LINUX_CONFIG)) - $(Kernel/Configure) + $(LINUX_RECONF_DIFF) $(LINUX_DIR)/.config > $(LINUX_RECONFIG_TARGET) install: $(LINUX_DIR)/.image +$(MAKE) -C image compile install TARGET_BUILD= |