From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Mon, 22 Feb 2021 15:12:48 +0000 (+0100)
Subject: imx6: remove redundant IMAGE_NAME
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e4d1163de46eb8b16c0b4c3e9f2d229bd06b5b8f;p=openwrt%2Fstaging%2Fneocturne.git

imx6: remove redundant IMAGE_NAME

IMAGE_NAME is set twice for ventana, and the second value
actually matches the default in image.mk. Remove both.

Fixes: ded905ce431b ("imx6: extend cubox support to hummingboard,
add support for building full images")

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile
index b520c1f778..afc75d6df1 100644
--- a/target/linux/imx6/image/Makefile
+++ b/target/linux/imx6/image/Makefile
@@ -164,13 +164,11 @@ define Device/ventana
 	kobs-ng
   KERNEL += | boot-overlay
   IMAGES := nand.ubi bootfs.tar.gz dtb
-  IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1).$$(2)
   UBINIZE_PARTS = boot=$$(KDIR_KERNEL_IMAGE).boot.ubifs=15
   BOOT_SCRIPT := bootscript-ventana
   IMAGE/nand.ubi := append-ubi
   IMAGE/bootfs.tar.gz := bootfs.tar.gz
   IMAGE/dtb := install-dtb
-  IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1)-$$(2)
   PAGESIZE := 2048
   BLOCKSIZE := 128k
   MKUBIFS_OPTS := -m $$(PAGESIZE) -e 124KiB