diff options
| -rw-r--r-- | include/kernel-build.mk | 9 | ||||
| -rw-r--r-- | include/kernel.mk | 62 |
2 files changed, 41 insertions, 30 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk index a8c9e7fd25..665f0ff744 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -94,10 +94,11 @@ $(KERNEL_IPKG): fi $(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR) -$(TOPDIR)/.kernel.mk: - echo "BOARD:=$(BOARD)" > $@ - echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@ - echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ +$(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 \ diff --git a/include/kernel.mk b/include/kernel.mk index db02ea2160..7b959eaeaa 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -9,43 +9,53 @@ ifeq ($(DUMP),1) BOARD:=<BOARD> LINUX_VERSION:=<LINUX_VERSION> else --include $(TOPDIR)/.kernel.mk -ifneq (,$(findstring 2.4.,$(LINUX_VERSION))) -KERNEL:=2.4 -LINUX_KMOD_SUFFIX=o -endif -ifneq (,$(findstring 2.6.,$(LINUX_VERSION))) -KERNEL:=2.6 -LINUX_KMOD_SUFFIX=ko -endif + 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) + RELEASE:=$(CONFIG_RELEASE) + else + # 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 -LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ + ifeq ($(KERNEL),2.6) + LINUX_KMOD_SUFFIX=ko + else + LINUX_KMOD_SUFFIX=o + endif + + 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/' \ -) + ) -ifneq (,$(findstring uml,$(BOARD))) - LINUX_KARCH:=um - KERNEL_CC:=$(HOSTCC) - KERNEL_CROSS:= -else - KERNEL_CC:=$(TARGET_CC) - KERNEL_CROSS:=$(TARGET_CROSS) -endif + ifneq (,$(findstring uml,$(BOARD))) + LINUX_KARCH:=um + KERNEL_CC:=$(HOSTCC) + KERNEL_CROSS:= + else + KERNEL_CC:=$(TARGET_CC) + KERNEL_CROSS:=$(TARGET_CROSS) + endif -KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) -LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) + KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) + LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) -MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION) -MODULES_DIR := $(KERNEL_BUILD_DIR)/modules/$(MODULES_SUBDIR) -TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR) -KMOD_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-modules + MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION) + MODULES_DIR := $(KERNEL_BUILD_DIR)/modules/$(MODULES_SUBDIR) + TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR) + KMOD_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-modules -LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux + LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux endif # FIXME: remove this crap |