always include kernel config for kernel packages

[openwrt/svn-archive/archive.git] / include / kernel-build.mk

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 96fb7fa47b3cb2950dc0ef99f8d94c62ff5349d8..8750bb4fd52487b98dfb6d24cabb7ddbc749cf7a 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -11,6 +11,8 @@ include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/prereq.mk
 
+override MAKEFLAGS=
+
 GENERIC_LINUX_CONFIG:=$(GENERIC_PLATFORM_DIR)/config-$(shell [ -f "$(GENERIC_PLATFORM_DIR)/config-$(KERNEL_PATCHVER)" ] && echo "$(KERNEL_PATCHVER)" || echo template ) 
 LINUX_CONFIG_DIR ?= ./config$(shell [ -d "./config-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
 LINUX_CONFIG ?= $(LINUX_CONFIG_DIR)/default
@@ -23,9 +25,6 @@ ifneq ($(DUMP),)
   .SILENT: $(TMP_CONFIG)
 endif
 
-ifneq ($(CONFIG_ATM),)
-  FEATURES += atm
-endif
 ifneq ($(CONFIG_PCI),)
   FEATURES += pci
 endif
@@ -35,9 +34,6 @@ endif
 ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),)
   FEATURES += pcmcia
 endif
-ifneq ($(CONFIG_VIDEO_DEV),)
-  FEATURES += video
-endif
 
 # remove duplicates
 FEATURES:=$(sort $(FEATURES))
@@ -171,6 +167,8 @@ $(eval $(call shexport,Target/Description))
 download: $(DL_DIR)/$(LINUX_SOURCE)
 prepare: $(STAMP_CONFIGURED)
 compile: $(LINUX_DIR)/.modules
+       $(MAKE) -C image compile
+
 oldconfig menuconfig: $(STAMP_PREPARED) FORCE
        $(call Kernel/Configure)
        $(SCRIPT_DIR)/config.pl '+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG) > $(LINUX_DIR)/.config
@@ -178,6 +176,7 @@ oldconfig menuconfig: $(STAMP_PREPARED) FORCE
        $(SCRIPT_DIR)/config.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG)
 
 install: $(LINUX_DIR)/.image
+       $(MAKE) -C image compile install
 
 clean: FORCE
        rm -f $(STAMP_DIR)/.linux-compile
@@ -190,4 +189,7 @@ rebuild: FORCE
        fi
        @$(MAKE) compile
 
+image-prereq:
+       $(SUBMAKE) -s -C image prereq
 
+prereq: image-prereq