summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-05-11 13:33:41 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-05-11 13:33:41 +0000
commita49f5b3910144b2d207d633b48c8c46e206051dd (patch)
treed5f8b7e7bb6219609ec59b2a9b6b20218a09f9df
parentfcef96a4885f7f50135e2124348503ded4662149 (diff)
bcm63xx: Decouple Board ID and image name for fixup
Make the fixup board ID independent from the image name to allow using the same board ID for similar devices. Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26874 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm63xx/image/Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 448389d24..22d297137 100644
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -44,11 +44,11 @@ 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
@@ -159,13 +159,13 @@ define Image/Build
# RTA1320_16M (numerous routers)
$(call Image/Build/CFE,$(1),RTA1320_16M,6338,RTA1320_16M,,--layoutver 5)
# Tecom GW6000
- $(call Image/Build/CFEFIXUP,$(1),96348GW,6348,GW6000)
+ $(call Image/Build/CFEFIXUP,$(1),96348GW,GW6000,6348,GW6000)
# Tecom GW6200
- $(call Image/Build/CFEFIXUP,$(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/CFEFIXUP,$(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
@@ -203,7 +203,7 @@ 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)