aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-11 15:29:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-11 15:29:33 +0000
commit9318930993ed2075188b98c476d9ed8b90344e9f (patch)
treeec82260a58a662bfbf466cc11e5b3acb49755db1 /include
parentb2bdea8ad4ff80a11cbdec0fffad61bd7884f946 (diff)
downloadupstream-9318930993ed2075188b98c476d9ed8b90344e9f.tar.gz
upstream-9318930993ed2075188b98c476d9ed8b90344e9f.tar.bz2
upstream-9318930993ed2075188b98c476d9ed8b90344e9f.zip
kernel: allow specifying kernel images to be copied separately from kernel make command line
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43619
Diffstat (limited to 'include')
-rw-r--r--include/kernel-defaults.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 8abd32d714..d6c8924623 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -141,9 +141,10 @@ define Kernel/CopyImage
$(KERNEL_CROSS)objcopy -O binary $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)$(1)
$(KERNEL_CROSS)objcopy $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux$(1).elf
$(CP) $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux.debug
-ifneq ($(KERNELNAME),)
- $(foreach k,$(filter-out dtbs,$(KERNELNAME)),$(CP) $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/$(IMAGES_DIR)/$(k) $(KERNEL_BUILD_DIR)/$(k)$(1);)
-endif
+ $(foreach k, \
+ $(if $(KERNEL_IMAGES),$(KERNEL_IMAGES),$(filter-out dtbs,$(KERNELNAME))), \
+ $(CP) $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/$(IMAGES_DIR)/$(k) $(KERNEL_BUILD_DIR)/$(k)$(1); \
+ )
endef
define Kernel/CompileImage/Default