projects / openwrt / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
brcm63xx: Add DT support for DV-201AMR
[openwrt/openwrt.git] / target / linux / brcm63xx / image / Makefile
diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 957ea9b326c23493c8e0b2a9e44a27b93e8a0385..fc290c660610bc413362cb1304714f50eef3df79 100755 (executable)
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -57,6 +57,13 @@ define Image/Build/CFEDTB
                $(7) $(8) $(9) $(10)
 endef
 
+define Image/Build/OLDCFEDTB
+       $(TOPDIR)/scripts/brcmImage.pl -t -p \
+               -b $(3) -c $(4) -e $(KERNEL_ENTRY) -a $(LOADADDR) \
+               -k $(KDIR)/vmlinux-$(2).lzma.cfe -r $(KDIR)/root.$(1) \
+               -o $(BIN_DIR)/openwrt-$(5)-$(1)-cfe.bin $(6)
+endef
+
 define Image/Build/ZYXCFEDTB
        # Generate the tagged image
        $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux-$(2).lzma.cfe -f $(KDIR)/root.$(1) \
@@ -71,25 +78,6 @@ define Image/Build/ZYXCFEDTB
        rm -f $(BIN_DIR)/openwrt-$(5)-$(1).tmp
 endef
 
-define Image/Build/CFEAGPF
-       # 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 8 \
-               --signature2 IMAGE --block-size 0x20000 \
-               --image-offset $(4) --info1 "-$(call Image/LimitName16,$(5))" --info2 $(1)
-endef
-
-define Image/Build/RG100A
-       # 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) --block-size 0x20000 \
-               --image-offset $(4) --info1 "-$(call Image/LimitName16,$(5))" --info2 $(1)
-endef
-
 define Image/Build/RedBoot
        cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(1)-vmlinux.elf
        gzip -9 -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
@@ -113,14 +101,6 @@ define Image/Build/SPW303V
        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)                 \
-               -k $(KDIR)/vmlinux.lzma.cfe     \
-               -r $(KDIR)/root.$(1)            \
-               -o $(BIN_DIR)/openwrt-$(2)-$(1)-cfe.bin
-endef
-
 define Image/Build/HCS
        $(STAGING_DIR_HOST)/bin/hcsmakeimage --magic_byte=$(3) \
                --rev_maj=$(4) --rev_min=$(5) --input_file=$(6) \
@@ -212,6 +192,23 @@ define CfeImageDTB
   TARGET_$(1)_IMAGES += $(5)
 endef
 
+# $(1) = Profile
+# $(2) = dtb
+# $(3) = boardname
+# $(4) = chipid
+# $(5) = imagename
+# $(6) = additional options
+define OldCfeImageDTB
+  define Image/Build/$(5)
+        $$(call Image/Build/OLDCFEDTB,$$(1),$(2),$(3),$(4),$(5),$(6))
+  endef
+
+  TARGET_Default_DTBS += $(2)
+  TARGET_Default_IMAGES += $(5)
+  TARGET_$(1)_DTBS += $(2)
+  TARGET_$(1)_IMAGES += $(5)
+endef
+
 # $(1) = Profile
 # $(2) = dtb
 # $(3) = boardname
@@ -233,11 +230,6 @@ 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),96358VW,6358,96358VW-generic)
-       $(call Image/Build/CFE,$(1),96358VW2,6358,96358VW2-generic)
-       $(call Image/Build/CFE,$(1),96368MVNgr,6368,96368MVNgr-generic)
-       $(call Image/Build/CFE,$(1),96368MVWG,6368,96368MVWG-generic)
 
        # BT Voyager V210_BTR
        $(call Image/Build/CFE,$(1),V210_BB,6348,BTV210_BTR,,--layoutver 5)
@@ -261,8 +253,6 @@ define Image/Build
        # Sagem F@ST2504n
        $(call Image/Build/CFE,$(1),F@ST2504n,6362,F@ST2504n,OpenWRT-$(REVISION))
 
-       # Davolink DV201AMR
-       $(call Image/Build/CFEOLD,$(1),DV201AMR,6348)
        # USR 9108
        $(call Image/Build/CFE,$(1),96348GW-A,6348,USR9108)
        # NetGear DG834GT, DG834PN
@@ -293,19 +283,6 @@ define Image/Build
        $(call Image/Build/CFE,$(1),F@ST2704V2,6328,F@ST2704V2,OpenWRT-$(REVISION))
        # Inventel Livebox
        $(call Image/Build/RedBoot,livebox)
-       # Pirelli Alice Gate VoIP 2 Plus Wi-Fi AGPF-S0
-       $(call Image/Build/CFEAGPF,$(1),AGPF-S0,6358,0x20000,AGV2+W-cfe)
-       $(call Image/Build/CFEAGPF,$(1),AGPF-S0,6358,0x20000,AGV2+W)
-       # Pirelli A226G
-       $(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)
 
        # 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")
@@ -348,11 +325,21 @@ $(eval $(call CfeImageDTB,96348GW_10,bcm96348GW-10,96348GW-10,6348,96348GW-10-ge
 $(eval $(call CfeImageDTB,96348GW_11,bcm96348GW-11,96348GW-11,6348,96348GW-11-generic))
 # Generic 96348R
 $(eval $(call CfeImageDTB,96348R,bcm96348R,96348R,6348,96348R-generic))
+# Generic 96358VW
+$(eval $(call CfeImageDTB,96358VW,bcm96358VW,96358VW,6358,96358VW-generic))
+# Generic 96358VW2
+$(eval $(call CfeImageDTB,96358VW2,bcm96358VW2,96358VW2,6358,96358VW2-generic))
+# Generic 96368MVNgr
+$(eval $(call CfeImageDTB,96368MVNgr,bcm96368MVNgr,96368MVNgr,6368,96368MVNgr-generic))
+# Generic 96368MVWG
+$(eval $(call CfeImageDTB,96368MVWG,bcm96368MVWG,96368MVWG,6368,96368MVWG-generic))
 
 # ADB P.DG A4001N
 $(eval $(call CfeImageDTB,A4001N,a4001n,96328dg2x2,6328,A4001N,,--pad 8))
 # ADB P.DG A4001N1
 $(eval $(call CfeImageDTB,A4001N1,a4001n1,963281T_TEF,6328,A4001N1,,--pad 8))
+# Alcatel RG100A
+$(eval $(call CfeImageDTB,RG100A,rg100a,96358VW2,6358,RG100A,,--block-size 0x20000 --image-offset 0x20000))
 # Asmax AR 1004g
 $(eval $(call CfeImageDTB,AR1004G,ar1004g,96348GW-10,6348,AR1004G))
 # Comtrend AR-5381u
@@ -377,6 +364,8 @@ $(eval $(call CfeImageDTB,DSL274XB_C,dsl-274xb-c,96358GW,6358,DSL274XB-C2))
 $(eval $(call CfeImageDTB,DSL274XB_C,dsl-274xb-c,AW4139,6358,DSL274XB-C3))
 # D-Link DVA-G3810BN/TL
 $(eval $(call CfeImageDTB,DVAG3810BN,dva-g3810bn_tl,96358VW,6358,DVAG3810BN))
+# Davolink DV-201AMR
+$(eval $(call OldCfeImageDTB,DV201AMR,dv-201amr,DV201AMR,6348,DV-201AMR))
 # Huawei HG520v
 $(eval $(call CfeImageDTB,HG520v,hg520v,HW6358GW_B,6358,HG520v,EchoLife_HG520v))
 # Huawei HG553
@@ -385,6 +374,13 @@ $(eval $(call CfeImageDTB,HG553,hg553,HW553,6358,HG553,EchoLife_HG553,--image-of
 $(eval $(call CfeImageDTB,HG556a_AB,hg556a-a,HW556,6358,HG556a_A,EchoLife_HG556a,--image-offset 0x20000 --block-size 0x10000 --tag-version 8))
 $(eval $(call CfeImageDTB,HG556a_AB,hg556a-b,HW556,6358,HG556a_B,EchoLife_HG556a,--image-offset 0x20000 --block-size 0x20000 --tag-version 8))
 $(eval $(call CfeImageDTB,HG556a_C,hg556a-c,HW556,6358,HG556a_C,EchoLife_HG556a,--image-offset 0x20000 --block-size 0x20000 --tag-version 8))
+# Pirelli Alice Gate VoIP 2 Plus Wi-Fi AGPF-S0
+$(eval $(call CfeImageDTB,AGPF_S0,agpf-s0,AGPF-S0,6358,AGV2+W,,--block-size 0x20000 --image-offset 0x20000 --signature2 IMAGE --tag-version 8))
+# Pirelli A226G
+$(eval $(call CfeImageDTB,A226G,a226g,DWV-S0,6358,A226G,,--signature2 IMAGE --tag-version 8))
+# Pirelli A226M/A226M-FWB
+$(eval $(call CfeImageDTB,A226M,a226m,DWV-S0,6358,A226M,,--signature2 IMAGE --tag-version 8))
+$(eval $(call CfeImageDTB,A226M,a226m-fwb,DWV-S0,6358,A226M-FWB,,--block-size 0x20000 --image-offset 0x20000 --signature2 IMAGE --tag-version 8))
 # T-Com Speedport W 500V
 $(eval $(call CfeImageDTB,SPW500V,spw500v,96348GW,6348,SPW500V))
 # Tecom GW6000
OpenWrt Source Repository