Add supporg for nls-iso8859-2 (#2123)

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

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 4088422..7a02d55 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -23,9 +23,6 @@ ifneq ($(DUMP),)
   .SILENT: $(TMP_CONFIG)
 endif
 
   .SILENT: $(TMP_CONFIG)
 endif
 

-ifneq ($(CONFIG_ATM),)
-  FEATURES += atm
-endif

 ifneq ($(CONFIG_PCI),)
   FEATURES += pci
 endif
 ifneq ($(CONFIG_PCI),)
   FEATURES += pci
 endif


@@ -35,9 +32,6 @@ endif
 ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),)
   FEATURES += pcmcia
 endif
 ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),)
   FEATURES += pcmcia
 endif

-ifneq ($(CONFIG_VIDEO_DEV),)
-  FEATURES += video
-endif

 
 # remove duplicates
 FEATURES:=$(sort $(FEATURES))
 
 # remove duplicates
 FEATURES:=$(sort $(FEATURES))


@@ -98,15 +92,15 @@ define BuildKernel
        $(call Kernel/Prepare)
        touch $$@
 
        $(call Kernel/Prepare)
        touch $$@
 

-  $(STAMP_CONFIGURED): $(LINUX_DIR)/.prepared $(LINUX_CONFIG)
+  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_CONFIG) $(GENERIC_LINUX_CONFIG) $(TOPDIR)/.config

        $(call Kernel/Configure)
        touch $$@
 
        $(call Kernel/Configure)
        touch $$@
 

-  $(LINUX_DIR)/.modules: $(LINUX_DIR)/.configured $(LINUX_DIR)/.config FORCE
+  $(LINUX_DIR)/.modules: $(STAMP_CONFIGURED) $(LINUX_DIR)/.config FORCE

        $(call Kernel/CompileModules)
        touch $$@
 
        $(call Kernel/CompileModules)
        touch $$@
 

-  $(LINUX_DIR)/.image: $(LINUX_DIR)/.configured FORCE
+  $(LINUX_DIR)/.image: $(STAMP_CONFIGURED) FORCE

        $(call Kernel/CompileImage)
        touch $$@
        
        $(call Kernel/CompileImage)
        touch $$@
        


@@ -169,12 +163,12 @@ endef
 $(eval $(call shexport,Target/Description))
 
 download: $(DL_DIR)/$(LINUX_SOURCE)
 $(eval $(call shexport,Target/Description))
 
 download: $(DL_DIR)/$(LINUX_SOURCE)

-prepare: $(LINUX_DIR)/.configured
+prepare: $(STAMP_CONFIGURED)

 compile: $(LINUX_DIR)/.modules
 compile: $(LINUX_DIR)/.modules

-menuconfig: $(LINUX_DIR)/.prepared FORCE
+oldconfig menuconfig: $(STAMP_PREPARED) FORCE

        $(call Kernel/Configure)
        $(SCRIPT_DIR)/config.pl '+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG) > $(LINUX_DIR)/.config
        $(call Kernel/Configure)
        $(SCRIPT_DIR)/config.pl '+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG) > $(LINUX_DIR)/.config

-       $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) menuconfig
+       $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $@

        $(SCRIPT_DIR)/config.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG)
 
 install: $(LINUX_DIR)/.image
        $(SCRIPT_DIR)/config.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG)
 
 install: $(LINUX_DIR)/.image