diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
| commit | 8e8512391c668fc7074f812f15eabe8f176fb01e (patch) | |
| tree | f9f0862dd6eb962fe3fc4803180b431843f6c5be /mk/kernel-build.mk | |
| parent | c491653a1f9574a42965025805d472c3d145f699 (diff) | |
| parent | ae3d4616ed9c19a29d656193254657f93d612fa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/kernel-build.mk')
| -rw-r--r-- | mk/kernel-build.mk | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index b7385c272..3f055e255 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -5,6 +5,17 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/mk/linux.mk include ${TOPDIR}/mk/kernel-vars.mk +KERNEL_FILE:=$(ADK_TARGET_KERNEL) +KERNEL_TARGET:=$(ADK_TARGET_KERNEL) +ifeq ($(ADK_TARGET_KERNEL_ZIMAGE),y) +KERNEL_FILE:=vmlinux +KERNEL_TARGET:=$(ADK_TARGET_KERNEL) +endif +ifeq ($(ADK_TARGET_KERNEL_BZIMAGE),y) +KERNEL_FILE:=vmlinux +KERNEL_TARGET:=all +endif + $(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) \ @@ -19,30 +30,30 @@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PK $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR)/mk/modules.mk $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure - for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done $(MAKE_TRACE) + -for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done $(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config echo N | ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE) ${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 $(MAKE_TRACE) +$(LINUX_DIR)/$(KERNEL_FILE): $(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 \ INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \ LOCALVERSION="" \ - modules_install $(MAKE_TRACE) + modules modules_install $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET_ARCH)-create-packages ifneq ($(strip $(TARGETS)),) $(MAKE) $(TARGETS) endif - touch -c $(LINUX_DIR)/vmlinux + touch -c $(LINUX_DIR)/$(KERNEL_FILE) prepare: -compile: $(LINUX_DIR)/vmlinux +compile: $(LINUX_DIR)/$(KERNEL_FILE) install: compile ifneq ($(strip $(INSTALL_TARGETS)),) $(TRACE) target/${ADK_TARGET_ARCH}-modules-install |