summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-11-08 18:11:03 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-11-08 18:11:03 +0100
commitc55a696b9c3c6d25342e8e04999a2058da5d8201 (patch)
tree4347e5bb4894cb4e489575f8e519e11dc57986d1 /mk
parent6987d5c7e74c19902218551427e4b11bd02ee968 (diff)
enable variable kernel target name, qemu-mips targets use vmlinuz
Diffstat (limited to 'mk')
-rw-r--r--mk/image.mk2
-rw-r--r--mk/kernel-build.mk12
2 files changed, 8 insertions, 6 deletions
diff --git a/mk/image.mk b/mk/image.mk
index 0ce61cd01..43561b1c9 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -194,7 +194,7 @@ endif
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} oldconfig $(MAKE_TRACE)
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
- ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(MAKE_TRACE)
+ ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE)
imageclean:
rm -f $(BIN_DIR)/$(ADK_TARGET_SYSTEM)-* ${BUILD_DIR}/$(ADK_TARGET_SYSTEM)-*
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index e746f4a1d..63046175d 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -5,6 +5,8 @@ include $(TOPDIR)/rules.mk
include $(TOPDIR)/mk/linux.mk
include ${TOPDIR}/mk/kernel-vars.mk
+KERNEL_TARGET:=$(ADK_TARGET_KERNEL)
+
$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched:
$(TRACE) target/kernel-patch
$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \
@@ -25,10 +27,10 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR
${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} prepare scripts $(MAKE_TRACE)
touch -c $(LINUX_DIR)/.config
-$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config
- -rm $(LINUX_DIR)/vmlinux 2>/dev/null
+$(LINUX_DIR)/$(KERNEL_TARGET): $(LINUX_DIR)/.config
+ -rm $(LINUX_DIR)/$(KERNEL_TARGET) 2>/dev/null
$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile
- ${KERNEL_MAKE_ENV} $(MAKE) V=1 ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(MAKE_TRACE)
+ ${KERNEL_MAKE_ENV} $(MAKE) V=1 ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) $(MAKE_TRACE)
$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install
rm -rf $(LINUX_BUILD_DIR)/modules
${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \
@@ -39,10 +41,10 @@ $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config
ifneq ($(strip $(TARGETS)),)
$(MAKE) $(TARGETS)
endif
- touch -c $(LINUX_DIR)/vmlinux
+ touch -c $(LINUX_DIR)/$(KERNEL_TARGET)
prepare:
-compile: $(LINUX_DIR)/vmlinux
+compile: $(LINUX_DIR)/$(KERNEL_TARGET)
install: compile
ifneq ($(strip $(INSTALL_TARGETS)),)
$(TRACE) target/${ADK_TARGET_ARCH}-modules-install