From: Luka Perkov <luka@openwrt.org>
Date: Thu, 17 Oct 2013 11:54:52 +0000 (+0000)
Subject: imx6: fix file names when building images
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=416d58a3d65fa52b0f0089888af9c499daca8c4f;p=openwrt%2Fstaging%2Fyousong.git

imx6: fix file names when building images

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38434
---

diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile
index aad15271a0..a0772727d2 100644
--- a/target/linux/imx6/image/Makefile
+++ b/target/linux/imx6/image/Makefile
@@ -34,7 +34,7 @@ endef
 
 # board-specific sysupgrade image
 define BuildFirmware/Generic
-	dd if=$(BIN_DIR)/openwrt-$(1)-uImage.itb of=$(KDIR)/uImage.pad bs=64k conv=sync; \
+	dd if=$(BIN_DIR)/$(IMG_PREFIX)-$(1)-uImage.itb of=$(KDIR)/uImage.pad bs=64k conv=sync; \
 	dd if=$(KDIR)/root.$(2) of=$(KDIR)/root.$(2).pad bs=128k conv=sync; \
 	sh $(TOPDIR)/scripts/combined-image.sh \
 		$(KDIR)/uImage.pad \
@@ -52,10 +52,10 @@ endef
 # rootfs and board-specific combined kernel+rootfs for convenience
 define Image/Build/squashfs
 	$(call prepare_generic_squashfs,$(KDIR)/root.$(1))
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=128k conv=sync
+	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=128k conv=sync; \
 	$(foreach board,$(BOARDS),
 		( \
-		dd if=$(BIN_DIR)/openwrt-$(board)-uImage.itb bs=2048k conv=sync; \
+		dd if=$(BIN_DIR)/$(IMG_PREFIX)-$(board)-uImage.itb bs=2048k conv=sync; \
 		dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
 		) > $(BIN_DIR)/$(IMG_PREFIX)-$(board)-$(1).bin
 	)