include/image.mk: allow image code to override uImage name

Signed-off-by: John Crispin <[email protected]>

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 160b5d883395d3ef53f4c61426ea27a5dbd3a063..00cb3410e95631a7808b8a624d0ee32f0445907c 100644 (file)
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -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 $@ [email protected]
+               -n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION))' -d $@ [email protected]
        @mv [email protected] $@
 endef
 

diff --git a/include/image.mk b/include/image.mk
index 91862c42a55c2b39369b53660e413bc1a1b65c88..f0b25aa7636d41c6d7c8649fa034475386e7d04b 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -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))