X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fimage%2FMakefile;h=dc55445dfbefcf32a7bf93c597dacefbf269569c;hp=2671536e8425accdda5b463cda9483ac33eea7e9;hb=7f787707de0a31653229bcc7faa022fa5f9c5914;hpb=314bce63e6a510e0b47c70c72293a1a094a7cac7

diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 2671536e84..dc55445dfb 100644
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -28,7 +28,7 @@ define trxalign/squashfs
 endef
 
 define Image/LimitName16
-$(shell expr substr "$(1)" 1 $$(expr length "$(1)"))
+$(shell expr substr "$(1)" 1 16)
 endef
 
 define Image/Build/CFE
@@ -44,11 +44,20 @@ endef
 define Image/Build/CFEFIXUP
 	# Generate the tagged image
 	$(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
-		--output $(BIN_DIR)/openwrt-$(4)-$(1)-cfe.bin \
-		--boardid $(2) --chipid $(3) --entry $(KERNEL_ENTRY) \
-		--load-addr $(LOADADDR) --rsa-signature "$(5)" \
-		--info1 "+$(call Image/LimitName16,$(4))" --info2 $(1) \
-		$(6) $(7) $(8) $(9)
+		--output $(BIN_DIR)/openwrt-$(5)-$(1)-cfe.bin \
+		--boardid $(2) --chipid $(4) --entry $(KERNEL_ENTRY) \
+		--load-addr $(LOADADDR) --rsa-signature "$(6)" \
+		--info1 "+$(call Image/LimitName16,$(3))" --info2 $(1) \
+		$(7) $(8) $(9) $(10)
+endef
+
+define Image/Build/CFEHW553
+	# Generate the tagged image
+	$(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
+		--output $(BIN_DIR)/openwrt-$(5)-$(1)-cfe.bin \
+		--boardid $(2) --chipid $(3) --entry $(LOADADDR) \
+		--load-addr $(LOADADDR) --tag-version 7 \
+		--block-size 0x20000 --image-offset $(4)
 endef
 
 define Image/Build/CFEAGPF
@@ -78,6 +87,21 @@ define Image/Build/RedBoot
 	dd if=$(KDIR)/vmlinux.bin.gz of=$(BIN_DIR)/openwrt-$(1)-vmlinux.gz bs=65536 conv=sync
 endef
 
+define Image/Build/SPW303V
+	# Generate the tagged image
+	$(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
+		--output $(BIN_DIR)/openwrt-$(4)-$(1)-cfe.bin.tmp \
+		--boardid $(2) --chipid $(3) --entry $(KERNEL_ENTRY) \
+		--load-addr $(LOADADDR) --rsa-signature "$(5)" \
+		$(6) $(7) $(8) $(9)
+	# Fix up header
+	$(STAGING_DIR_HOST)/bin/spw303v -i $(BIN_DIR)/openwrt-$(4)-$(1)-cfe.bin.tmp \
+		-o $(BIN_DIR)/openwrt-$(4)-$(1)-cfe-sysupgrade.bin
+	$(STAGING_DIR_HOST)/bin/xorimage -i $(BIN_DIR)/openwrt-$(4)-$(1)-cfe-sysupgrade.bin \
+		-o $(BIN_DIR)/openwrt-$(4)-$(1)-cfe-factory.bin
+	rm -f $(BIN_DIR)/openwrt-$(4)-$(1)-cfe.bin.tmp
+endef
+
 define Image/Build/CFEOLD
 	$(TOPDIR)/scripts/brcmImage.pl -t -p	\
 		-b $(2) -c $(3)			\
@@ -128,6 +152,8 @@ define Image/Build
 	$(call Image/Build/CFE,$(1),96348GW,6348,96348GW-bc221,,--layoutver 5)
 	$(call Image/Build/CFE,$(1),6338GW,6338,6338GW-generic,,)
 	$(call Image/Build/CFE,$(1),6338W,6338,6338W-generic,,)
+	$(call Image/Build/CFE,$(1),96348GW-11,6348,96348GW-11-gen)
+	$(call Image/Build/CFE,$(1),96348GW-10,6348,96348GW-10-gen)
 
 	# BT Voyager V210_BTR
 	$(call Image/Build/CFE,$(1),V210_BB,6348,BTV210_BTR,,--layoutver 5)
@@ -145,14 +171,16 @@ define Image/Build
 	$(call Image/Build/CFE,$(1),V2500V_BB,6348,BTV2500V,,--layoutver 5)
 	# RTA1025W_16 (numerous routers)
 	$(call Image/Build/CFE,$(1),RTA1025W_16,6348,RTA1025W_16,,--layoutver 5)
+	# RTA1320_16M (numerous routers)
+	$(call Image/Build/CFE,$(1),RTA1320_16M,6338,RTA1320_16M,,--layoutver 5)
 	# Tecom GW6000
-	$(call Image/Build/CFE,$(1),96348GW,6348,GW6000)
+	$(call Image/Build/CFEFIXUP,$(1),96348GW,GW6000,6348,GW6000)
 	# Tecom GW6200
-	$(call Image/Build/CFE,$(1),96348GW,6348,GW6200,$(shell printf '\x99'))
+	$(call Image/Build/CFEFIXUP,$(1),96348GW,GW6200,6348,GW6200,$(shell printf '\x99'))
 	# Neufbox4
 	$(call Image/Build/CFE,$(1),96358VW,6358,NEUFBOX4,OpenWRT-$(REVISION))
 	# Comtrend 536, 5621
-	$(call Image/Build/CFE,$(1),96348GW-11,6348,CT536_CT5621)
+	$(call Image/Build/CFEFIXUP,$(1),96348GW-11,CT536_CT5621,6348,CT536_CT5621)
 	# Davolink DV201AMR
 	$(call Image/Build/CFEOLD,$(1),DV201AMR,6348)
 	# USR 9108
@@ -161,10 +189,14 @@ define Image/Build
 	$(call Image/Build/CFE,$(1),96348GW-10,6348,DG834GT_DG834PN)
 	# Belkin f5d7633
 	$(call Image/Build/CFE,$(1),96348GW-10,6348,F5D7633)
-	# D-Link DSL-2640B
-	$(call Image/Build/CFE,$(1),D-4P-W,6348,DSL2640B)
+	# D-Link DSL-2640B, rev B2
+	$(call Image/Build/CFE,$(1),D-4P-W,6348,DSL2640B-B2)
 	# D-Link DSL-2740B/DSL-2741B, rev C2
-	$(call Image/Build/CFE,$(1),96358GW,6358,DSL274XB-C2)
+	$(call Image/Build/CFEFIXUP,$(1),96358GW,AW4139,6358,DSL274XB-C2)
+	# D-Link DSL-2740B/DSL-2741B, rev C3
+	$(call Image/Build/CFE,$(1),AW4139,6358,DSL274XB-C3)
+	# D-Link DVA-G3810BN/TL
+	$(call Image/Build/CFE,$(1),96358GW,6358,DVAG3810BN)
 
 	# TP-Link TD-8810A, TD-8810B, TD-8811A, TD-8811B
 	$(call Image/Build/CFE,$(1),8L-2M-8M,6338,TP8810_8811)
@@ -183,6 +215,10 @@ define Image/Build
 	$(call Image/Build/CFEAGPF,$(1),DWV-S0,6358,0x10000,A226G-cfe)
 	$(call Image/Build/CFEAGPF,$(1),DWV-S0,6358,0x10000,A226G)
 
+	# Pirelli A226M
+	$(call Image/Build/CFEAGPF,$(1),DWV-S0,6358,0x20000,A226M-cfe)
+	$(call Image/Build/CFEAGPF,$(1),DWV-S0,6358,0x20000,A226M)
+
 	# RG100A,DB120 etc.
 	$(call Image/Build/RG100A,$(1),96358VW2,6358,0x20000,RG100A_DB120)
 
@@ -190,7 +226,13 @@ define Image/Build
 	$(call Image/Build/CFE,$(1),CPVA642,6358,CPA-ZNTE60T,,--signature "Telsey Tlc",--signature2 "99.99.999",--second-image-flag "0")
 
 	# T-Com Speedport W 500V
-	$(call Image/Build/CFEFIXUP,$(1),96348GW,6348,SPW500V)
+	$(call Image/Build/CFEFIXUP,$(1),96348GW,SPW500V,6348,SPW500V)
+
+	#HW553
+	$(call Image/Build/CFEHW553,$(1),HW553,6358,0x20000,HW553)
+
+	# T-Com Speedport W 303V Typ B
+	$(call Image/Build/SPW303V,$(1),96358-502V,6358,SPW303V)
 endef
 
 $(eval $(call BuildImage))