Explorar el Código

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

Signed-off-by: John Crispin <[email protected]>
John Crispin hace 9 años
padre
commit
4df2011794
Se han modificado 2 ficheros con 3 adiciones y 2 borrados
  1. 1 1
      include/image-commands.mk
  2. 2 1
      include/image.mk

+ 1 - 1
include/image-commands.mk

@@ -7,7 +7,7 @@ define Build/uImage
 	mkimage -A $(LINUX_KARCH) \
 	mkimage -A $(LINUX_KARCH) \
 		-O linux -T kernel \
 		-O linux -T kernel \
 		-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
 		-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] $@
 	@mv [email protected] $@
 endef
 endef
 
 

+ 2 - 1
include/image.mk

@@ -355,6 +355,7 @@ define Device/Init
   DEVICE_DTS_DIR :=
   DEVICE_DTS_DIR :=
 
 
   BOARD_NAME :=
   BOARD_NAME :=
+  UIMAGE_NAME :=
 
 
   FILESYSTEMS := $(TARGET_FILESYSTEMS)
   FILESYSTEMS := $(TARGET_FILESYSTEMS)
 endef
 endef
@@ -364,7 +365,7 @@ DEFAULT_DEVICE_VARS := \
   DEVICE_DTS DEVICE_DTS_DIR BOARD_NAME CMDLINE \
   DEVICE_DTS DEVICE_DTS_DIR BOARD_NAME CMDLINE \
   UBOOTENV_IN_UBI KERNEL_IN_UBI \
   UBOOTENV_IN_UBI KERNEL_IN_UBI \
   BLOCKSIZE PAGESIZE SUBPAGESIZE VID_HDR_OFFSET \
   BLOCKSIZE PAGESIZE SUBPAGESIZE VID_HDR_OFFSET \
-  UBINIZE_OPTS
+  UBINIZE_OPTS UIMAGE_NAME
 
 
 define Device/ExportVar
 define Device/ExportVar
   $(1) : $(2):=$$($(2))
   $(1) : $(2):=$$($(2))