Changeset 42210


Ignore:
Timestamp:
2014-08-18T23:50:42+02:00 (3 years ago)
Author:
jogo
Message:

brcm63xx: tag images/dtbs with profiles

This prevents generating every supported image, except for de "Default" profile.
Also fixes Neufbox 6 image generation.

Signed-off-by: Álvaro Fernández Rojas <noltari@…>
Signed-off-by: Jonas Gorski <jogo@…>

File:
1 edited

Legend:

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

    r42207 r42210  
    3333 
    3434TARGET_DTBS:= 
    35  
    3635TARGET_IMAGES:= 
     36 
     37TARGET_Default_DTBS:= 
     38TARGET_Default_IMAGES:= 
    3739 
    3840define Image/Build/CFE 
     
    186188        $(call Image/PrepareCFELzmaKernel,) 
    187189 
    188         $(foreach board,$(sort $(TARGET_DTBS)), $(call Image/PrepareCFELzmaKernelDTB,$(board))) 
     190        $(foreach board,$(sort $(TARGET_$(PROFILE)_DTBS)), $(call Image/PrepareCFELzmaKernelDTB,$(board))) 
    189191 
    190192 ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) 
    191193        $(call Image/PrepareLoader,-initramfs) 
    192         $(foreach board,$(sort $(TARGET_DTBS)), $(call Image/PrepareLoaderDTB,-initramfs,$(board))) 
     194        $(foreach board,$(sort $(TARGET_$(PROFILE)_DTBS)), $(call Image/PrepareLoaderDTB,-initramfs,$(board))) 
    193195 endif 
    194196        rm -f $(KDIR)/fs_mark 
     
    202204endef 
    203205 
     206# $(1) = Profile 
     207# $(2) = dtb 
     208# $(3) = boardname 
     209# $(4) = chipid 
     210# $(5) = imagename 
     211# $(6) = rsa signature 
     212# $(7) = additional options 
    204213define CfeImageDTB 
    205   define Image/Build/$(4) 
    206         $$(call Image/Build/CFEDTB,$$(1),$(1),$(2),$(3),$(4),$(5),$(6)) 
     214  define Image/Build/$(5) 
     215        $$(call Image/Build/CFEDTB,$$(1),$(2),$(3),$(4),$(5),$(6),$(7)) 
    207216  endef 
    208217 
    209   TARGET_DTBS += $(1) 
    210   TARGET_IMAGES += $(4) 
     218  TARGET_Default_DTBS += $(2) 
     219  TARGET_Default_IMAGES += $(5) 
     220  TARGET_$(1)_DTBS += $(2) 
     221  TARGET_$(1)_IMAGES += $(5) 
    211222endef 
    212223 
     
    336347 
    337348        # build dtb image list 
    338         $(foreach image,$(TARGET_IMAGES),$(call Image/Build/$(image),$(1))) 
     349        $(foreach image,$(TARGET_$(PROFILE)_IMAGES),$(call Image/Build/$(image),$(1))) 
    339350 
    340351  ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) 
     
    343354endef 
    344355 
    345 $(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-4M-flash-generic,,--pad 2)) 
    346 $(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-8M-flash-generic,,--pad 4)) 
    347 $(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-16M-flash-generic,,--pad 8)) 
     356# Generic 96328avng 
     357$(eval $(call CfeImageDTB,96328avng,bcm96328avng,96328avng,6328,96328avng-4M-flash-generic,,--pad 2)) 
     358$(eval $(call CfeImageDTB,96328avng,bcm96328avng,96328avng,6328,96328avng-8M-flash-generic,,--pad 4)) 
     359$(eval $(call CfeImageDTB,96328avng,bcm96328avng,96328avng,6328,96328avng-16M-flash-generic,,--pad 8)) 
    348360 
    349361# Asmax AR 1004g 
    350 $(eval $(call CfeImageDTB,ar1004g,96348GW-10,6348,AR1004G)) 
     362$(eval $(call CfeImageDTB,AR1004G,ar1004g,96348GW-10,6348,AR1004G)) 
    351363# Comtrend 536, 5621 
    352 $(eval $(call CfeImageDTB,ct536plus,96348GW-11,6348,CT536_CT5621)) 
     364$(eval $(call CfeImageDTB,CT536_CT5621,ct536plus,96348GW-11,6348,CT536_CT5621)) 
     365# D-Link DSL-2740B/DSL-2741B, rev C2 
     366$(eval $(call CfeImageDTB,DSL274XB_C,dsl-274xb-c,96358GW,6358,DSL274XB-C2)) 
     367# D-Link DSL-2740B/DSL-2741B, rev C3 
     368$(eval $(call CfeImageDTB,DSL274XB_C,dsl-274xb-c,AW4139,6358,DSL274XB-C3)) 
     369# D-Link DVA-G3810BN/TL 
     370$(eval $(call CfeImageDTB,DVAG3810BN,dva-g3810bn_tl,96358VW,6358,DVAG3810BN)) 
     371# Huawei HG556a 
     372$(eval $(call CfeImageDTB,HG556a_AB,hg556a-a,HW556,6358,HG556a_A,EchoLife_HG556a,--image-offset 0x20000 --block-size 0x10000 --tag-version 8)) 
     373$(eval $(call CfeImageDTB,HG556a_AB,hg556a-b,HW556,6358,HG556a_B,EchoLife_HG556a,--image-offset 0x20000 --block-size 0x20000 --tag-version 8)) 
     374$(eval $(call CfeImageDTB,HG556a_C,hg556a-c,HW556,6358,HG556a_C,EchoLife_HG556a,--image-offset 0x20000 --block-size 0x20000 --tag-version 8)) 
     375# T-Com Speedport W 500V 
     376$(eval $(call CfeImageDTB,SPW500V,spw500v,96348GW,6348,SPW500V)) 
    353377# Tecom GW6000 
    354 $(eval $(call CfeImageDTB,gw6000,96348GW,6348,GW6000)) 
     378$(eval $(call CfeImageDTB,GW6000,gw6000,96348GW,6348,GW6000)) 
    355379# Tecom GW6200 
    356 $(eval $(call CfeImageDTB,gw6200,96348GW,6348,GW6200,$(shell printf '\x99'))) 
    357 # T-Com Speedport W 500V 
    358 $(eval $(call CfeImageDTB,spw500v,96348GW,6348,SPW500V)) 
    359 # D-Link DSL-2740B/DSL-2741B, rev C2 
    360 $(eval $(call CfeImageDTB,dsl-274xb-c,96358GW,6358,DSL274XB-C2)) 
    361 # D-Link DSL-2740B/DSL-2741B, rev C3 
    362 $(eval $(call CfeImageDTB,dsl-274xb-c,AW4139,6358,DSL274XB-C3)) 
    363 # D-Link DVA-G3810BN/TL 
    364 $(eval $(call CfeImageDTB,dva-g3810bn_tl,96358VW,6358,DVAG3810BN)) 
    365 # Huawei HG556a 
    366 $(eval $(call CfeImageDTB,hg556a-a,HW556,6358,HG556a_A,EchoLife_HG556a,--image-offset 0x20000 --block-size 0x10000 --tag-version 8)) 
    367 $(eval $(call CfeImageDTB,hg556a-b,HW556,6358,HG556a_B,EchoLife_HG556a,--image-offset 0x20000 --block-size 0x20000 --tag-version 8)) 
    368 $(eval $(call CfeImageDTB,hg556a-c,HW556,6358,HG556a_C,EchoLife_HG556a,--image-offset 0x20000 --block-size 0x20000 --tag-version 8)) 
    369  
     380$(eval $(call CfeImageDTB,GW6200,gw6200,96348GW,6348,GW6200,$(shell printf '\x99'))) 
    370381# SFR Neufbox 4 
    371 $(eval $(call CfeImageDTB,nb4-ser-r0,96358VW,6358,NEUFBOX4-SER,OpenWRT-$(REVISION))) 
    372 $(eval $(call CfeImageDTB,nb4-fxc-r1,96358VW,6358,NEUFBOX4-FXC,OpenWRT-$(REVISION))) 
    373  
     382$(eval $(call CfeImageDTB,Neufbox4,nb4-ser-r0,96358VW,6358,NEUFBOX4-SER,OpenWRT-$(REVISION))) 
     383$(eval $(call CfeImageDTB,Neufbox4,nb4-fxc-r1,96358VW,6358,NEUFBOX4-FXC,OpenWRT-$(REVISION))) 
    374384# SFR neufbox 6 
    375 $(call $(call CfeImageDTB,nb6-ser-r0,NB6-SER-r0,6362,NEUFBOX6,OpenWRT-$(REVISION))) 
     385$(eval $(call CfeImageDTB,Neufbox6,nb6-ser-r0,NB6-SER-r0,6362,NEUFBOX6,OpenWRT-$(REVISION))) 
    376386 
    377387$(eval $(call BuildImage)) 
Note: See TracChangeset for help on using the changeset viewer.