include/image.mk: allow image code to override uImage name
authorJohn Crispin <john@phrozen.org>
Wed, 3 Aug 2016 00:30:12 +0000 (02:30 +0200)
committerJohn Crispin <john@phrozen.org>
Wed, 3 Aug 2016 13:30:13 +0000 (15:30 +0200)
Signed-off-by: John Crispin <john@phrozen.org>
include/image-commands.mk
include/image.mk

index 160b5d8..00cb341 100644 (file)
@@ -7,7 +7,7 @@ define Build/uImage
        mkimage -A $(LINUX_KARCH) \
                -O linux -T kernel \
                -C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-               -n '$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION)' -d $@ $@.new
+               -n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION))' -d $@ $@.new
        @mv $@.new $@
 endef
 
index 91862c4..f0b25aa 100644 (file)
@@ -355,6 +355,7 @@ define Device/Init
   DEVICE_DTS_DIR :=
 
   BOARD_NAME :=
+  UIMAGE_NAME :=
 
   FILESYSTEMS := $(TARGET_FILESYSTEMS)
 endef
@@ -364,7 +365,7 @@ DEFAULT_DEVICE_VARS := \
   DEVICE_DTS DEVICE_DTS_DIR BOARD_NAME CMDLINE \
   UBOOTENV_IN_UBI KERNEL_IN_UBI \
   BLOCKSIZE PAGESIZE SUBPAGESIZE VID_HDR_OFFSET \
-  UBINIZE_OPTS
+  UBINIZE_OPTS UIMAGE_NAME
 
 define Device/ExportVar
   $(1) : $(2):=$$($(2))