From e158d8b6a7b3c883a8be74cb2327dda6374fc050 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 11 Nov 2006 23:11:02 +0000 Subject: make target/linux/* directories self-contained, use the selected kernel version for the toolchain, autogenerate menuconfig and makefile code for target selection git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5498 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel.mk | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'include/kernel.mk') diff --git a/include/kernel.mk b/include/kernel.mk index 2611828a3..09aba4076 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -4,29 +4,14 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # + ifeq ($(DUMP),1) - KERNEL:= - BOARD:= - LINUX_VERSION:= + KERNEL?= + BOARD?= + LINUX_VERSION?= else - - include $(TOPDIR)/.kernel.mk include $(INCLUDE_DIR)/target.mk - # check to see if .kernel.mk matches target.mk - ifeq ($(CONFIG_BOARD)-$(CONFIG_KERNEL),$(BOARD)-$(KERNEL)) - LINUX_VERSION:=$(CONFIG_LINUX_VERSION) - LINUX_RELEASE:=$(CONFIG_LINUX_RELEASE) - LINUX_KARCH:=$(CONFIG_LINUX_KARCH) - else - ifneq ($(KERNEL_BUILD),1) - # oops, old .kernel.config; rebuild it (hiding the misleading errors this produces) - $(warning rebuilding .kernel.mk) - $(TOPDIR)/.kernel.mk: FORCE - @$(MAKE) -C $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL) $@ &>/dev/null - endif - endif - ifeq ($(KERNEL),2.6) LINUX_KMOD_SUFFIX=ko else @@ -49,6 +34,13 @@ else TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR) LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux + + 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) + endif -- cgit v1.2.3