bcm63xx: stop using legacy lzma for all devices

[openwrt/staging/noltari.git] / target / linux / bcm63xx / image / bcm63xx.mk

diff --git a/target/linux/bcm63xx/image/bcm63xx.mk b/target/linux/bcm63xx/image/bcm63xx.mk
index 265fa0958ae0b501a7643f33b5c9b3e904046b1d..15cc549ec4a0a7d1e50f4bdc64c02d8a8cd3174c 100644 (file)
--- a/target/linux/bcm63xx/image/bcm63xx.mk
+++ b/target/linux/bcm63xx/image/bcm63xx.mk
@@ -3,6 +3,12 @@
 # BCM33XX/BCM63XX Profiles
 #
 
+DEVICE_VARS += HCS_MAGIC_BYTES HCS_REV_MIN HCS_REV_MAJ
+DEVICE_VARS += BLOCK_SIZE FLASH_MB IMAGE_OFFSET
+DEVICE_VARS += CFE_BOARD_ID CFE_EXTRAS
+DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION
+DEVICE_VARS += REDBOOT_PREFIX
+
 define Device/bcm33xx
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-lzma bin | hcs-initramfs
   IMAGES :=
@@ -10,11 +16,10 @@ define Device/bcm33xx
   HCS_REV_MIN :=
   HCS_REV_MAJ :=
 endef
-DEVICE_VARS += HCS_MAGIC_BYTES HCS_REV_MIN HCS_REV_MAJ
 
 define Device/bcm63xx
   FILESYSTEMS := squashfs jffs2-64k jffs2-128k
-  KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma | lzma-cfe
+  KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-lzma elf
   IMAGES := cfe.bin
   IMAGE/cfe.bin := cfe-bin --pad $$$$(shell expr $$$$(FLASH_MB) / 2)
@@ -28,11 +33,13 @@ define Device/bcm63xx
   IMAGE_OFFSET :=
   FLASH_MB := 4
   CFE_BOARD_ID :=
-  CFE_CHIP_ID :=
   CFE_EXTRAS = --block-size $$(BLOCK_SIZE) --image-offset $$(if $$(IMAGE_OFFSET),$$(IMAGE_OFFSET),$$(BLOCK_SIZE))
 endef
-DEVICE_VARS += BLOCK_SIZE FLASH_MB IMAGE_OFFSET
-DEVICE_VARS += CFE_BOARD_ID CFE_CHIP_ID CFE_EXTRAS
+
+define Device/bcm63xx-legacy
+  $(Device/bcm63xx)
+  KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma-cfe
+endef
 
 define Device/bcm63xx_netgear
   $(Device/bcm63xx)
@@ -42,7 +49,6 @@ define Device/bcm63xx_netgear
   NETGEAR_BOARD_ID :=
   NETGEAR_REGION :=
 endef
-DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION
 
 define Device/bcm63xx_redboot
   FILESYSTEMS := squashfs
@@ -52,7 +58,6 @@ define Device/bcm63xx_redboot
   IMAGE/redboot.bin := redboot-bin
   REDBOOT_PREFIX := $$(IMAGE_PREFIX)
 endef
-DEVICE_VARS += REDBOOT_PREFIX
 
 ### Generic ###
 define Device/brcm_bcm963281tan
@@ -61,7 +66,7 @@ define Device/brcm_bcm963281tan
   DEVICE_MODEL := 963281TAN
   IMAGES := cfe-4M.bin cfe-8M.bin cfe-16M.bin
   CFE_BOARD_ID := 963281TAN
-  CFE_CHIP_ID := 6328
+  CHIP_ID := 6328
 endef
 TARGET_DEVICES += brcm_bcm963281tan
 
@@ -71,91 +76,96 @@ define Device/brcm_bcm96328avng
   DEVICE_MODEL := 96328avng
   IMAGES := cfe-4M.bin cfe-8M.bin cfe-16M.bin
   CFE_BOARD_ID := 96328avng
-  CFE_CHIP_ID := 6328
+  CHIP_ID := 6328
 endef
 TARGET_DEVICES += brcm_bcm96328avng
 
 define Device/brcm_bcm96338gw
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Generic
   DEVICE_MODEL := 96338GW
   CFE_BOARD_ID := 6338GW
-  CFE_CHIP_ID := 6338
+  CHIP_ID := 6338
 endef
 TARGET_DEVICES += brcm_bcm96338gw
 
 define Device/brcm_bcm96338w
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Generic
   DEVICE_MODEL := 96338W
   CFE_BOARD_ID := 6338W
-  CFE_CHIP_ID := 6338
+  CHIP_ID := 6338
+  DEFAULT := n
 endef
 TARGET_DEVICES += brcm_bcm96338w
 
 define Device/brcm_bcm96345gw2
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Generic
   DEVICE_MODEL := 96345GW2
   IMAGES += cfe-bc221.bin
   CFE_BOARD_ID := 96345GW2
-  CFE_CHIP_ID := 6345
+  CHIP_ID := 6345
   DEFAULT := n
 endef
 TARGET_DEVICES += brcm_bcm96345gw2
 
 define Device/brcm_bcm96348gw
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Generic
   DEVICE_MODEL := 96348GW
   IMAGES += cfe-bc221.bin
   CFE_BOARD_ID := 96348GW
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
+  DEFAULT := n
 endef
 TARGET_DEVICES += brcm_bcm96348gw
 
 define Device/brcm_bcm96348gw-10
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Generic
   DEVICE_MODEL := 96348GW-10
   CFE_BOARD_ID := 96348GW-10
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
+  DEFAULT := n
 endef
 TARGET_DEVICES += brcm_bcm96348gw-10
 
 define Device/brcm_bcm96348gw-11
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Generic
   DEVICE_MODEL := 96348GW-11
   CFE_BOARD_ID := 96348GW-11
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
+  DEFAULT := n
 endef
 TARGET_DEVICES += brcm_bcm96348gw-11
 
 define Device/brcm_bcm96348r
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Generic
   DEVICE_MODEL := 96348R
   CFE_BOARD_ID := 96348R
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
+  DEFAULT := n
 endef
 TARGET_DEVICES += brcm_bcm96348r
 
 define Device/brcm_bcm96358vw
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Generic
   DEVICE_MODEL := 96358VW
   CFE_BOARD_ID := 96358VW
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
 endef
 TARGET_DEVICES += brcm_bcm96358vw
 
 define Device/brcm_bcm96358vw2
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Generic
   DEVICE_MODEL := 96358VW2
   CFE_BOARD_ID := 96358VW2
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
 endef
 TARGET_DEVICES += brcm_bcm96358vw2
 
@@ -164,7 +174,7 @@ define Device/brcm_bcm96368mvngr
   DEVICE_VENDOR := Generic
   DEVICE_MODEL := 96368MVNgr
   CFE_BOARD_ID := 96368MVNgr
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
 endef
 TARGET_DEVICES += brcm_bcm96368mvngr
 
@@ -173,7 +183,7 @@ define Device/brcm_bcm96368mvwg
   DEVICE_VENDOR := Generic
   DEVICE_MODEL := 96368MVWG
   CFE_BOARD_ID := 96368MVWG
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
 endef
 TARGET_DEVICES += brcm_bcm96368mvwg
 
@@ -184,7 +194,7 @@ define Device/actiontec_r1000h
   DEVICE_MODEL := R1000H
   FILESYSTEMS := squashfs
   CFE_BOARD_ID := 96368MVWG
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
   FLASH_MB := 32
   IMAGE_OFFSET := 0x20000
   DEVICE_PACKAGES := $(USB2_PACKAGES) $(BRCMWL_PACKAGES)
@@ -197,7 +207,7 @@ define Device/adb_a4001n
   DEVICE_VENDOR := ADB
   DEVICE_MODEL := P.DG A4001N
   CFE_BOARD_ID := 96328dg2x2
-  CFE_CHIP_ID := 6328
+  CHIP_ID := 6328
   FLASH_MB := 8
   DEVICE_PACKAGES := $(USB2_PACKAGES) $(B43_PACKAGES)
 endef
@@ -209,30 +219,42 @@ define Device/adb_a4001n1
   DEVICE_MODEL := P.DG A4001N1
   IMAGES += sysupgrade.bin
   CFE_BOARD_ID := 963281T_TEF
-  CFE_CHIP_ID := 6328
+  CHIP_ID := 6328
   FLASH_MB := 16
   DEVICE_PACKAGES := $(USB2_PACKAGES) $(B43_PACKAGES)
 endef
 TARGET_DEVICES += adb_a4001n1
 
+define Device/adb_pdg-a4001n-a-000-1a1-ax
+  $(Device/bcm63xx)
+  DEVICE_VENDOR := ADB
+  DEVICE_MODEL := P.DG A4001N A-000-1A1-AX
+  IMAGES += sysupgrade.bin
+  CFE_BOARD_ID := 96328avng
+  CHIP_ID := 6328
+  FLASH_MB := 16
+  DEVICE_PACKAGES := $(USB2_PACKAGES) $(B43_PACKAGES)
+endef
+TARGET_DEVICES += adb_pdg-a4001n-a-000-1a1-ax
+
 define Device/adb_av4202n
   $(Device/bcm63xx)
   DEVICE_VENDOR := ADB
   DEVICE_MODEL := P.DG AV4202N
   IMAGE_OFFSET := 0x20000
   CFE_BOARD_ID := 96368_Swiss_S1
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
   DEVICE_PACKAGES := $(USB2_PACKAGES) $(B43_PACKAGES)
 endef
 TARGET_DEVICES += adb_av4202n
 
 ### Alcatel ###
 define Device/alcatel_rg100a
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Alcatel
   DEVICE_MODEL := RG100A
   CFE_BOARD_ID := 96358VW2
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   BLOCK_SIZE := 0x20000
   DEVICE_PACKAGES := $(USB2_PACKAGES) $(B43_PACKAGES)
 endef
@@ -240,11 +262,11 @@ TARGET_DEVICES += alcatel_rg100a
 
 ### Asmax ###
 define Device/asmax_ar-1004g
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Asmax
   DEVICE_MODEL := AR 1004g
   CFE_BOARD_ID := 96348GW-10
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
 endef
@@ -252,11 +274,11 @@ TARGET_DEVICES += asmax_ar-1004g
 
 ### Belkin ###
 define Device/belkin_f5d7633
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Belkin
   DEVICE_MODEL := F5D7633
   CFE_BOARD_ID := 96348GW-10
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   BLOCK_SIZE := 0x20000
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
@@ -270,7 +292,7 @@ define Device/brcm_bcm96318ref
   DEVICE_MODEL := BCM96318REF reference board
   IMAGES :=
   CFE_BOARD_ID := 96318REF
-  CFE_CHIP_ID := 6318
+  CHIP_ID := 6318
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) kmod-bcm63xx-udc
 endef
 TARGET_DEVICES += brcm_bcm96318ref
@@ -281,7 +303,7 @@ define Device/brcm_bcm96318ref-p300
   DEVICE_MODEL := BCM96318REF_P300 reference board
   IMAGES :=
   CFE_BOARD_ID := 96318REF_P300
-  CFE_CHIP_ID := 6318
+  CHIP_ID := 6318
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) kmod-bcm63xx-udc
 endef
 TARGET_DEVICES += brcm_bcm96318ref-p300
@@ -292,7 +314,7 @@ define Device/brcm_bcm963268bu-p300
   DEVICE_MODEL := BCM963268BU_P300 reference board
   IMAGES :=
   CFE_BOARD_ID := 963268BU_P300
-  CFE_CHIP_ID := 63268
+  CHIP_ID := 63268
   DEVICE_PACKAGES := $(USB2_PACKAGES) kmod-bcm63xx-udc
 endef
 TARGET_DEVICES += brcm_bcm963268bu-p300
@@ -303,7 +325,7 @@ define Device/brcm_bcm963269bhr
   DEVICE_MODEL := BCM963269BHR reference board
   IMAGES :=
   CFE_BOARD_ID := 963269BHR
-  CFE_CHIP_ID := 63268
+  CHIP_ID := 63268
   SOC := bcm63269
   DEVICE_PACKAGES := $(USB2_PACKAGES) kmod-bcm63xx-udc
 endef
@@ -311,23 +333,23 @@ TARGET_DEVICES += brcm_bcm963269bhr
 
 ### BT ###
 define Device/bt_home-hub-2-a
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := BT
   DEVICE_MODEL := Home Hub 2.0
   DEVICE_VARIANT := A
   CFE_BOARD_ID := HOMEHUB2A
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   BLOCK_SIZE := 0x20000
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
 TARGET_DEVICES += bt_home-hub-2-a
 
 define Device/bt_voyager-2110
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := BT
   DEVICE_MODEL := Voyager 2110
   CFE_BOARD_ID := V2110
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   CFE_EXTRAS += --layoutver 5
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
@@ -335,11 +357,11 @@ endef
 TARGET_DEVICES += bt_voyager-2110
 
 define Device/bt_voyager-2500v-bb
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := BT
   DEVICE_MODEL := Voyager 2500V
   CFE_BOARD_ID := V2500V_BB
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   CFE_EXTRAS += --layoutver 5
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
@@ -353,7 +375,7 @@ define Device/comtrend_ar-5315u
   DEVICE_MODEL := AR-5315u
   IMAGES += sysupgrade.bin
   CFE_BOARD_ID := 96318A-1441N1
-  CFE_CHIP_ID := 6318
+  CHIP_ID := 6318
   FLASH_MB := 16
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
@@ -365,7 +387,7 @@ define Device/comtrend_ar-5381u
   DEVICE_MODEL := AR-5381u
   IMAGES += sysupgrade.bin
   CFE_BOARD_ID := 96328A-1241N
-  CFE_CHIP_ID := 6328
+  CHIP_ID := 6328
   FLASH_MB := 16
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
@@ -377,42 +399,42 @@ define Device/comtrend_ar-5387un
   DEVICE_MODEL := AR-5387un
   IMAGES += sysupgrade.bin
   CFE_BOARD_ID := 96328A-1441N1
-  CFE_CHIP_ID := 6328
+  CHIP_ID := 6328
   FLASH_MB := 16
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
 TARGET_DEVICES += comtrend_ar-5387un
 
 define Device/comtrend_ct-536plus
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Comtrend
   DEVICE_MODEL := CT-536+
   DEVICE_ALT0_VENDOR := Comtrend
   DEVICE_ALT0_MODEL := CT-5621
   CFE_BOARD_ID := 96348GW-11
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
 endef
 TARGET_DEVICES += comtrend_ct-536plus
 
 define Device/comtrend_ct-5365
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Comtrend
   DEVICE_MODEL := CT-5365
   CFE_BOARD_ID := 96348A-122
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
 endef
 TARGET_DEVICES += comtrend_ct-5365
 
 define Device/comtrend_ct-6373
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Comtrend
   DEVICE_MODEL := CT-6373
   CFE_BOARD_ID := CT6373-1
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
 TARGET_DEVICES += comtrend_ct-6373
@@ -423,7 +445,7 @@ define Device/comtrend_vr-3025u
   DEVICE_MODEL := VR-3025u
   IMAGES += sysupgrade.bin
   CFE_BOARD_ID := 96368M-1541N
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
   BLOCK_SIZE := 0x20000
   FLASH_MB := 32
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
@@ -435,7 +457,7 @@ define Device/comtrend_vr-3025un
   DEVICE_VENDOR := Comtrend
   DEVICE_MODEL := VR-3025un
   CFE_BOARD_ID := 96368M-1341N
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
   FLASH_MB := 8
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
@@ -446,7 +468,7 @@ define Device/comtrend_vr-3026e
   DEVICE_VENDOR := Comtrend
   DEVICE_MODEL := VR-3026e
   CFE_BOARD_ID := 96368MT-1341N1
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
   FLASH_MB := 8
   DEVICE_PACKAGES := $(B43_PACKAGES)
 endef
@@ -457,7 +479,7 @@ define Device/comtrend_wap-5813n
   DEVICE_VENDOR := Comtrend
   DEVICE_MODEL := WAP-5813n
   CFE_BOARD_ID := 96369R-1231N
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
   FLASH_MB := 8
   SOC := bcm6369
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
@@ -466,43 +488,43 @@ TARGET_DEVICES += comtrend_wap-5813n
 
 ### D-Link ###
 define Device/d-link_dsl-2640b-b
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DSL-2640B
   DEVICE_VARIANT := B2
   CFE_BOARD_ID := D-4P-W
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
 endef
 TARGET_DEVICES += d-link_dsl-2640b-b
 
 define Device/d-link_dsl-2640u
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DSL-2640U
   DEVICE_VARIANT := C1
   DEVICE_ALT0_VENDOR := D-Link
   DEVICE_ALT0_MODEL := DSL-2640U/BRU/C
   CFE_BOARD_ID := 96338W2_E7T
-  CFE_CHIP_ID := 6338
+  CHIP_ID := 6338
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
 endef
 TARGET_DEVICES += d-link_dsl-2640u
 
 define Device/d-link_dsl-2650u
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DSL-2650U
   CFE_BOARD_ID := 96358VW2
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
 TARGET_DEVICES += d-link_dsl-2650u
 
 define Device/d-link_dsl-274xb-c2
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DSL-2740B
   DEVICE_VARIANT := C2
@@ -510,13 +532,14 @@ define Device/d-link_dsl-274xb-c2
   DEVICE_ALT0_MODEL := DSL-2741B
   DEVICE_ALT0_VARIANT := C2
   CFE_BOARD_ID := 96358GW
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   DEVICE_PACKAGES := $(B43_PACKAGES)
+  DEFAULT := n
 endef
 TARGET_DEVICES += d-link_dsl-274xb-c2
 
 define Device/d-link_dsl-274xb-c3
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DSL-2740B
   DEVICE_VARIANT := C3
@@ -525,8 +548,9 @@ define Device/d-link_dsl-274xb-c3
   DEVICE_ALT0_VARIANT := C3
   DEVICE_DTS := bcm6358-d-link-dsl-274xb-c2
   CFE_BOARD_ID := AW4139
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   DEVICE_PACKAGES := $(B43_PACKAGES)
+  DEFAULT := n
 endef
 TARGET_DEVICES += d-link_dsl-274xb-c3
 
@@ -539,7 +563,7 @@ define Device/d-link_dsl-274xb-f1
   DEVICE_ALT0_MODEL := DSL-2741B
   DEVICE_ALT0_VARIANT := F1
   CFE_BOARD_ID := AW4339U
-  CFE_CHIP_ID := 6328
+  CHIP_ID := 6328
   IMAGES := cfe-EU.bin cfe-AU.bin
   IMAGE/cfe-AU.bin := cfe-bin --signature2 "4.06.01.AUF1" --pad 4
   IMAGE/cfe-EU.bin := cfe-bin --signature2 "4.06.01.EUF1" --pad 4
@@ -556,30 +580,30 @@ define Device/d-link_dsl-275xb-d1
   DEVICE_ALT0_MODEL := DSL-2751
   DEVICE_ALT0_VARIANT := D1
   CFE_BOARD_ID := AW5200B
-  CFE_CHIP_ID := 6318
+  CHIP_ID := 6318
   FLASH_MB := 8
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
 TARGET_DEVICES += d-link_dsl-275xb-d1
 
 define Device/d-link_dva-g3810bn-tl
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DVA-G3810BN/TL
   CFE_BOARD_ID := 96358VW
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
 TARGET_DEVICES += d-link_dva-g3810bn-tl
 
 ### Davolink ###
 define Device/davolink_dv-201amr
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Davolink
   DEVICE_MODEL := DV-201AMR
   IMAGES := cfe-old.bin
   CFE_BOARD_ID := DV201AMR
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
 endef
@@ -587,14 +611,14 @@ TARGET_DEVICES += davolink_dv-201amr
 
 ### Dynalink ###
 define Device/dynalink_rta770bw
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Dynalink
   DEVICE_MODEL := RTA770BW
   DEVICE_ALT0_VENDOR := Siemens
   DEVICE_ALT0_MODEL := SE515
   IMAGES =
   CFE_BOARD_ID := RTA770BW
-  CFE_CHIP_ID := 6345
+  CHIP_ID := 6345
   CFE_EXTRAS += --layoutver 5
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
@@ -602,12 +626,12 @@ endef
 TARGET_DEVICES += dynalink_rta770bw
 
 define Device/dynalink_rta770w
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Dynalink
   DEVICE_MODEL := RTA770W
   IMAGES =
   CFE_BOARD_ID := RTA770W
-  CFE_CHIP_ID := 6345
+  CHIP_ID := 6345
   CFE_EXTRAS += --layoutver 5
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
@@ -615,11 +639,11 @@ endef
 TARGET_DEVICES += dynalink_rta770w
 
 define Device/dynalink_rta1025w
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Dynalink
   DEVICE_MODEL := RTA1025W
   CFE_BOARD_ID := RTA1025W_16
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   CFE_EXTRAS += --layoutver 5
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
@@ -627,11 +651,11 @@ endef
 TARGET_DEVICES += dynalink_rta1025w
 
 define Device/dynalink_rta1320
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Dynalink
   DEVICE_MODEL := RTA1320
   CFE_BOARD_ID := RTA1320_16M
-  CFE_CHIP_ID := 6338
+  CHIP_ID := 6338
   CFE_EXTRAS += --layoutver 5
   DEFAULT := n
 endef
@@ -639,23 +663,24 @@ TARGET_DEVICES += dynalink_rta1320
 
 ### Huawei ###
 define Device/huawei_echolife-hg520v
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Huawei
   DEVICE_MODEL := EchoLife HG520v
   CFE_BOARD_ID := HW6358GW_B
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   CFE_EXTRAS += --rsa-signature "EchoLife_HG520v"
   SOC := bcm6359
   DEVICE_PACKAGES := $(B43_PACKAGES)
+  DEFAULT := n
 endef
 TARGET_DEVICES += huawei_echolife-hg520v
 
 define Device/huawei_echolife-hg553
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Huawei
   DEVICE_MODEL := EchoLife HG553
   CFE_BOARD_ID := HW553
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   CFE_EXTRAS += --rsa-signature "EchoLife_HG553" --tag-version 7
   BLOCK_SIZE := 0x20000
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
@@ -663,13 +688,13 @@ endef
 TARGET_DEVICES += huawei_echolife-hg553
 
 define Device/huawei_echolife-hg556a-a
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Huawei
   DEVICE_MODEL := EchoLife HG556a
   DEVICE_VARIANT := A
   DEVICE_DESCRIPTION = Build firmware images for Huawei HG556a version A (Atheros)
   CFE_BOARD_ID := HW556
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   CFE_EXTRAS += --rsa-signature "EchoLife_HG556a" --tag-version 8
   IMAGE_OFFSET := 0x20000
   DEVICE_PACKAGES := $(ATH9K_PACKAGES) $(USB2_PACKAGES)
@@ -677,13 +702,13 @@ endef
 TARGET_DEVICES += huawei_echolife-hg556a-a
 
 define Device/huawei_echolife-hg556a-b
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Huawei
   DEVICE_MODEL := EchoLife HG556a
   DEVICE_VARIANT := B
   DEVICE_DESCRIPTION = Build firmware images for Huawei HG556a version B (Atheros)
   CFE_BOARD_ID := HW556
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   CFE_EXTRAS += --rsa-signature "EchoLife_HG556a" --tag-version 8
   BLOCK_SIZE := 0x20000
   DEVICE_PACKAGES := $(ATH9K_PACKAGES) $(USB2_PACKAGES)
@@ -691,13 +716,13 @@ endef
 TARGET_DEVICES += huawei_echolife-hg556a-b
 
 define Device/huawei_echolife-hg556a-c
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Huawei
   DEVICE_MODEL := EchoLife HG556a
   DEVICE_VARIANT := C
   DEVICE_DESCRIPTION = Build firmware images for Huawei HG556a version C (Ralink)
   CFE_BOARD_ID := HW556
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   CFE_EXTRAS += --rsa-signature "EchoLife_HG556a" --tag-version 8
   BLOCK_SIZE := 0x20000
   DEVICE_PACKAGES := $(RT28_PACKAGES) $(USB2_PACKAGES)
@@ -710,7 +735,7 @@ define Device/huawei_echolife-hg622
   DEVICE_MODEL := EchoLife HG622
   IMAGES += sysupgrade.bin
   CFE_BOARD_ID := 96368MVWG_hg622
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
   CFE_EXTRAS += --tag-version 7
   BLOCK_SIZE := 0x20000
   FLASH_MB := 16
@@ -723,7 +748,7 @@ define Device/huawei_echolife-hg655b
   DEVICE_VENDOR := Huawei
   DEVICE_MODEL := EchoLife HG655b
   CFE_BOARD_ID := HW65x
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
   CFE_EXTRAS += --tag-version 7
   IMAGE_OFFSET := 0x20000
   FLASH_MB := 8
@@ -738,7 +763,7 @@ define Device/inteno_vg50
   DEVICE_MODEL := VG50 Multi-WAN CPE
   IMAGES :=
   CFE_BOARD_ID := VW6339GU
-  CFE_CHIP_ID := 63268
+  CHIP_ID := 63268
   DEVICE_PACKAGES := $(USB2_PACKAGES)
 endef
 TARGET_DEVICES += inteno_vg50
@@ -759,7 +784,7 @@ define Device/netgear_cvg834g
   $(Device/bcm33xx)
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := CVG834G
-  SOC := bcm3368
+  CHIP_ID := 3368
   HCS_MAGIC_BYTES := 0xa020
   HCS_REV_MIN := 0001
   HCS_REV_MAJ := 0022
@@ -767,26 +792,26 @@ endef
 TARGET_DEVICES += netgear_cvg834g
 
 define Device/netgear_dg834gt-pn
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := DG834GT
   DEVICE_ALT0_VENDOR := NETGEAR
   DEVICE_ALT0_MODEL := DG834PN
   CFE_BOARD_ID := 96348GW-10
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   DEVICE_PACKAGES := $(ATH5K_PACKAGES)
   DEFAULT := n
 endef
 TARGET_DEVICES += netgear_dg834gt-pn
 
 define Device/netgear_dg834g-v4
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := DG834G
   DEVICE_VARIANT := v4
   IMAGES :=
   CFE_BOARD_ID := 96348W3
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
 endef
@@ -797,7 +822,7 @@ define Device/netgear_dgnd3700-v1
   DEVICE_MODEL := DGND3700
   DEVICE_VARIANT := v1
   CFE_BOARD_ID := 96368MVWG
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
   BLOCK_SIZE := 0x20000
   NETGEAR_BOARD_ID := U12L144T01_NETGEAR_NEWLED
   NETGEAR_REGION := 1
@@ -810,7 +835,7 @@ define Device/netgear_dgnd3800b
   DEVICE_MODEL := DGND3800B
   DEVICE_DTS := bcm6368-netgear-dgnd3700-v1
   CFE_BOARD_ID := 96368MVWG
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
   BLOCK_SIZE := 0x20000
   NETGEAR_BOARD_ID := U12L144T11_NETGEAR_NEWLED
   NETGEAR_REGION := 1
@@ -822,7 +847,7 @@ define Device/netgear_evg2000
   $(Device/bcm63xx_netgear)
   DEVICE_MODEL := EVG2000
   CFE_BOARD_ID := 96369PVG
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
   BLOCK_SIZE := 0x20000
   NETGEAR_BOARD_ID := U12H154T90_NETGEAR
   NETGEAR_REGION := 1
@@ -839,7 +864,7 @@ define Device/nucom_r5010un-v2
   DEVICE_VARIANT := v2
   IMAGES += sysupgrade.bin
   CFE_BOARD_ID := 96328ang
-  CFE_CHIP_ID := 6328
+  CHIP_ID := 6328
   FLASH_MB := 16
   DEVICE_PACKAGES := $(B43_PACKAGES)
 endef
@@ -852,7 +877,7 @@ define Device/observa_vh4032n
   DEVICE_MODEL := VH4032N
   IMAGES += sysupgrade.bin
   CFE_BOARD_ID := 96368VVW
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
   BLOCK_SIZE := 0x20000
   FLASH_MB := 32
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
@@ -861,33 +886,33 @@ TARGET_DEVICES += observa_vh4032n
 
 ### Pirelli ###
 define Device/pirelli_a226g
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Pirelli
   DEVICE_MODEL := A226G
   CFE_BOARD_ID := DWV-S0
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   CFE_EXTRAS += --signature2 IMAGE --tag-version 8
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
 TARGET_DEVICES += pirelli_a226g
 
 define Device/pirelli_a226m
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Pirelli
   DEVICE_MODEL := A226M
   CFE_BOARD_ID := DWV-S0
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   CFE_EXTRAS += --signature2 IMAGE --tag-version 8
   DEVICE_PACKAGES := $(USB2_PACKAGES)
 endef
 TARGET_DEVICES += pirelli_a226m
 
 define Device/pirelli_a226m-fwb
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Pirelli
   DEVICE_MODEL := A226M-FWB
   CFE_BOARD_ID := DWV-S0
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   CFE_EXTRAS += --signature2 IMAGE --tag-version 8
   BLOCK_SIZE := 0x20000
   DEVICE_PACKAGES := $(USB2_PACKAGES)
@@ -895,11 +920,11 @@ endef
 TARGET_DEVICES += pirelli_a226m-fwb
 
 define Device/pirelli_agpf-s0
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Pirelli
   DEVICE_MODEL := Alice Gate VoIP 2 Plus Wi-Fi AGPF-S0
   CFE_BOARD_ID := AGPF-S0
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   CFE_EXTRAS += --signature2 IMAGE --tag-version 8
   BLOCK_SIZE := 0x20000
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
@@ -908,11 +933,11 @@ TARGET_DEVICES += pirelli_agpf-s0
 
 ### Sagem ###
 define Device/sagem_fast-2404
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Sagemcom
   DEVICE_MODEL := F@st 2404
   CFE_BOARD_ID := F@ST2404
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
 endef
@@ -923,17 +948,17 @@ define Device/sagem_fast-2504n
   DEVICE_VENDOR := Sagemcom
   DEVICE_MODEL := F@st 2504N
   CFE_BOARD_ID := F@ST2504n
-  CFE_CHIP_ID := 6362
+  CHIP_ID := 6362
   DEVICE_PACKAGES := $(B43_PACKAGES)
 endef
 TARGET_DEVICES += sagem_fast-2504n
 
 define Device/sagem_fast-2604
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Sagemcom
   DEVICE_MODEL := F@st 2604
   CFE_BOARD_ID := F@ST2604
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
 endef
@@ -944,7 +969,7 @@ define Device/sagem_fast-2704n
   DEVICE_VENDOR := Sagemcom
   DEVICE_MODEL := F@st 2704N
   CFE_BOARD_ID := F@ST2704N
-  CFE_CHIP_ID := 6318
+  CHIP_ID := 6318
   FLASH_MB := 8
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
@@ -956,7 +981,7 @@ define Device/sagem_fast-2704-v2
   DEVICE_MODEL := F@st 2704
   DEVICE_VARIANT := V2
   CFE_BOARD_ID := F@ST2704V2
-  CFE_CHIP_ID := 6328
+  CHIP_ID := 6328
   FLASH_MB := 8
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
@@ -969,31 +994,31 @@ define Device/sercomm_ad1018-nor
   DEVICE_MODEL := AD1018
   DEVICE_VARIANT := SPI flash mod
   CFE_BOARD_ID := 96328avngr
-  CFE_CHIP_ID := 6328
+  CHIP_ID := 6328
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
 TARGET_DEVICES += sercomm_ad1018-nor
 
 ### SFR ###
 define Device/sfr_neufbox-4-sercomm-r0
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := SFR
   DEVICE_MODEL := Neufbox 4
   DEVICE_VARIANT := Sercomm
   CFE_BOARD_ID := 96358VW
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))"
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
 TARGET_DEVICES += sfr_neufbox-4-sercomm-r0
 
 define Device/sfr_neufbox-4-foxconn-r1
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := SFR
   DEVICE_MODEL := Neufbox 4
   DEVICE_VARIANT := Foxconn
   CFE_BOARD_ID := 96358VW
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))"
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
@@ -1004,7 +1029,7 @@ define Device/sfr_neufbox-6-sercomm-r0
   DEVICE_VENDOR := SFR
   DEVICE_MODEL := Neufbox 6
   CFE_BOARD_ID := NB6-SER-r0
-  CFE_CHIP_ID := 6362
+  CHIP_ID := 6362
   CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))"
   SOC := bcm6361
   DEVICE_PACKAGES := $(USB2_PACKAGES)
@@ -1016,7 +1041,7 @@ define Device/sky_sr102
   DEVICE_VENDOR := SKY
   DEVICE_MODEL := SR102
   CFE_BOARD_ID := BSKYB_63168
-  CFE_CHIP_ID := 63268
+  CHIP_ID := 63268
   CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))"
   SOC := bcm63168
   DEVICE_PACKAGES := $(USB2_PACKAGES)
@@ -1025,24 +1050,24 @@ TARGET_DEVICES += sky_sr102
 
 ### T-Com ###
 define Device/t-com_speedport-w-303v
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := T-Com
   DEVICE_MODEL := Speedport W 303V
   IMAGES := factory.bin sysupgrade.bin
   IMAGE/factory.bin := cfe-spw303v-bin --pad 4 | spw303v-bin | xor-image
   IMAGE/sysupgrade.bin := cfe-spw303v-bin | spw303v-bin
   CFE_BOARD_ID := 96358-502V
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   DEVICE_PACKAGES := $(B43_PACKAGES)
 endef
 TARGET_DEVICES += t-com_speedport-w-303v
 
 define Device/t-com_speedport-w-500v
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := T-Com
   DEVICE_MODEL := Speedport W 500V
   CFE_BOARD_ID := 96348GW
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
 endef
@@ -1050,33 +1075,35 @@ TARGET_DEVICES += t-com_speedport-w-500v
 
 ### Tecom ###
 define Device/tecom_gw6000
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Tecom
   DEVICE_MODEL := GW6000
   CFE_BOARD_ID := 96348GW
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   DEVICE_PACKAGES := $(BRCMWL_PACKAGES) $(USB1_PACKAGES)
+  DEFAULT := n
 endef
 TARGET_DEVICES += tecom_gw6000
 
 define Device/tecom_gw6200
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Tecom
   DEVICE_MODEL := GW6200
   CFE_BOARD_ID := 96348GW
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   CFE_EXTRAS += --rsa-signature "$(shell printf '\x99')"
   DEVICE_PACKAGES := $(BRCMWL_PACKAGES) $(USB1_PACKAGES)
+  DEFAULT := n
 endef
 TARGET_DEVICES += tecom_gw6200
 
 ### Telsey ###
 define Device/telsey_cpva502plus
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Telsey
   DEVICE_MODEL := CPVA502+
   CFE_BOARD_ID := CPVA502+
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   CFE_EXTRAS += --signature "Telsey Tlc" --signature2 "99.99.999"
   DEVICE_PACKAGES := $(B43_PACKAGES)
   DEFAULT := n
@@ -1084,11 +1111,11 @@ endef
 TARGET_DEVICES += telsey_cpva502plus
 
 define Device/telsey_cpva642
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Telsey
   DEVICE_MODEL := CPVA642-type (CPA-ZNTE60T)
   CFE_BOARD_ID := CPVA642
-  CFE_CHIP_ID := 6358
+  CHIP_ID := 6358
   CFE_EXTRAS += --signature "Telsey Tlc" --signature2 "99.99.999" --second-image-flag "0"
   FLASH_MB := 8
   DEVICE_PACKAGES := $(RT63_PACKAGES) $(USB2_PACKAGES)
@@ -1096,14 +1123,14 @@ endef
 TARGET_DEVICES += telsey_cpva642
 
 define Device/telsey_magic
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := Alice
   DEVICE_MODEL := W-Gate
   DEVICE_ALT0_VENDOR := Telsey
   DEVICE_ALT0_MODEL := MAGIC
   IMAGES :=
   CFE_BOARD_ID := MAGIC
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   DEVICE_PACKAGES := $(RT63_PACKAGES)
   DEFAULT := n
 endef
@@ -1111,11 +1138,11 @@ TARGET_DEVICES += telsey_magic
 
 ### TP-Link ###
 define Device/tp-link_td-w8900gb
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := TP-Link
   DEVICE_MODEL := TD-W8900GB
   CFE_BOARD_ID := 96348GW-11
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   CFE_EXTRAS += --rsa-signature "$(shell printf 'PRID\x89\x10\x00\x02')"
   IMAGE_OFFSET := 0x20000
   DEVICE_PACKAGES := $(B43_PACKAGES)
@@ -1125,11 +1152,11 @@ TARGET_DEVICES += tp-link_td-w8900gb
 
 ### USRobotics ###
 define Device/usrobotics_usr9108
-  $(Device/bcm63xx)
+  $(Device/bcm63xx-legacy)
   DEVICE_VENDOR := USRobotics
   DEVICE_MODEL := USR9108
   CFE_BOARD_ID := 96348GW-A
-  CFE_CHIP_ID := 6348
+  CHIP_ID := 6348
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB1_PACKAGES)
   DEFAULT := n
 endef
@@ -1144,8 +1171,9 @@ define Device/zyxel_p870hw-51a-v2
   IMAGES := factory.bin
   IMAGE/factory.bin := cfe-bin | zyxel-bin
   CFE_BOARD_ID := 96368VVW
-  CFE_CHIP_ID := 6368
+  CHIP_ID := 6368
   CFE_EXTRAS += --rsa-signature "ZyXEL" --signature "ZyXEL_0001"
   DEVICE_PACKAGES := $(B43_PACKAGES)
+  DEFAULT := n
 endef
 TARGET_DEVICES += zyxel_p870hw-51a-v2