X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/33d20e9dce82c6a2cfa04bf62c558d591a17ae3d..0760ba4d65d581475ed46d86c4e6cf5a7674e83b:/target/linux/brcm63xx/image/Makefile

diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 56d048bbb..be96a5f16 100644
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -27,13 +27,17 @@ define trxalign/squashfs
 -a 1024
 endef
 
+define Image/LimitName16
+$(shell expr substr "$(1)" 1 $$(expr length "$(1)"))
+endef
+
 define Image/Build/CFE
 	# 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 "$(4) $(REVISION)" --info2 $(1) \
+		--info1 "$(call Image/LimitName16,$(4))" --info2 $(1) \
 		$(6) $(7) $(8) $(9)
 endef
 
@@ -44,7 +48,7 @@ define Image/Build/CFEAGPF
 		--boardid $(2) --chipid $(3) --entry $(LOADADDR) \
 		--load-addr $(LOADADDR) --tag-version 8 \
 		--signature2 IMAGE --block-size 0x20000 \
-		--image-offset $(4) --info1 "$(5) $(REVISION)" --info2 $(1)
+		--image-offset $(4) --info1 "$(call Image/LimitName16,$(5))" --info2 $(1)
 endef
 
 define Image/Build/RG100A
@@ -53,7 +57,7 @@ define Image/Build/RG100A
 		--output $(BIN_DIR)/openwrt-$(5)-$(1)-cfe.bin \
 		--boardid $(2) --chipid $(3) --entry $(LOADADDR) \
 		--load-addr $(LOADADDR) --block-size 0x20000 \
-		--image-offset $(4) --info1 "$(5) $(REVISION)" --info2 $(1)
+		--image-offset $(4) --info1 "$(call Image/LimitName16,$(5))" --info2 $(1)
 endef
 
 define Image/Build/RedBoot
@@ -109,7 +113,7 @@ define Image/Build
 	# Various routers
 	$(call Image/Build/CFE,$(1),96345GW2,6345,96345GW2-generic)
 	$(call Image/Build/CFE,$(1),96345GW2,6345,96348GW2-bc221,,--layoutver 5)
-	$(call Image/Build/CFE,$(1),96345GW2,6345,92345GW2-revision,OpenWRT-$(REVISION))
+	$(call Image/Build/CFE,$(1),96345GW2,6345,92345GW2-rev,OpenWRT-$(REVISION))
 	$(call Image/Build/CFE,$(1),96348GW,6348,96348GW-generic,,)
 	$(call Image/Build/CFE,$(1),96348GW,6348,96348GW-bc221,,--layoutver 5)
 	$(call Image/Build/CFE,$(1),6338GW,6338,6338GW-generic,,)
@@ -172,6 +176,9 @@ define Image/Build
 	# RG100A,DB120 etc.
 	$(call Image/Build/RG100A,$(1),96358VW2,6358,0x20000,RG100A_DB120)
 
+	# Telsey CPVA642-type (e.g. CPA-ZNTE60T)
+	$(call Image/Build/CFE,$(1),CPVA642,6358,CPA-ZNTE60T,,--signature "Telsey Tlc",--signature2 "99.99.999",--second-image-flag "0")
+
 endef
 
 $(eval $(call BuildImage))