projects / openwrt / svn-archive / archive.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
brcm63xx: use dtb board detection for neufbox 4
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / image / Makefile
diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 705515c88b1653b2d7549e70fb5fbdad8cf786ae..096da43527627eacd1c8d542b97eccd8e6cfd842 100755 (executable)
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -33,6 +33,8 @@ endef
 
 TARGET_DTBS:=
 
+TARGET_IMAGES:=
+
 define Image/Build/CFE
        # Generate the tagged image
        $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
@@ -43,6 +45,16 @@ define Image/Build/CFE
                $(6) $(7) $(8) $(9)
 endef
 
+define Image/Build/CFEDTB
+       # Generate the tagged image
+       $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux-$(2).lzma.cfe -f $(KDIR)/root.$(1) \
+               --output $(BIN_DIR)/openwrt-$(5)-$(1)-cfe.bin \
+               --boardid $(3) --chipid $(4) --entry $(KERNEL_ENTRY) \
+               --load-addr $(LOADADDR) --rsa-signature "$(6)" \
+               --info1 "-$(call Image/LimitName16,$(5))" --info2 $(1) \
+               $(7) $(8) $(9) $(10)
+endef
+
 define Image/Build/CFEFIXUP
        # Generate the tagged image
        $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
@@ -62,15 +74,6 @@ define Image/Build/CFEHW553
                --block-size 0x20000 --image-offset $(4)
 endef
 
-define Image/Build/CFEHW556
-       # Generate the tagged image
-       $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
-       --output $(BIN_DIR)/openwrt-$(2)-$(1)-cfe.bin \
-       --boardid $(2) --chipid $(3) --entry $(LOADADDR) \
-       --load-addr $(LOADADDR) --tag-version 8 --rsa-signature "$(5)" \
-       --image-offset $(4) --info1 "$(6)" --block-size 0x20000
-endef
-
 define Image/Build/CFEAGPF
        # Generate the tagged image
        $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
@@ -208,12 +211,28 @@ define Image/Build/Initramfs
        $(call Image/Build/HCS,initramfs,cvg834g,a020,0001,0022,$(KDIR)/vmlinux-initramfs)
 endef
 
+define CfeImageDTB
+  define Image/Build/$(4)
+       $$(call Image/Build/CFEDTB,$$(1),$(1),$(2),$(3),$(4),$(5),$(6))
+  endef
+
+  TARGET_DTBS += $(1)
+  TARGET_IMAGES += $(4)
+endef
+
+define HW556ImageDTB
+  define Image/Build/$(2)
+       $$(call Image/Build/CFEDTB,$$(1),$(1),HW556,6358,$(2),EchoLife_HG556a,--image-offset 0x20000 --block-size 0x20000 --tag-version 8)
+  endef
+
+  TARGET_DTBS += $(1)
+  TARGET_IMAGES += $(2)
+endef
+
+
 define Image/Build
        dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
        # Various routers
-       $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-4M-flash-generic,,--pad 2)
-       $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-8M-flash-generic,,--pad 4)
-       $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-16M-flash-generic,,--pad 8)
        $(call Image/Build/CFE,$(1),963281TAN,6328,963281TAN-4M-flash-generic,,--pad 2)
        $(call Image/Build/CFE,$(1),963281TAN,6328,963281TAN-8M-flash-generic,,--pad 4)
        $(call Image/Build/CFE,$(1),963281TAN,6328,963281TAN-16M-flash-generic,,--pad 8)
@@ -237,8 +256,6 @@ define Image/Build
        $(call Image/Build/CFE,$(1),96328dg2x2,6328,A4001N,,--pad 4)
        # ADB P.DG A4001N1
        $(call Image/Build/CFE,$(1),963281T_TEF,6328,A4001N1,,--pad 8)
-       # Asmax AR 1004g
-       $(call Image/Build/CFEFIXUP,$(1),96348GW-10,AR1004G,6348,AR1004G)
        # BT Voyager V210_BTR
        $(call Image/Build/CFE,$(1),V210_BB,6348,BTV210_BTR,,--layoutver 5)
        # BT Voyager V210_ROI, V210_WB
@@ -257,25 +274,14 @@ define Image/Build
        $(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/CFEFIXUP,$(1),96348GW,GW6000,6348,GW6000)
-       # Tecom GW6200
-       $(call Image/Build/CFEFIXUP,$(1),96348GW,GW6200,6348,GW6200,$(shell printf '\x99'))
-       # Neufbox4
-       $(call Image/Build/CFE,$(1),96358VW,6358,NEUFBOX4,OpenWRT-$(REVISION))
        # Zyxel P870HW-51a v2
        $(call Image/Build/ZyXEL,$(1),96368VVW,P870HW-51a_v2,6368,P870HW-51a_v2,ZyXEL,--signature "ZyXEL_0001")
 
-       # Neufbox6
-       $(call Image/Build/CFE,$(1),NB6-SER-r0,6362,NEUFBOX6,OpenWRT-$(REVISION))
-
        # Sagem F@ST2504n
        $(call Image/Build/CFE,$(1),F@ST2504n,6362,F@ST2504n,OpenWRT-$(REVISION))
 
        # Comtrend 6373
        $(call Image/Build/CFE,$(1),CT6373-1,6358,CT6373)
-       # Comtrend 536, 5621
-       $(call Image/Build/CFEFIXUP,$(1),96348GW-11,CT536_CT5621,6348,CT536_CT5621)
        # Comtrend AR-5381u
        $(call Image/Build/CFE,$(1),96328A-1241N,6328,AR-5381u,,--pad 8)
        # Comtrend AR-5387un
@@ -298,15 +304,9 @@ define Image/Build
        $(call Image/Build/CFE,$(1),D-4P-W,6348,DSL2640B-B2)
        # D-Link DSL-2650U
        $(call Image/Build/CFE,$(1),96358VW2,6358,DSL2650U)
-       # D-Link DSL-2740B/DSL-2741B, rev 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 DSL-2740B/DSL-2741B, rev F1
        $(call Image/Build/CFE,$(1),AW4339U,6328,DSL274XB-F1-EU,,--signature2="4.06.01.EUF1" --pad 4)
        $(call Image/Build/CFE,$(1),AW4339U,6328,DSL274XB-F1-AU,,--signature2="4.06.01.AUF1" --pad 4)
-       # D-Link DVA-G3810BN/TL
-       $(call Image/Build/CFEFIXUP,$(1),96358VW,DVAG3810BN,6358,DVAG3810BN)
 
        # TP-Link TD-8810A, TD-8810B, TD-8811A, TD-8811B
        $(call Image/Build/CFE,$(1),8L-2M-8M,6338,TP8810_8811)
@@ -341,27 +341,56 @@ define Image/Build
        # 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")
 
-       # T-Com Speedport W 500V
-       $(call Image/Build/CFEFIXUP,$(1),96348GW,SPW500V,6348,SPW500V)
-
        # Huawei HW520
        $(call Image/Build/CFE,$(1),HW6358GW_B,6358,HW520,EchoLife_HG520v)
 
        #HW553
        $(call Image/Build/CFEHW553,$(1),HW553,6358,0x20000,HW553)
 
-       #HW556
-       $(call Image/Build/CFEHW556,$(1),HW556,6358,0x20000,EchoLife_HG556a,OpenWRT-$(REVISION))
-
        # T-Com Speedport W 303V Typ B
        $(call Image/Build/SPW303V,$(1),96358-502V,6358,SPW303V)
 
        # Netgear CVG834G
        $(call Image/Build/HCS,$(1),cvg834g,a020,0001,0022,$(KDIR)/vmlinux)
 
+       # build dtb image list
+       $(foreach image,$(TARGET_IMAGES),$(call Image/Build/$(image),$(1)))
+
   ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
        $(call Image/Build/Initramfs)
   endif
 endef
 
+$(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-4M-flash-generic,,--pad 2))
+$(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-8M-flash-generic,,--pad 4))
+$(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-16M-flash-generic,,--pad 8))
+
+# Asmax AR 1004g
+$(eval $(call CfeImageDTB,ar1004g,96348GW-10,6348,AR1004G))
+# Comtrend 536, 5621
+$(eval $(call CfeImageDTB,ct536plus,96348GW-11,6348,CT536_CT5621))
+# Tecom GW6000
+$(eval $(call CfeImageDTB,gw6000,96348GW,6348,GW6000))
+# Tecom GW6200
+$(eval $(call CfeImageDTB,gw6200,96348GW,6348,GW6200,$(shell printf '\x99')))
+# T-Com Speedport W 500V
+$(eval $(call CfeImageDTB,spw500v,96348GW,6348,SPW500V))
+# D-Link DSL-2740B/DSL-2741B, rev C2
+$(eval $(call CfeImageDTB,dsl-274xb-c,96358GW,6358,DSL274XB-C2))
+# D-Link DSL-2740B/DSL-2741B, rev C3
+$(eval $(call CfeImageDTB,dsl-274xb-c,AW4139,6358,DSL274XB-C3))
+# D-Link DVA-G3810BN/TL
+$(eval $(call CfeImageDTB,dva-g3810bn_tl,96358VW,6358,DVAG3810BN))
+# Huawei HW556
+$(eval $(call HW556ImageDTB,hg556a-a,HW556-A))
+$(eval $(call HW556ImageDTB,hg556a-b,HW556-B))
+$(eval $(call HW556ImageDTB,hg556a-c,HW556-C))
+
+# SFR Neufbox 4
+$(eval $(call CfeImageDTB,nb4-ser-r0,96358VW,6358,NEUFBOX4-SER,OpenWRT-$(REVISION)))
+$(eval $(call CfeImageDTB,nb4-fxc-r1,96358VW,6358,NEUFBOX4-FXC,OpenWRT-$(REVISION)))
+
+# SFR neufbox 6
+$(call $(call CfeImageDTB,nb6-ser-r0,NB6-SER-r0,6362,NEUFBOX6,OpenWRT-$(REVISION)))
+
 $(eval $(call BuildImage))
OpenWrt SVN history