X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bc9f96270fb3ae8922755b3a7f86bc87c3c8da42..fef4a866f152f4b7ec38c260e9d67d419f210d90:/include/kernel-build.mk?ds=sidebyside

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 93bf66dbc..3b767c382 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -1,154 +1,41 @@
-# 
-# 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
-
-include $(INCLUDE_DIR)/kernel-version.mk
 include $(INCLUDE_DIR)/host.mk
-include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/prereq.mk
 
-LINUX_CONFIG ?= ./config/default
-
--include $(TOPDIR)/target/linux/generic-$(KERNEL)/config-template
--include $(LINUX_CONFIG)
-
-ifneq ($(CONFIG_ATM),)
-  FEATURES += atm
-endif
-ifneq ($(CONFIG_PCI),)
-  FEATURES += pci
+ifneq ($(DUMP),1)
+  override MAKEFLAGS=
 endif
-ifneq ($(CONFIG_USB),)
-  FEATURES += usb
-endif
-ifneq ($(CONFIG_PCMCIA),)
-  FEATURES += pcmcia
-endif
-ifneq ($(CONFIG_VIDEO_DEV),)
-  FEATURES += video
-endif
-
-# remove duplicates
-FEATURES:=$(sort $(FEATURES))
-
-# 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
 
-ifeq ($(DUMP),1)
-  all: dumpinfo
-else
+ifneq ($(DUMP),1)
   all: compile
 endif
 
-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
-
-KERNELNAME=
-ifneq (,$(findstring x86,$(BOARD)))
-  KERNELNAME="bzImage"
-endif
-ifneq (,$(findstring rdc,$(BOARD)))
-  KERNELNAME="bzImage"
-endif
-ifneq (,$(findstring ppc,$(BOARD)))
-  KERNELNAME="uImage"
-endif
+STAMP_PREPARED:=$(LINUX_DIR)/.prepared
+STAMP_CONFIGURED:=$(LINUX_DIR)/.configured
+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)
-	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
 
-KERNEL_MAKEOPTS := -C $(LINUX_DIR) \
-	CROSS_COMPILE="$(KERNEL_CROSS)" \
-	ARCH="$(LINUX_KARCH)" \
-	CONFIG_SHELL="$(BASH)"
-
-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
-endef
 define Kernel/Configure
 	$(call Kernel/Configure/Default)
 endef
 
-
-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
 
-
-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
 
-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
@@ -160,102 +47,57 @@ define BuildKernel
 		$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE)
   endif
 
-  $(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)
-	$(call Kernel/Configure/$(KERNEL))
+  $(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)
-
-  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
+	$(Kernel/Clean)
 
   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: $(STAMP_CONFIGURED)
+  compile: $(LINUX_DIR)/.modules
+	$(MAKE) -C image compile TARGET_BUILD=
 
-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)
+  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
+  install: $(LINUX_DIR)/.image
+	TARGET_BUILD="" $(MAKE) -C image compile install
 
-clean: FORCE
-	rm -f $(STAMP_DIR)/.linux-compile
+  clean: FORCE
 	rm -rf $(KERNEL_BUILD_DIR)
 
-rebuild: FORCE
+  rebuild: FORCE
 	@$(MAKE) mostlyclean
 	@if [ -f $(LINUX_KERNEL) ]; then \
 		$(MAKE) clean; \
 	fi
 	@$(MAKE) compile
 
+  image-prereq:
+	$(SUBMAKE) -s -C image prereq TARGET_BUILD=
 
+  prereq: image-prereq
+
+endef