X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=include%2Fkernel-build.mk;h=93bf66dbcb3c15ceeab4af7f161e7cab3eafbbf9;hp=a8c9e7fd25ea0139fdb5d33cbc5328007b4dad7a;hb=91ef5971fc5589462db60358c4c44d7249544448;hpb=a1b10a937911205c5239bc98a057c0a88523b66a

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index a8c9e7fd25..93bf66dbcb 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -4,130 +4,258 @@
 # 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)
+include $(INCLUDE_DIR)/kernel-version.mk
+include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/prereq.mk
 
-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)
+LINUX_CONFIG ?= ./config/default
 
-$(TARGETS): $(PACKAGE_DIR)
+-include $(TOPDIR)/target/linux/generic-$(KERNEL)/config-template
+-include $(LINUX_CONFIG)
 
-$(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)
-
-$(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 $@
+ifneq ($(CONFIG_ATM),)
+  FEATURES += atm
+endif
+ifneq ($(CONFIG_PCI),)
+  FEATURES += pci
+endif
+ifneq ($(CONFIG_USB),)
+  FEATURES += usb
+endif
+ifneq ($(CONFIG_PCMCIA),)
+  FEATURES += pcmcia
+endif
+ifneq ($(CONFIG_VIDEO_DEV),)
+  FEATURES += video
+endif
 
-ifeq ($(KERNEL),2.4)
-$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
-	$(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 $@
+# remove duplicates
+FEATURES:=$(sort $(FEATURES))
 
-$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
-	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) dep
-	touch $@
+# For target profile selection - the default set
+DEFAULT_PACKAGES:=base-files libgcc uclibc bridge busybox dnsmasq dropbear iptables mtd ppp ppp-mod-pppoe mtd kmod-ipt-nathelper
 
-$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done
+ifeq ($(DUMP),1)
+  all: dumpinfo
 else
-$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
-	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts
-	touch $@
+  all: compile
 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/
+ifneq (,$(findstring uml,$(BOARD)))
+  LINUX_KARCH:=um
 else
-	rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs
-	echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
+  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
 
-$(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) 
+KERNELNAME=
+ifneq (,$(findstring x86,$(BOARD)))
+  KERNELNAME="bzImage"
+endif
+ifneq (,$(findstring rdc,$(BOARD)))
+  KERNELNAME="bzImage"
+endif
+ifneq (,$(findstring ppc,$(BOARD)))
+  KERNELNAME="uImage"
+endif
 
-$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
-	$(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)" 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
+define Kernel/Prepare/Default
+	bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
+	if [ -d $(GENERIC_PLATFORM_DIR)/patches ]; then $(PATCH) $(LINUX_DIR) $(GENERIC_PLATFORM_DIR)/patches; fi
+	if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi
+	if [ -d ./patches ]; then $(PATCH) $(LINUX_DIR) ./patches; fi
+endef
+define Kernel/Prepare
+	$(call Kernel/Prepare/Default)
+endef
 
-modules: $(LINUX_DIR)/.modules_done
-packages: $(TARGETS)
+KERNEL_MAKEOPTS := -C $(LINUX_DIR) \
+	CROSS_COMPILE="$(KERNEL_CROSS)" \
+	ARCH="$(LINUX_KARCH)" \
+	CONFIG_SHELL="$(BASH)"
 
-$(LINUX_DIR)/.linux-compile:
-	@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; \
+define Kernel/Configure/2.4
+	$(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
+	$(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" oldconfig include/linux/compile.h include/linux/version.h
+	$(MAKE) $(KERNEL_MAKEOPTS) dep
+endef
+define Kernel/Configure/2.6
+	$(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" oldconfig prepare scripts
+endef
+define Kernel/Configure/Default
+	@if [ -f "./config/profile-$(PROFILE)" ]; then \
+		$(SCRIPT_DIR)/config.pl '+' $(GENERIC_PLATFORM_DIR)/config-template '+' $(LINUX_CONFIG) ./config/profile-$(PROFILE) > $(LINUX_DIR)/.config; \
+	else \
+		$(SCRIPT_DIR)/config.pl '+' $(GENERIC_PLATFORM_DIR)/config-template $(LINUX_CONFIG) > $(LINUX_DIR)/.config; \
 	fi
-	$(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR)
-
-$(TOPDIR)/.kernel.mk:
-	echo "BOARD:=$(BOARD)" > $@
-	echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@
-	echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
+endef
+define Kernel/Configure
+	$(call Kernel/Configure/Default)
+endef
 
-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)
+define Kernel/CompileModules/Default
+	$(MAKE) -j$(CONFIG_JLEVEL) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" modules
+	$(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
+endef
+define Kernel/CompileModules
+	$(call Kernel/CompileModules/Default)
+endef
 
-compile: prepare $(LINUX_DIR)/.linux-compile
 
-install: compile $(LINUX_KERNEL)
+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_PLATFORM_DIR)/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) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" $(KERNELNAME)
+	$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)
+	$(KERNEL_CROSS)objcopy -R .reginfo -R .note -R .comment -R .mdebug -S $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux.elf
+endef
+define Kernel/CompileImage
+	$(call Kernel/CompileImage/Default)
+endef
 
-mostlyclean: FORCE
+define Kernel/Clean/Default
 	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)/.configured
 	rm -f $(LINUX_KERNEL)
+	$(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean
+endef
 
-rebuild: FORCE
-	-$(MAKE) mostlyclean
-	if [ -f $(LINUX_KERNEL) ]; then \
-		$(MAKE) clean; \
-	fi
-	$(MAKE) compile $(MAKE_TRACE)
+define Kernel/Clean
+	$(call Kernel/Clean/Default)
+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
+
+  $(LINUX_DIR)/.prepared: $(DL_DIR)/$(LINUX_SOURCE)
+	-rm -rf $(KERNEL_BUILD_DIR)
+	-mkdir -p $(KERNEL_BUILD_DIR)
+	$(call Kernel/Prepare)
+	touch $$@
+
+  $(LINUX_DIR)/.configured: $(LINUX_DIR)/.prepared $(LINUX_CONFIG)
+	$(call Kernel/Configure)
+	$(call Kernel/Configure/$(KERNEL))
+	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)
+	touch $$@
+
+  $(LINUX_DIR)/.image: $(LINUX_DIR)/.configured FORCE
+	$(call Kernel/CompileImage)
+	touch $$@
+	
+  mostlyclean: FORCE
+	$(call Kernel/Clean)
+
+  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:'
+		@getvar $(call shvar,Target/Description)
+		@echo '@@'
+		@echo 'Default-Packages: $(DEFAULT_PACKAGES)'
+    ifneq ($(DUMPINFO),)
+		@$(DUMPINFO)
+    endif
+  endif
+
+  define BuildKernel
+  endef
+endef
+
+define Profile/Default
+  NAME:=
+  PACKAGES:=
+endef
+
+confname=$(subst .,_,$(subst -,_,$(1)))
+define Profile
+  $(eval $(call Profile/Default))
+  $(eval $(call Profile/$(1)))
+  $(eval $(call shexport,Profile/$(1)/Description))
+  DUMPINFO += \
+	echo "Target-Profile: $(1)"; \
+	echo "Target-Profile-Name: $(NAME)"; \
+	echo "Target-Profile-Packages: $(PACKAGES)"; \
+	if [ -f ./config/profile-$(1) ]; then \
+		echo "Target-Profile-Kconfig: yes"; \
+	fi; \
+	echo "Target-Profile-Description:"; \
+	getvar "$(call shvar,Profile/$(1)/Description)"; \
+	echo "@@"; \
+	echo;
+  ifeq ($(CONFIG_LINUX_$(call confname,$(KERNEL)_$(1))),y)
+    PROFILE=$(1)
+  endif
+endef
+
+$(eval $(call shexport,Target/Description))
+
+download: $(DL_DIR)/$(LINUX_SOURCE)
+prepare: $(LINUX_DIR)/.configured $(TMP_DIR)/.kernel.mk
+compile: $(LINUX_DIR)/.modules
+menuconfig: $(LINUX_DIR)/.prepared FORCE
+	$(call Kernel/Configure)
+	$(SCRIPT_DIR)/config.pl '+' $(GENERIC_PLATFORM_DIR)/config-template $(LINUX_CONFIG) > $(LINUX_DIR)/.config
+	$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) menuconfig
+	$(SCRIPT_DIR)/config.pl '>' $(GENERIC_PLATFORM_DIR)/config-template $(LINUX_DIR)/.config > $(LINUX_CONFIG)
+
+install: $(LINUX_DIR)/.image
 
 clean: FORCE
 	rm -f $(STAMP_DIR)/.linux-compile
 	rm -rf $(KERNEL_BUILD_DIR)
-	rm -f $(TARGETS)
+
+rebuild: FORCE
+	@$(MAKE) mostlyclean
+	@if [ -f $(LINUX_KERNEL) ]; then \
+		$(MAKE) clean; \
+	fi
+	@$(MAKE) compile
+