usb fixes and performance enhancements

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

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 942a915..38ea9a1 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -19,9 +19,6 @@ INSTALL_TARGETS += $(KERNEL_IPKG)
 
 $(TARGETS): $(PACKAGE_DIR)
 
 
 $(TARGETS): $(PACKAGE_DIR)
 

-$(LINUX_DIR):
-       mkdir -p $@
-

 $(PACKAGE_DIR):
        mkdir -p $@
 
 $(PACKAGE_DIR):
        mkdir -p $@
 


@@ -68,26 +65,26 @@ else
        echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
 endif
 
        echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
 endif
 

-$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile pkg-install ramdisk-config
+$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config

        $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH)
 
 $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
        $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH)
 
 $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux

-       $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
+       $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@

        touch -c $(LINUX_KERNEL)
 
 $(LINUX_DIR)/.modules_done:
        rm -rf $(KERNEL_BUILD_DIR)/modules
        $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules
        touch -c $(LINUX_KERNEL)
 
 $(LINUX_DIR)/.modules_done:
        rm -rf $(KERNEL_BUILD_DIR)/modules
        $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules

-       $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
+       $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install

        touch $(LINUX_DIR)/.modules_done
 
 modules: $(LINUX_DIR)/.modules_done
 packages: $(TARGETS)
 
        touch $(LINUX_DIR)/.modules_done
 
 modules: $(LINUX_DIR)/.modules_done
 packages: $(TARGETS)
 

-$(STAMP_DIR)/.linux-compile:
+$(LINUX_DIR)/.linux-compile:
+       ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux

        @$(MAKE) modules
        @$(MAKE) packages
        @$(MAKE) modules
        @$(MAKE) packages

-       ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux

        touch $@
 
 $(KERNEL_IPKG):
        touch $@
 
 $(KERNEL_IPKG):


@@ -109,16 +106,16 @@ pkg-install: FORCE
                $(IPKG) install $$pkg || echo; \
        done
 
                $(IPKG) install $$pkg || echo; \
        done
 

-source: $(DL_DIR)/$(LINUX_SOURCE)
+download: $(DL_DIR)/$(LINUX_SOURCE)

 prepare: $(LINUX_DIR)/.configured
 prepare: $(LINUX_DIR)/.configured

-       @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR)
+       @mkdir -p $(LINUX_DIR) $(PACKAGE_DIR)

 
 

-compile: prepare $(STAMP_DIR)/.linux-compile
+compile: prepare $(LINUX_DIR)/.linux-compile

 
 install: compile $(LINUX_KERNEL)
 
 mostlyclean: FORCE
 
 install: compile $(LINUX_KERNEL)
 
 mostlyclean: FORCE

-       rm -f $(STAMP_DIR)/.linux-compile
+       rm -f $(LINUX_DIR)/.linux-compile

        rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
        rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked
        $(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean
        rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
        rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked
        $(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean