From 4df20117943dcc5dab6705e8dad7a6cfbc30dfb0 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 3 Aug 2016 02:30:12 +0200 Subject: [PATCH] include/image.mk: allow image code to override uImage name Signed-off-by: John Crispin --- include/image-commands.mk | 2 +- include/image.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/image-commands.mk b/include/image-commands.mk index 160b5d883395..00cb3410e956 100644 --- 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 $@ $@.new + -n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION))' -d $@ $@.new @mv $@.new $@ endef diff --git a/include/image.mk b/include/image.mk index 91862c42a55c..f0b25aa7636d 100644 --- 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)) -- 2.30.2