From: Markus Wigge Date: Thu, 1 Jul 2010 10:48:13 +0000 (+0000) Subject: renamed wrt54g3gv2-vf images X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=114ce0bd4c0167a9914a6f1105d72730079e19ba;p=openwrt%2Fstaging%2Frobimarko.git renamed wrt54g3gv2-vf images 'factory' and 'sysupgrade' did not make much sense. A discussion with jow convinced me that .trx results in a helpdesk disaster. So I decided to use '.bin' for normal bin-headers and '.noheader.bin' for the trx-v2 image. I fixed the wiki accordingly. SVN-Revision: 22013 --- diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile index b839a42d23..69a31e7554 100644 --- a/target/linux/brcm47xx/image/Makefile +++ b/target/linux/brcm47xx/image/Makefile @@ -35,7 +35,7 @@ define Image/Build/CyberTAN $(STAGING_DIR_HOST)/bin/addpattern -4 -p $(3) -v v$(4) -i $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx -o $(BIN_DIR)/openwrt-$(2)-$(5).bin $(if $(6),-s $(6)) endef define Image/Build/CyberTAN2 - $(STAGING_DIR_HOST)/bin/addpattern -4 -p $(3) -v v$(4) -i $(BIN_DIR)/openwrt-$(2)-$(5)-sysupgrade.bin -o $(BIN_DIR)/openwrt-$(2)-$(5)-factory.bin $(if $(6),-s $(6)) + $(STAGING_DIR_HOST)/bin/addpattern -4 -p $(3) -v v$(4) -i $(BIN_DIR)/openwrt-$(2)-$(5).noheader.bin -o $(BIN_DIR)/openwrt-$(2)-$(5).bin $(if $(6),-s $(6)) endef define Image/Build/CyberTANHead $(STAGING_DIR_HOST)/bin/addpattern -5 -p $(3) -v v$(4) -i /dev/null -o $(KDIR)/openwrt-$(2)-header.bin $(if $(6),-s $(6)) @@ -61,7 +61,7 @@ endef define Image/Build/trxV2 $(call Image/Build/CyberTANHead,$(1),$(2),$(3),$(4),$(5),$(if $(6),$(6))) - $(STAGING_DIR_HOST)/bin/trx -2 -o $(BIN_DIR)/openwrt-$(2)-$(5)-sysupgrade.bin \ + $(STAGING_DIR_HOST)/bin/trx -2 -o $(BIN_DIR)/openwrt-$(2)-$(5).noheader.bin \ -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma \ $(call trxalign/$(1),$(1),$(KDIR)/openwrt-$(2)-header.bin) $(call Image/Build/CyberTAN2,$(1),$(2),$(3),$(4),$(5),$(if $(6),$(6)))