enable slab, disable slob - for better performance (#583)

[openwrt.git] / target / linux / kernel.mk

diff --git a/target/linux/kernel.mk b/target/linux/kernel.mk
index 00ff102..b54fbd5 100644 (file)
--- a/target/linux/kernel.mk
+++ b/target/linux/kernel.mk
@@ -1,4 +1,4 @@
-LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
+LINUX_SOURCE:=$(LINUX_NAME).tar.bz2
 LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \
            http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \
            http://www.kernel.org/pub/linux/kernel/v$(KERNEL) \
@@ -8,9 +8,12 @@ KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg
 
 $(TARGETS): $(PACKAGE_DIR)
 
+$(LINUX_DIR):
+       mkdir -p $@
+
 $(PACKAGE_DIR):
-       mkdir -p $(PACKAGE_DIR)
-       
+       mkdir -p $@
+
 $(DL_DIR)/$(LINUX_SOURCE):
        -mkdir -p $(DL_DIR)
        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE)
@@ -18,8 +21,6 @@ $(DL_DIR)/$(LINUX_SOURCE):
 $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
        -mkdir -p $(LINUX_BUILD_DIR)
        bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(LINUX_BUILD_DIR) $(TAR_OPTIONS) -
-       rm -f $(BUILD_DIR)/linux
-       ln -s $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
        touch $@
 
 ifeq ($(KERNEL),2.4)
@@ -42,7 +43,22 @@ $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
        touch $@
 endif
 
-$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile
+ramdisk-config: $(LINUX_DIR)/.configured FORCE
+       mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
+       grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
+ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+       echo 'CONFIG_INITRAMFS_SOURCE="../../root"' >> $(LINUX_DIR)/.config
+       echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
+       echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
+       mkdir -p $(BUILD_DIR)/root/etc/init.d
+       $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/
+       $(CP) ../generic-2.6/files/init.d/S00initramfs $(BUILD_DIR)/root/etc/init.d/
+else
+       rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs
+       echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
+endif
+
+$(LINUX_DIR)/vmlinux: $(STAMP_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
@@ -58,22 +74,8 @@ $(LINUX_DIR)/.modules_done:
 $(STAMP_DIR)/.linux-compile:
        @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG)
        ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
-       $(MAKE) -C $(TOPDIR)/target/linux/package \
-               $(KPKG_MAKEOPTS) \
-               compile
        touch $@
 
-.PHONY: pkg-install
-pkg-install:
-       @mkdir -p $(TARGET_MODULES_DIR)
-       @rm -rf $(LINUX_BUILD_DIR)/root*
-       @cp -fpR $(BUILD_DIR)/root $(LINUX_BUILD_DIR)/
-       echo -e 'dest root /\noption offline_root $(LINUX_BUILD_DIR)/root' > $(LINUX_BUILD_DIR)/ipkg.conf
-       $(MAKE) -C $(TOPDIR)/target/linux/package \
-               $(KPKG_MAKEOPTS) \
-               install
-       [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS)
-
 $(KERNEL_IPKG):
        rm -rf $(KERNEL_IDIR)
        mkdir -p $(KERNEL_IDIR)/etc
@@ -83,35 +85,39 @@ $(KERNEL_IPKG):
        fi
        $(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR)
 
+$(BUILD_DIR)/kernel.mk: $(LINUX_DIR) FORCE
+       echo "BOARD:=$(BOARD)" > $@
+       echo "LINUX_NAME:=$(LINUX_NAME)" >> $@
+       echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@
+       echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
+
+pkg-install: FORCE
+       @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; }
+
 source: $(DL_DIR)/$(LINUX_SOURCE)
-prepare: 
+prepare: $(BUILD_DIR)/kernel.mk
        @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR)
        @$(MAKE) $(LINUX_DIR)/.configured
 
 compile: prepare $(STAMP_DIR)/.linux-compile
 
-install: compile
-       $(MAKE) $(KPKG_MAKEOPTS) pkg-install
-       $(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL)
+install: compile $(LINUX_KERNEL)
 
-mostlyclean:
+mostlyclean: FORCE
        rm -f $(STAMP_DIR)/.linux-compile
        rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
        rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked
        $(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean
        rm -f $(LINUX_KERNEL)
 
-rebuild:
+rebuild: FORCE
        -$(MAKE) mostlyclean
-       @[ -f $(LINUX_KERNEL) ] && $(MAKE) clean
-       $(MAKE) compile
+       if [ -f $(LINUX_KERNEL) ]; then \
+               $(MAKE) clean; \
+       fi
+       $(MAKE) compile $(MAKE_TRACE)
 
-clean:
+clean: FORCE
        rm -f $(STAMP_DIR)/.linux-compile
        rm -rf $(LINUX_BUILD_DIR)
        rm -f $(TARGETS)
-
-package/%:
-       $(MAKE) -C $(TOPDIR)/target/linux/package \
-               $(KPKG_MAKEOPTS) \
-               $(patsubst package/%,%,$@)