Changeset 44560


Ignore:
Timestamp:
2015-02-27T18:38:51+01:00 (3 years ago)
Author:
jogo
Message:

brcm63xx: image: move image argument to front in *DTB calls

Signed-off-by: Jonas Gorski <jogo@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm63xx/image/Makefile

    r44559 r44560  
    5252define Image/Build/CFEDTB 
    5353        # Generate the tagged image 
    54         $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux-$(2).lzma.cfe -f $(KDIR)/root.$(1) \ 
    55                 --output $(BIN_DIR)/openwrt-$(5)-$(1)-cfe.bin \ 
    56                 --boardid $(3) --chipid $(4) --entry $(KERNEL_ENTRY) \ 
    57                 --load-addr $(LOADADDR) --info1 "-$(call Image/LimitName16,$(5))" \ 
     54        $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux-$(3).lzma.cfe -f $(KDIR)/root.$(1) \ 
     55                --output $(BIN_DIR)/openwrt-$(2)-$(1)-cfe.bin \ 
     56                --boardid $(4) --chipid $(5) --entry $(KERNEL_ENTRY) \ 
     57                --load-addr $(LOADADDR) --info1 "-$(call Image/LimitName16,$(2))" \ 
    5858                $(call rootfspad/$(1)) \ 
    5959                --info2 $(1) $(6) 
     
    6363        # Generate the tagged image 
    6464        $(TOPDIR)/scripts/brcmImage.pl -t -p \ 
    65                 -b $(3) -c $(4) -e $(KERNEL_ENTRY) -a $(LOADADDR) \ 
    66                 -k $(KDIR)/vmlinux-$(2).lzma.cfe -r $(KDIR)/root.$(1) \ 
    67                 -o $(BIN_DIR)/openwrt-$(5)-$(1)-cfe.bin $(6) 
     65                -b $(4) -c $(5) -e $(KERNEL_ENTRY) -a $(LOADADDR) \ 
     66                -k $(KDIR)/vmlinux-$(3).lzma.cfe -r $(KDIR)/root.$(1) \ 
     67                -o $(BIN_DIR)/openwrt-$(2)-$(1)-cfe.bin $(6) 
    6868endef 
    6969 
    7070define Image/Build/SPW303VCFEDTB 
    7171        # Generate the tagged image 
    72         $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux-$(2).lzma.cfe -f $(KDIR)/root.$(1) \ 
    73                 --output $(BIN_DIR)/openwrt-$(5)-$(1).tmp \ 
    74                 --boardid $(3) --chipid $(4) --entry $(KERNEL_ENTRY) \ 
     72        $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux-$(3).lzma.cfe -f $(KDIR)/root.$(1) \ 
     73                --output $(BIN_DIR)/openwrt-$(2)-$(1).tmp \ 
     74                --boardid $(4) --chipid $(5) --entry $(KERNEL_ENTRY) \ 
    7575                $(call rootfspad/$(1)) \ 
    7676                --load-addr $(LOADADDR) $(6) 
    7777        # Fix up header 
    78         $(STAGING_DIR_HOST)/bin/spw303v -i $(BIN_DIR)/openwrt-$(5)-$(1).tmp \ 
    79                 -o $(BIN_DIR)/openwrt-$(5)-$(1)-cfe-sysupgrade.bin 
    80         $(STAGING_DIR_HOST)/bin/xorimage -i $(BIN_DIR)/openwrt-$(5)-$(1)-cfe-sysupgrade.bin \ 
    81                 -o $(BIN_DIR)/openwrt-$(5)-$(1)-cfe-factory.bin 
    82         rm -f $(BIN_DIR)/openwrt-$(5)-$(1).tmp 
     78        $(STAGING_DIR_HOST)/bin/spw303v -i $(BIN_DIR)/openwrt-$(2)-$(1).tmp \ 
     79                -o $(BIN_DIR)/openwrt-$(2)-$(1)-cfe-sysupgrade.bin 
     80        $(STAGING_DIR_HOST)/bin/xorimage -i $(BIN_DIR)/openwrt-$(2)-$(1)-cfe-sysupgrade.bin \ 
     81                -o $(BIN_DIR)/openwrt-$(2)-$(1)-cfe-factory.bin 
     82        rm -f $(BIN_DIR)/openwrt-$(2)-$(1).tmp 
    8383endef 
    8484 
    8585define Image/Build/ZYXCFEDTB 
    8686        # Generate the tagged image 
    87         $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux-$(2).lzma.cfe -f $(KDIR)/root.$(1) \ 
    88                 --output $(BIN_DIR)/openwrt-$(5)-$(1).tmp \ 
    89                 --boardid $(3) --chipid $(4) --entry $(KERNEL_ENTRY) \ 
    90                 --load-addr $(LOADADDR) --info1 "-$(call Image/LimitName16,$(5))" \ 
     87        $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux-$(3).lzma.cfe -f $(KDIR)/root.$(1) \ 
     88                --output $(BIN_DIR)/openwrt-$(2)-$(1).tmp \ 
     89                --boardid $(4) --chipid $(5) --entry $(KERNEL_ENTRY) \ 
     90                --load-addr $(LOADADDR) --info1 "-$(call Image/LimitName16,$(2))" \ 
    9191                $(call rootfspad/$(1)) \ 
    9292                --info2 $(1) $(6) 
    9393        # Fix up header 
    94         $(STAGING_DIR_HOST)/bin/zyxbcm -i $(BIN_DIR)/openwrt-$(5)-$(1).tmp \ 
    95                 -o $(BIN_DIR)/openwrt-$(5)-$(1)-zyxcfe.bin 
    96         rm -f $(BIN_DIR)/openwrt-$(5)-$(1).tmp 
     94        $(STAGING_DIR_HOST)/bin/zyxbcm -i $(BIN_DIR)/openwrt-$(2)-$(1).tmp \ 
     95                -o $(BIN_DIR)/openwrt-$(2)-$(1)-zyxcfe.bin 
     96        rm -f $(BIN_DIR)/openwrt-$(2)-$(1).tmp 
    9797endef 
    9898 
    9999define Image/Build/RedBootDTB 
    100         gzip -9 -c $(KDIR)/vmlinux-$(2) > $(KDIR)/vmlinux-$(2).bin.gz 
    101         $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux-$(2) $(KDIR)/vmlinux-$(2).bin.l7 
    102         dd if=$(KDIR)/vmlinux-$(2).bin.l7 of=$(BIN_DIR)/openwrt-$(5)-vmlinux.lzma bs=65536 conv=sync 
    103         dd if=$(KDIR)/vmlinux-$(2).bin.gz of=$(BIN_DIR)/openwrt-$(5)-vmlinux.gz bs=65536 conv=sync 
     100        gzip -9 -c $(KDIR)/vmlinux-$(3) > $(KDIR)/vmlinux-$(3).bin.gz 
     101        $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux-$(3) $(KDIR)/vmlinux-$(3).bin.l7 
     102        dd if=$(KDIR)/vmlinux-$(3).bin.l7 of=$(BIN_DIR)/openwrt-$(2)-vmlinux.lzma bs=65536 conv=sync 
     103        dd if=$(KDIR)/vmlinux-$(3).bin.gz of=$(BIN_DIR)/openwrt-$(2)-vmlinux.gz bs=65536 conv=sync 
    104104endef 
    105105 
     
    175175# $(1) = Image build 
    176176# $(2) = Profile 
    177 # $(3) = dtb 
    178 # $(4) = boardname 
    179 # $(5) = chipid 
    180 # $(6) = imagename 
     177# $(3) = imagename 
     178# $(4) = dtb 
     179# $(5) = boardname 
     180# $(6) = chipid 
    181181# $(7) = additional options 
    182182define ImageDTB 
    183   define Image/Build/$(6) 
     183  define Image/Build/$(3) 
    184184        $$(call Image/Build/$(1),$$(1),$(3),$(4),$(5),$(6),$(7)) 
    185185  endef 
    186186 
    187   TARGET_Default_DTBS += $(3) 
    188   TARGET_Default_IMAGES += $(6) 
    189   TARGET_$(2)_DTBS += $(3) 
    190   TARGET_$(2)_IMAGES += $(6) 
     187  TARGET_Default_DTBS += $(4) 
     188  TARGET_Default_IMAGES += $(3) 
     189  TARGET_$(2)_DTBS += $(4) 
     190  TARGET_$(2)_IMAGES += $(3) 
    191191endef 
    192192 
     
    213213 
    214214# Generic 963281TAN 
    215 $(eval $(call ImageDTB,CFEDTB,963281TAN,bcm963281TAN,963281TAN,6328,963281TAN-4M-flash-generic,--pad 2)) 
    216 $(eval $(call ImageDTB,CFEDTB,963281TAN,bcm963281TAN,963281TAN,6328,963281TAN-8M-flash-generic,--pad 4)) 
    217 $(eval $(call ImageDTB,CFEDTB,963281TAN,bcm963281TAN,963281TAN,6328,963281TAN-16M-flash-generic,--pad 8)) 
     215$(eval $(call ImageDTB,CFEDTB,963281TAN,963281TAN-4M-flash-generic,bcm963281TAN,963281TAN,6328,--pad 2)) 
     216$(eval $(call ImageDTB,CFEDTB,963281TAN,963281TAN-8M-flash-generic,bcm963281TAN,963281TAN,6328,--pad 4)) 
     217$(eval $(call ImageDTB,CFEDTB,963281TAN,963281TAN-16M-flash-generic,bcm963281TAN,963281TAN,6328,--pad 8)) 
    218218# Generic 96328avng 
    219 $(eval $(call ImageDTB,CFEDTB,96328avng,bcm96328avng,96328avng,6328,96328avng-4M-flash-generic,--pad 2)) 
    220 $(eval $(call ImageDTB,CFEDTB,96328avng,bcm96328avng,96328avng,6328,96328avng-8M-flash-generic,--pad 4)) 
    221 $(eval $(call ImageDTB,CFEDTB,96328avng,bcm96328avng,96328avng,6328,96328avng-16M-flash-generic,--pad 8)) 
     219$(eval $(call ImageDTB,CFEDTB,96328avng,96328avng-4M-flash-generic,bcm96328avng,96328avng,6328,--pad 2)) 
     220$(eval $(call ImageDTB,CFEDTB,96328avng,96328avng-8M-flash-generic,bcm96328avng,96328avng,6328,--pad 4)) 
     221$(eval $(call ImageDTB,CFEDTB,96328avng,96328avng-16M-flash-generic,bcm96328avng,96328avng,6328,--pad 8)) 
    222222# Generic 96338GW 
    223 $(eval $(call ImageDTB,CFEDTB,96338GW,bcm96338GW,6338GW,6338,96338GW-generic)) 
     223$(eval $(call ImageDTB,CFEDTB,96338GW,96338GW-generic,bcm96338GW,6338GW,6338)) 
    224224# Generic 96338W 
    225 $(eval $(call ImageDTB,CFEDTB,96338W,bcm96338W,6338W,6338,96338W-generic)) 
     225$(eval $(call ImageDTB,CFEDTB,96338W,96338W-generic,bcm96338W,6338W,6338)) 
    226226# Generic 96345GW2 
    227 $(eval $(call ImageDTB,CFEDTB,96345GW2,bcm96345GW2,96345GW2,6345,96345GW2-generic)) 
    228 $(eval $(call ImageDTB,CFEDTB,96345GW2,bcm96345GW2,96345GW2,6345,96345GW2-bc221,--layoutver 5)) 
     227$(eval $(call ImageDTB,CFEDTB,96345GW2,96345GW2-generic,bcm96345GW2,96345GW2,6345)) 
     228$(eval $(call ImageDTB,CFEDTB,96345GW2,96345GW2-bc221,bcm96345GW2,96345GW2,6345,--layoutver 5)) 
    229229# Generic 96348GW 
    230 $(eval $(call ImageDTB,CFEDTB,96348GW,bcm96348GW,96348GW,6348,96348GW-generic)) 
    231 $(eval $(call ImageDTB,CFEDTB,96348GW,bcm96348GW,96348GW,6348,96348GW-bc221,--layoutver 5)) 
     230$(eval $(call ImageDTB,CFEDTB,96348GW,96348GW-generic,bcm96348GW,96348GW,6348)) 
     231$(eval $(call ImageDTB,CFEDTB,96348GW,96348GW-bc221,bcm96348GW,96348GW,6348,--layoutver 5)) 
    232232# Generic 96348GW-10 
    233 $(eval $(call ImageDTB,CFEDTB,96348GW_10,bcm96348GW-10,96348GW-10,6348,96348GW-10-generic)) 
     233$(eval $(call ImageDTB,CFEDTB,96348GW_10,96348GW-10-generic,bcm96348GW-10,96348GW-10,6348)) 
    234234# Generic 96348GW-11 
    235 $(eval $(call ImageDTB,CFEDTB,96348GW_11,bcm96348GW-11,96348GW-11,6348,96348GW-11-generic)) 
     235$(eval $(call ImageDTB,CFEDTB,96348GW_11,96348GW-11-generic,bcm96348GW-11,96348GW-11,6348)) 
    236236# Generic 96348R 
    237 $(eval $(call ImageDTB,CFEDTB,96348R,bcm96348R,96348R,6348,96348R-generic)) 
     237$(eval $(call ImageDTB,CFEDTB,96348R,96348R-generic,bcm96348R,96348R,6348)) 
    238238# Generic 96358VW 
    239 $(eval $(call ImageDTB,CFEDTB,96358VW,bcm96358VW,96358VW,6358,96358VW-generic)) 
     239$(eval $(call ImageDTB,CFEDTB,96358VW,96358VW-generic,bcm96358VW,96358VW,6358)) 
    240240# Generic 96358VW2 
    241 $(eval $(call ImageDTB,CFEDTB,96358VW2,bcm96358VW2,96358VW2,6358,96358VW2-generic)) 
     241$(eval $(call ImageDTB,CFEDTB,96358VW2,96358VW2-generic,bcm96358VW2,96358VW2,6358)) 
    242242# Generic 96368MVNgr 
    243 $(eval $(call ImageDTB,CFEDTB,96368MVNgr,bcm96368MVNgr,96368MVNgr,6368,96368MVNgr-generic)) 
     243$(eval $(call ImageDTB,CFEDTB,96368MVNgr,96368MVNgr-generic,bcm96368MVNgr,96368MVNgr,6368)) 
    244244# Generic 96368MVWG 
    245 $(eval $(call ImageDTB,CFEDTB,96368MVWG,bcm96368MVWG,96368MVWG,6368,96368MVWG-generic)) 
     245$(eval $(call ImageDTB,CFEDTB,96368MVWG,96368MVWG-generic,bcm96368MVWG,96368MVWG,6368)) 
    246246 
    247247# ADB P.DG A4001N 
    248 $(eval $(call ImageDTB,CFEDTB,A4001N,a4001n,96328dg2x2,6328,A4001N,--pad 8)) 
     248$(eval $(call ImageDTB,CFEDTB,A4001N,A4001N,a4001n,96328dg2x2,6328,--pad 8)) 
    249249# ADB P.DG A4001N1 
    250 $(eval $(call ImageDTB,CFEDTB,A4001N1,a4001n1,963281T_TEF,6328,A4001N1,--pad 8)) 
     250$(eval $(call ImageDTB,CFEDTB,A4001N1,A4001N1,a4001n1,963281T_TEF,6328,--pad 8)) 
    251251# Alcatel RG100A 
    252 $(eval $(call ImageDTB,CFEDTB,RG100A,rg100a,96358VW2,6358,RG100A,--block-size 0x20000 --image-offset 0x20000)) 
     252$(eval $(call ImageDTB,CFEDTB,RG100A,RG100A,rg100a,96358VW2,6358,--block-size 0x20000 --image-offset 0x20000)) 
    253253# Asmax AR 1004g 
    254 $(eval $(call ImageDTB,CFEDTB,AR1004G,ar1004g,96348GW-10,6348,AR1004G)) 
     254$(eval $(call ImageDTB,CFEDTB,AR1004G,AR1004G,ar1004g,96348GW-10,6348)) 
    255255# Belkin F5D7633 
    256 $(eval $(call ImageDTB,CFEDTB,F5D7633,f5d7633,96348GW-10,6348,F5D7633,--block-size 0x20000 --image-offset 0x20000)) 
     256$(eval $(call ImageDTB,CFEDTB,F5D7633,F5D7633,f5d7633,96348GW-10,6348,--block-size 0x20000 --image-offset 0x20000)) 
    257257# Comtrend AR-5381u 
    258 $(eval $(call ImageDTB,CFEDTB,AR5381u,ar-5381u,96328A-1241N,6328,AR-5381u,--pad 8)) 
     258$(eval $(call ImageDTB,CFEDTB,AR5381u,AR-5381u,ar-5381u,96328A-1241N,6328,--pad 8)) 
    259259# Comtrend AR-5387un 
    260 $(eval $(call ImageDTB,CFEDTB,AR5387un,ar-5387un,96328A-1441N1,6328,AR-5387un,--pad 8)) 
     260$(eval $(call ImageDTB,CFEDTB,AR5387un,AR-5387un,ar-5387un,96328A-1441N1,6328,--pad 8)) 
    261261# Comtrend 536, 5621 
    262 $(eval $(call ImageDTB,CFEDTB,CT536_CT5621,ct536plus,96348GW-11,6348,CT536_CT5621)) 
     262$(eval $(call ImageDTB,CFEDTB,CT536_CT5621,CT536_CT5621,ct536plus,96348GW-11,6348)) 
    263263# Comtrend CT-5365 
    264 $(eval $(call ImageDTB,CFEDTB,CT5365,ct-5365,96348A-122,6348,CT-5365)) 
     264$(eval $(call ImageDTB,CFEDTB,CT5365,CT-5365,ct-5365,96348A-122,6348)) 
    265265# Comtrend CT-6373 
    266 $(eval $(call ImageDTB,CFEDTB,CT6373,ct-6373,CT6373-1,6358,CT-6373)) 
     266$(eval $(call ImageDTB,CFEDTB,CT6373,CT-6373,ct-6373,CT6373-1,6358)) 
    267267# Comtrend VR-3025u 
    268 $(eval $(call ImageDTB,CFEDTB,VR3025u,vr-3025u,96368M-1541N,6368,VR-3025u,--pad 16 --image-offset 0x20000 --block-size 0x20000)) 
     268$(eval $(call ImageDTB,CFEDTB,VR3025u,VR-3025u,vr-3025u,96368M-1541N,6368,--pad 16 --image-offset 0x20000 --block-size 0x20000)) 
    269269# Comtrend VR-3025un 
    270 $(eval $(call ImageDTB,CFEDTB,VR3025un,vr-3025un,96368M-1341N,6368,VR-3025un,--pad 4)) 
     270$(eval $(call ImageDTB,CFEDTB,VR3025un,VR-3025un,vr-3025un,96368M-1341N,6368,--pad 4)) 
    271271# Comtrend WAP-5813n 
    272 $(eval $(call ImageDTB,CFEDTB,WAP5813n,wap-5813n,96369R-1231N,6368,WAP-5813n,--pad 4)) 
     272$(eval $(call ImageDTB,CFEDTB,WAP5813n,WAP-5813n,wap-5813n,96369R-1231N,6368,--pad 4)) 
    273273# D-Link DSL-2640B, rev B2 
    274 $(eval $(call ImageDTB,CFEDTB,DSL2640B_B,dsl-2640b-b,D-4P-W,6348,DSL2640B-B2)) 
     274$(eval $(call ImageDTB,CFEDTB,DSL2640B-B2,DSL2640B_B,dsl-2640b-b,D-4P-W,6348)) 
    275275# D-Link DSL-2650U 
    276 $(eval $(call ImageDTB,CFEDTB,DSL2650U,dsl-2650u,96358VW2,6358,DSL2650U)) 
     276$(eval $(call ImageDTB,CFEDTB,DSL2650U,DSL2650U,dsl-2650u,96358VW2,6358)) 
    277277# D-Link DSL-2740B/DSL-2741B, rev C2 
    278 $(eval $(call ImageDTB,CFEDTB,DSL274XB_C,dsl-274xb-c,96358GW,6358,DSL274XB-C2)) 
     278$(eval $(call ImageDTB,CFEDTB,DSL274XB_C,DSL274XB-C2,dsl-274xb-c,96358GW,6358)) 
    279279# D-Link DSL-2740B/DSL-2741B, rev C3 
    280 $(eval $(call ImageDTB,CFEDTB,DSL274XB_C,dsl-274xb-c,AW4139,6358,DSL274XB-C3)) 
     280$(eval $(call ImageDTB,CFEDTB,DSL274XB_C,DSL274XB-C3,dsl-274xb-c,AW4139,6358)) 
    281281# D-Link DSL-2740B/DSL-2741B, rev F1 
    282 $(eval $(call ImageDTB,CFEDTB,DSL274XB_F,dsl-274xb-f,AW4339U,6328,DSL274XB-F1-EU,--signature2 "4.06.01.EUF1" --pad 4)) 
    283 $(eval $(call ImageDTB,CFEDTB,DSL274XB_F,dsl-274xb-f,AW4339U,6328,DSL274XB-F1-AU,--signature2 "4.06.01.AUF1" --pad 4)) 
     282$(eval $(call ImageDTB,CFEDTB,DSL274XB_F,DSL274XB-F1-EU,dsl-274xb-f,AW4339U,6328,--signature2 "4.06.01.EUF1" --pad 4)) 
     283$(eval $(call ImageDTB,CFEDTB,DSL274XB_F,DSL274XB-F1-AU,dsl-274xb-f,AW4339U,6328,--signature2 "4.06.01.AUF1" --pad 4)) 
    284284# D-Link DVA-G3810BN/TL 
    285 $(eval $(call ImageDTB,CFEDTB,DVAG3810BN,dva-g3810bn_tl,96358VW,6358,DVAG3810BN)) 
     285$(eval $(call ImageDTB,CFEDTB,DVAG3810BN,DVAG3810BN,dva-g3810bn_tl,96358VW,6358)) 
    286286# Davolink DV-201AMR 
    287 $(eval $(call ImageDTB,OLDCFEDTB,DV201AMR,dv-201amr,DV201AMR,6348,DV-201AMR)) 
     287$(eval $(call ImageDTB,OLDCFEDTB,DV201AMR,DV-201AMR,dv-201amr,DV201AMR,6348)) 
    288288# Huawei HG520v 
    289 $(eval $(call ImageDTB,CFEDTB,HG520v,hg520v,HW6358GW_B,6358,HG520v,--rsa-signature "EchoLife_HG520v")) 
     289$(eval $(call ImageDTB,CFEDTB,HG520v,HG520v,hg520v,HW6358GW_B,6358,--rsa-signature "EchoLife_HG520v")) 
    290290# Huawei HG553 
    291 $(eval $(call ImageDTB,CFEDTB,HG553,hg553,HW553,6358,HG553,--rsa-signature "EchoLife_HG553" --image-offset 0x20000 --block-size 0x20000 --tag-version 7)) 
     291$(eval $(call ImageDTB,CFEDTB,HG553,HG553,hg553,HW553,6358,--rsa-signature "EchoLife_HG553" --image-offset 0x20000 --block-size 0x20000 --tag-version 7)) 
    292292# Huawei HG556a 
    293 $(eval $(call ImageDTB,CFEDTB,HG556a_AB,hg556a-a,HW556,6358,HG556a_A,--rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x10000 --tag-version 8)) 
    294 $(eval $(call ImageDTB,CFEDTB,HG556a_AB,hg556a-b,HW556,6358,HG556a_B,--rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x20000 --tag-version 8)) 
    295 $(eval $(call ImageDTB,CFEDTB,HG556a_C,hg556a-c,HW556,6358,HG556a_C,--rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x20000 --tag-version 8)) 
     293$(eval $(call ImageDTB,CFEDTB,HG556a_AB,HG556a_A,hg556a-a,HW556,6358,--rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x10000 --tag-version 8)) 
     294$(eval $(call ImageDTB,CFEDTB,HG556a_AB,HG556a_B,hg556a-b,HW556,6358,--rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x20000 --tag-version 8)) 
     295$(eval $(call ImageDTB,CFEDTB,HG556a_C,HG556a_C,hg556a-c,HW556,6358,--rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x20000 --tag-version 8)) 
    296296# Inventel Livebox 1 
    297 $(eval $(call ImageDTB,RedBootDTB,Livebox,livebox-blue-5g,,,livebox)) 
     297$(eval $(call ImageDTB,RedBootDTB,Livebox,livebox,livebox-blue-5g)) 
    298298# Netgear DG834GT/PN 
    299 $(eval $(call ImageDTB,CFEDTB,DG834GTPN,dg834gtpn,96348GW-10,6348,DG834GT_PN)) 
     299$(eval $(call ImageDTB,CFEDTB,DG834GTPN,DG834GT_PN,dg834gtpn,96348GW-10,6348)) 
    300300# Pirelli Alice Gate VoIP 2 Plus Wi-Fi AGPF-S0 
    301 $(eval $(call ImageDTB,CFEDTB,AGPF_S0,agpf-s0,AGPF-S0,6358,AGV2+W,--block-size 0x20000 --image-offset 0x20000 --signature2 IMAGE --tag-version 8)) 
     301$(eval $(call ImageDTB,CFEDTB,AGPF_S0,AGV2+W,agpf-s0,AGPF-S0,6358,--block-size 0x20000 --image-offset 0x20000 --signature2 IMAGE --tag-version 8)) 
    302302# Pirelli A226G 
    303 $(eval $(call ImageDTB,CFEDTB,A226G,a226g,DWV-S0,6358,A226G,--signature2 IMAGE --tag-version 8)) 
     303$(eval $(call ImageDTB,CFEDTB,A226G,A226G,a226g,DWV-S0,6358,--signature2 IMAGE --tag-version 8)) 
    304304# Pirelli A226M/A226M-FWB 
    305 $(eval $(call ImageDTB,CFEDTB,A226M,a226m,DWV-S0,6358,A226M,--signature2 IMAGE --tag-version 8)) 
    306 $(eval $(call ImageDTB,CFEDTB,A226M,a226m-fwb,DWV-S0,6358,A226M-FWB,--block-size 0x20000 --image-offset 0x20000 --signature2 IMAGE --tag-version 8)) 
     305$(eval $(call ImageDTB,CFEDTB,A226M,A226M,a226m,DWV-S0,6358,--signature2 IMAGE --tag-version 8)) 
     306$(eval $(call ImageDTB,CFEDTB,A226M,A226M-FWB,a226m-fwb,DWV-S0,6358,--block-size 0x20000 --image-offset 0x20000 --signature2 IMAGE --tag-version 8)) 
    307307# Sagem F@ST2404 
    308 $(eval $(call ImageDTB,CFEDTB,FAST2404,fast2404,F@ST2404,6348,F@ST2404)) 
     308$(eval $(call ImageDTB,CFEDTB,FAST2404,F@ST2404,fast2404,F@ST2404,6348)) 
    309309# Sagem F@ST2504n 
    310 $(eval $(call ImageDTB,CFEDTB,FAST2504n,fast2504n,F@ST2504n,6362,F@ST2504n)) 
     310$(eval $(call ImageDTB,CFEDTB,FAST2504n,F@ST2504n,fast2504n,F@ST2504n,6362)) 
    311311# Sagem F@ST2604 
    312 $(eval $(call ImageDTB,CFEDTB,FAST2604,fast2604,F@ST2604,6348,F@ST2604)) 
     312$(eval $(call ImageDTB,CFEDTB,FAST2604,F@ST2604,fast2604,F@ST2604,6348)) 
    313313# Sagem F@ST2704V2 
    314 $(eval $(call ImageDTB,CFEDTB,FAST2704V2,fast2704v2,F@ST2704V2,6328,F@ST2704V2)) 
     314$(eval $(call ImageDTB,CFEDTB,FAST2704V2,F@ST2704V2,fast2704v2,F@ST2704V2,6328)) 
    315315# SFR Neufbox 4 
    316 $(eval $(call ImageDTB,CFEDTB,Neufbox4,nb4-ser-r0,96358VW,6358,NEUFBOX4-SER,--rsa-signature "OpenWRT-$(REVISION)")) 
    317 $(eval $(call ImageDTB,CFEDTB,Neufbox4,nb4-fxc-r1,96358VW,6358,NEUFBOX4-FXC,--rsa-signature "OpenWRT-$(REVISION)")) 
     316$(eval $(call ImageDTB,CFEDTB,Neufbox4,NEUFBOX4-SER,nb4-ser-r0,96358VW,6358,--rsa-signature "OpenWRT-$(REVISION)")) 
     317$(eval $(call ImageDTB,CFEDTB,Neufbox4,NEUFBOX4-FXC,nb4-fxc-r1,96358VW,6358,--rsa-signature "OpenWRT-$(REVISION)")) 
    318318# SFR Neufbox 6 
    319 $(eval $(call ImageDTB,CFEDTB,Neufbox6,nb6-ser-r0,NB6-SER-r0,6362,NEUFBOX6,--rsa-signature "OpenWRT-$(REVISION)")) 
     319$(eval $(call ImageDTB,CFEDTB,Neufbox6,NEUFBOX6,nb6-ser-r0,NB6-SER-r0,6362,--rsa-signature "OpenWRT-$(REVISION)")) 
    320320# T-Com Speedport W 303V Typ B 
    321 $(eval $(call ImageDTB,SPW303VCFEDTB,SPW303V,spw303v,96358-502V,6358,SPW303V,--pad 4)) 
     321$(eval $(call ImageDTB,SPW303VCFEDTB,SPW303V,SPW303V,spw303v,96358-502V,6358,--pad 4)) 
    322322# T-Com Speedport W 500V 
    323 $(eval $(call ImageDTB,CFEDTB,SPW500V,spw500v,96348GW,6348,SPW500V)) 
     323$(eval $(call ImageDTB,CFEDTB,SPW500V,SPW500V,spw500v,96348GW,6348)) 
    324324# Tecom GW6000 
    325 $(eval $(call ImageDTB,CFEDTB,GW6000,gw6000,96348GW,6348,GW6000)) 
     325$(eval $(call ImageDTB,CFEDTB,GW6000,GW6000,gw6000,96348GW,6348)) 
    326326# Tecom GW6200 
    327 $(eval $(call ImageDTB,CFEDTB,GW6200,gw6200,96348GW,6348,GW6200,--rsa-signature "$(shell printf '\x99')")) 
     327$(eval $(call ImageDTB,CFEDTB,GW6200,GW6200,gw6200,96348GW,6348,--rsa-signature "$(shell printf '\x99')")) 
    328328# Telsey CPVA642-type (e.g. CPA-ZNTE60T) 
    329 $(eval $(call ImageDTB,CFEDTB,CPVA642,cpva642,CPVA642,6358,CPA-ZNTE60T,--signature "Telsey Tlc" --signature2 "99.99.999" --second-image-flag "0" --pad 4)) 
     329$(eval $(call ImageDTB,CFEDTB,CPVA642,CPA-ZNTE60T,cpva642,CPVA642,6358,--signature "Telsey Tlc" --signature2 "99.99.999" --second-image-flag "0" --pad 4)) 
    330330# TP-Link TD-W8900GB 
    331 $(eval $(call ImageDTB,CFEDTB,TDW8900GB,td-w8900gb,96348GW-11,6348,TD-W8900GB,--rsa-signature "$(shell printf 'PRID\x89\x10\x00\x02')" --image-offset 0x20000)) 
     331$(eval $(call ImageDTB,CFEDTB,TDW8900GB,TD-W8900GB,td-w8900gb,96348GW-11,6348,--rsa-signature "$(shell printf 'PRID\x89\x10\x00\x02')" --image-offset 0x20000)) 
    332332# USRobotics 9108 
    333 $(eval $(call ImageDTB,CFEDTB,USR9108,usr9108,96348GW-A,6348,USR9108)) 
     333$(eval $(call ImageDTB,CFEDTB,USR9108,USR9108,usr9108,96348GW-A,6348)) 
    334334# ZyXEL P870HW-51a v2 
    335 $(eval $(call ImageDTB,ZYXCFEDTB,P870HW_51a_v2,p870hw-51a-v2,96368VVW,6368,P870HW-51a_v2,--rsa-signature "ZyXEL" --signature "ZyXEL_0001")) 
     335$(eval $(call ImageDTB,ZYXCFEDTB,P870HW_51a_v2,96368VVW,p870hw-51a-v2,6368,P870HW-51a_v2,--rsa-signature "ZyXEL" --signature "ZyXEL_0001")) 
    336336 
    337337$(eval $(call BuildImage)) 
Note: See TracChangeset for help on using the changeset viewer.