X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/7c79debf2cb44333e52025ee5b276c2c5d2c99c0..e158d8b6a7b3c883a8be74cb2327dda6374fc050:/include/kernel-build.mk

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 665f0ff74..e491e489c 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -4,131 +4,183 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
--include $(INCLUDE_DIR)/modules-$(KERNEL).mk
+KERNEL_BUILD:=1
 
-LINUX_SOURCE:=linux-$(LINUX_VERSION).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) \
-           http://www.de.kernel.org/pub/linux/kernel/v$(KERNEL)
+ifeq ($(DUMP),1)
+  all: dumpinfo
+else
+  all: compile
+endif
+KERNEL:=2.$(word 2,$(subst ., ,$(strip $(LINUX_VERSION))))
 
-KERNEL_IDIR:=$(KERNEL_BUILD_DIR)/kernel-ipkg
-KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk
-TARGETS += $(KERNEL_IPKG)
-INSTALL_TARGETS += $(KERNEL_IPKG)
+include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/kernel.mk
 
-$(TARGETS): $(PACKAGE_DIR)
+LINUX_CONFIG:=./config
 
-$(PACKAGE_DIR):
-	mkdir -p $@
+ifneq (,$(findstring uml,$(BOARD)))
+  LINUX_KARCH:=um
+else
+  LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
+	-e 's/mipsel/mips/' \
+	-e 's/mipseb/mips/' \
+	-e 's/powerpc/ppc/' \
+	-e 's/sh[234]/sh/' \
+	-e 's/armeb/arm/' \
+  )
+endif
 
-$(DL_DIR)/$(LINUX_SOURCE):
-	-mkdir -p $(DL_DIR)
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE)
+KERNELNAME=
+ifneq (,$(findstring x86,$(BOARD)))
+  KERNELNAME="bzImage"
+endif
+ifneq (,$(findstring ppc,$(BOARD)))
+  KERNELNAME="uImage"
+endif
+
+
+define Kernel/Prepare/Default
+	bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
+	[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches 
+	[ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches
+endef
+define Kernel/Prepare
+	$(call Kernel/Prepare/Default)
+endef
 
-$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
-	-mkdir -p $(KERNEL_BUILD_DIR)
-	bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) -
-	touch $@
 
-ifeq ($(KERNEL),2.4)
-$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
+define Kernel/Configure/2.4
 	$(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
 	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h
-	touch $@
-
-$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
 	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) dep
-	touch $@
-
-$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done
-else
-$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
+endef
+define Kernel/Configure/2.6
 	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts
-	touch $@
-endif
-
-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/
-else
-	rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs
-	echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
+endef
+define Kernel/Configure/Default
+	@$(CP) $(LINUX_CONFIG) $(LINUX_DIR)/.config
+	$(call Kernel/Configure/$(KERNEL))
+endef
+define Kernel/Configure
+	$(call Kernel/Configure/Default)
+endef
+
+
+define Kernel/CompileModules/Default
+	$(MAKE) -j$(CONFIG_JLEVEL) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) modules
+	$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
+endef
+define Kernel/CompileModules
+	$(call Kernel/CompileModules/Default)
+endef
+
+
+ifeq ($(KERNEL),2.6)
+  ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+    define Kernel/SetInitramfs
+		mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
+		grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
+		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/
+    endef
+  else
+    define Kernel/SetInitramfs
+		mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
+		grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
+		rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs
+		echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
+    endef
+  endif
 endif
+define Kernel/CompileImage/Default
+	$(call Kernel/SetInitramfs)
+	$(MAKE) -j$(CONFIG_JLEVEL) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(KERNELNAME)
+	$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)
+endef
+define Kernel/CompileImage
+	$(call Kernel/CompileImage/Default)
+endef
+
+define Kernel/Clean/Default
+	rm -f $(LINUX_DIR)/.linux-compile
+	rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.configured
+	rm -f $(LINUX_KERNEL)
+	$(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean
+endef
 
-$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config
-	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) 
+define Kernel/Clean
+	$(call Kernel/Clean/Default)
+endef
 
-$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
-	$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
-	touch -c $(LINUX_KERNEL)
+define BuildKernel
+  ifneq ($(LINUX_SITE),)
+    $(DL_DIR)/$(LINUX_SOURCE):
+		-mkdir -p $(DL_DIR)
+		$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE)
+  endif
 
-$(LINUX_DIR)/.modules_done:
-	rm -rf $(KERNEL_BUILD_DIR)/modules
-	$(MAKE) -C "$(LINUX_DIR)" CC="$(KERNEL_CC)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) modules
-	$(MAKE) -C "$(LINUX_DIR)" CC="$(KERNEL_CC)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
-	touch $(LINUX_DIR)/.modules_done
+  $(LINUX_DIR)/.prepared: $(DL_DIR)/$(LINUX_SOURCE)
+	-rm -rf $(KERNEL_BUILD_DIR)
+	-mkdir -p $(KERNEL_BUILD_DIR)
+	$(call Kernel/Prepare)
+	touch $$@
 
-modules: $(LINUX_DIR)/.modules_done
-packages: $(TARGETS)
+  $(LINUX_DIR)/.configured: $(LINUX_DIR)/.prepared $(LINUX_CONFIG)
+	$(call Kernel/Configure)
+	touch $$@
 
-$(LINUX_DIR)/.linux-compile:
+  $(LINUX_DIR)/.modules: $(LINUX_DIR)/.configured
+	rm -rf $(KERNEL_BUILD_DIR)/modules
 	@rm -f $(BUILD_DIR)/linux
 	ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
-	@$(MAKE) modules
-	@$(MAKE) packages
-	touch $@
-
-$(KERNEL_IPKG):
-	rm -rf $(KERNEL_IDIR)
-	mkdir -p $(KERNEL_IDIR)/etc
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) $(ARCH)
-	if [ -f ./config/$(BOARD).modules ]; then \
-		cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
-	fi
-	$(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR)
-
-$(TOPDIR)/.kernel.mk: $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/Makefile
-	echo "CONFIG_BOARD:=$(BOARD)" > $@
-	echo "CONFIG_KERNEL:=$(KERNEL)" >> $@
-	echo "CONFIG_LINUX_VERSION:=$(LINUX_VERSION)" >> $@
-	echo "CONFIG_LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
-
-pkg-install: FORCE
-	@for pkg in $(INSTALL_TARGETS); do \
-		$(IPKG) install $$pkg || echo; \
-	done
-
-download: $(DL_DIR)/$(LINUX_SOURCE)
-prepare: $(LINUX_DIR)/.configured
-	@mkdir -p $(LINUX_DIR) $(PACKAGE_DIR)
-
-compile: prepare $(LINUX_DIR)/.linux-compile
-
-install: compile $(LINUX_KERNEL)
+	$(call Kernel/CompileModules)
+	touch $$@
+
+  $(LINUX_DIR)/.image: $(LINUX_DIR)/.configured FORCE
+	$(call Kernel/CompileImage)
+	touch $$@
+	
+  mostlyclean: FORCE
+	$(call Kernel/Clean)
+
+  define BuildKernel
+  endef
+endef
+
+$(eval $(call shexport,Target/Description))
+
+ifeq ($(DUMP),1)
+  dumpinfo:
+	@echo 'Target: $(BOARD)-$(KERNEL)'
+	@echo 'Target-Name: $(BOARDNAME) [$(KERNEL)]'
+	@echo 'Target-Path: $(subst $(TOPDIR)/,,$(PWD))'
+	@echo 'Target-Arch: $(ARCH)'
+	@echo 'Target-Features: $(FEATURES)'
+	@echo 'Linux-Version: $(LINUX_VERSION)'
+	@echo 'Linux-Release: $(LINUX_RELEASE)'
+	@echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'
+	@echo 'Target-Description:'
+	@echo "$$$(call shvar,Target/Description)"
+	@echo '@@'
+else
+  download: $(DL_DIR)/$(LINUX_SOURCE)
+  prepare: $(LINUX_DIR)/.configured $(TMP_DIR)/.kernel.mk
+  compile: $(LINUX_DIR)/.modules
+  install: $(LINUX_DIR)/.image
 
-mostlyclean: FORCE
-	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 $(LINUX_KERNEL)
+  clean: FORCE
+	rm -f $(STAMP_DIR)/.linux-compile
+	rm -rf $(KERNEL_BUILD_DIR)
 
-rebuild: FORCE
-	-$(MAKE) mostlyclean
-	if [ -f $(LINUX_KERNEL) ]; then \
+  rebuild: FORCE
+	@$(MAKE) mostlyclean
+	@if [ -f $(LINUX_KERNEL) ]; then \
 		$(MAKE) clean; \
 	fi
-	$(MAKE) compile $(MAKE_TRACE)
+	@$(MAKE) compile
+endif
 
-clean: FORCE
-	rm -f $(STAMP_DIR)/.linux-compile
-	rm -rf $(KERNEL_BUILD_DIR)
-	rm -f $(TARGETS)