From 9d42bb1a218d092b8c9447cf16ec2c94f7881c8d Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 12 Apr 2010 23:15:56 +0000
Subject: define a shared IMG_PREFIX variable used as a basename for image
 files, it contains board & subtarget infos (if appropriate) allowing
 subtargets to share the same bin directory without overwriting each other's
 files

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20834 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/goldfish/image/Makefile | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'target/linux/goldfish')

diff --git a/target/linux/goldfish/image/Makefile b/target/linux/goldfish/image/Makefile
index bf871fb2ae..6cd57ba52c 100644
--- a/target/linux/goldfish/image/Makefile
+++ b/target/linux/goldfish/image/Makefile
@@ -1,25 +1,22 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 JFFS2_BLOCKSIZE=124k
 JFFS2OPTS += -n -s 2048
 
-_PREFIX=openwrt-goldfish-
-
 define Image/BuildKernel
 	$(TARGET_CROSS)objcopy -O binary -R .note -R .comment -S \
-		$(LINUX_DIR)/arch/arm/boot/compressed/vmlinux $(BIN_DIR)/$(_PREFIX)kernel.bin
+		$(LINUX_DIR)/arch/arm/boot/compressed/vmlinux $(BIN_DIR)/$(IMG_PREFIX)-kernel.bin
 	$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS), \
 		$(CP) $(LINUX_DIR)/usr/initramfs_data.cpio.gz, \
 		gzip -c < $(LINUX_DIR)/usr/initramfs_data.cpio > \
-	) $(BIN_DIR)/$(_PREFIX)ramdisk.bin
+	) $(BIN_DIR)/$(IMG_PREFIX)-ramdisk.bin
 	$(CP) ./run-emulator.sh $(BIN_DIR)/
 endef
 
@@ -27,12 +24,12 @@ define Image/Build/jffs2-124k
 	$(CP) ./ubinize.cfg $(KDIR)/
 	(cd $(KDIR); \
 		ubinize \
-			-o $(BIN_DIR)/$(_PREFIX)$(1).img \
+			-o $(BIN_DIR)/$(IMG_PREFIX)-$(1).img \
 			-p 128KiB -m 2KiB -s 2KiB ubinize.cfg; \
 	)
 	nand_ecc \
-		$(BIN_DIR)/$(_PREFIX)$(1).img \
-		$(BIN_DIR)/$(_PREFIX)system.bin
+		$(BIN_DIR)/$(IMG_PREFIX)-$(1).img \
+		$(BIN_DIR)/$(IMG_PREFIX)-system.bin
 endef
 
 define Image/Build
-- 
cgit v1.2.3