X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e158d8b6a7b3c883a8be74cb2327dda6374fc050..0d4a1d75d3a9e348771b918fcd48e56d1dcd21e5:/include/kernel-build.mk

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index e491e489c..678cf18a3 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -1,178 +1,95 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-KERNEL_BUILD:=1
-
-ifeq ($(DUMP),1)
-  all: dumpinfo
-else
-  all: compile
-endif
-KERNEL:=2.$(word 2,$(subst ., ,$(strip $(LINUX_VERSION))))
-
 include $(INCLUDE_DIR)/host.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-LINUX_CONFIG:=./config
-
-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
+include $(INCLUDE_DIR)/prereq.mk
 
-KERNELNAME=
-ifneq (,$(findstring x86,$(BOARD)))
-  KERNELNAME="bzImage"
+ifneq ($(DUMP),1)
+  override MAKEFLAGS=
 endif
-ifneq (,$(findstring ppc,$(BOARD)))
-  KERNELNAME="uImage"
+
+ifneq ($(DUMP),1)
+  all: compile
 endif
 
+STAMP_PREPARED:=$(LINUX_DIR)/.prepared
+STAMP_CONFIGURED:=$(LINUX_DIR)/.configured
+include $(INCLUDE_DIR)/download.mk
+include $(INCLUDE_DIR)/quilt.mk
+include $(INCLUDE_DIR)/kernel-defaults.mk
 
-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
 
-
-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
-	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) dep
-endef
-define Kernel/Configure/2.6
-	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts
-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
-
 define Kernel/Clean
 	$(call Kernel/Clean/Default)
 endef
 
+define Download/kernel
+  URL:=$(LINUX_SITE)
+  FILE:=$(LINUX_SOURCE)
+  MD5SUM:=$(LINUX_KERNEL_MD5SUM)
+endef
+
 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
+  $(if $(QUILT),$(Build/Quilt))
+  $(if $(LINUX_SITE),$(call Download,kernel))
 
-  $(LINUX_DIR)/.prepared: $(DL_DIR)/$(LINUX_SOURCE)
+  $(STAMP_PREPARED): $(DL_DIR)/$(LINUX_SOURCE)
 	-rm -rf $(KERNEL_BUILD_DIR)
 	-mkdir -p $(KERNEL_BUILD_DIR)
-	$(call Kernel/Prepare)
+	$(Kernel/Prepare)
 	touch $$@
 
-  $(LINUX_DIR)/.configured: $(LINUX_DIR)/.prepared $(LINUX_CONFIG)
-	$(call Kernel/Configure)
+  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_CONFIG) $(GENERIC_LINUX_CONFIG) $(TOPDIR)/.config
+	$(Kernel/Configure)
 	touch $$@
 
-  $(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
-	$(call Kernel/CompileModules)
+  $(LINUX_DIR)/.modules: $(STAMP_CONFIGURED) $(LINUX_DIR)/.config FORCE
+	$(Kernel/CompileModules)
 	touch $$@
 
-  $(LINUX_DIR)/.image: $(LINUX_DIR)/.configured FORCE
-	$(call Kernel/CompileImage)
+  $(LINUX_DIR)/.image: $(STAMP_CONFIGURED) FORCE
+	$(Kernel/CompileImage)
 	touch $$@
 	
   mostlyclean: FORCE
-	$(call Kernel/Clean)
+	$(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
+  prepare: $(STAMP_CONFIGURED)
   compile: $(LINUX_DIR)/.modules
+	$(MAKE) -C image compile TARGET_BUILD=
+
+  oldconfig menuconfig: $(STAMP_PREPARED) FORCE
+	$(LINUX_CONFCMD) > $(LINUX_DIR)/.config
+	$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
+	$(SCRIPT_DIR)/kconfig.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG)
+	$(Kernel/Configure)
+
   install: $(LINUX_DIR)/.image
+	TARGET_BUILD="" $(MAKE) -C image compile install
 
   clean: FORCE
-	rm -f $(STAMP_DIR)/.linux-compile
 	rm -rf $(KERNEL_BUILD_DIR)
 
   rebuild: FORCE
@@ -181,6 +98,10 @@ else
 		$(MAKE) clean; \
 	fi
 	@$(MAKE) compile
-endif
 
+  image-prereq:
+	$(SUBMAKE) -s -C image prereq TARGET_BUILD=
+
+  prereq: image-prereq
 
+endef