brcm63xx: move profiles definitions to image/Makefile

This switches brcm63xx to the new profile definition system in image/Makefile

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

2 files changed, 1068 insertions, 465 deletions

diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 9ea2ea279c..a92cb43334 100644
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2006-2015 OpenWrt.org
+# Copyright (C) 2016 LEDE project
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -165,477 +166,23 @@ define Build/redboot-bin
 		> "$@"
 endef
 
-# Shared device definition: applies to every defined device
 define Device/Default
-  PROFILES = Default $$(DEVICE_PROFILE)
+  PROFILES = Default
   KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts)
   KERNEL_INITRAMFS_IMAGE = $$(KERNEL_INITRAMFS_PREFIX).elf
-  DEVICE_PROFILE :=
   DEVICE_DTS :=
 endef
-DEVICE_VARS += DEVICE_PROFILE DEVICE_DTS
+DEVICE_VARS += DEVICE_DTS
 
-# BCM33xx HCS devices: only generates ramdisks (unsupported bin images)
-define Device/bcm33xxHcsRamdisk
-  KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-lzma bin | hcs-initramfs
-  IMAGES :=
-  HCS_MAGIC_BYTES :=
-  HCS_REV_MIN :=
-  HCS_REV_MAJ :=
-endef
-DEVICE_VARS += HCS_MAGIC_BYTES HCS_REV_MIN HCS_REV_MAJ
-
-# Shared BCM63xx CFE device definitios
-define Device/bcm63xxCfeCommon
-  FILESYSTEMS := squashfs jffs2-64k jffs2-128k
-  KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma | lzma-cfe
-  KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-lzma elf
-endef
-
-# BCM63xx CFE devices: only generates ramdisks (unsupported bin images)
-define Device/bcm63xxCfeRamdisk
-  $(Device/bcm63xxCfeCommon)
-  IMAGES :=
-endef
-
-# BCM63xx CFE devices: both ramdisks and parallel/spi bin images
-# New versions of CFE bootloader compatible with imagetag
-define Device/bcm63xxCfe
-  $(Device/bcm63xxCfeCommon)
-  IMAGES := cfe.bin
-  IMAGE/cfe.bin := cfe-bin
-  CFE_BOARD_ID :=
-  CFE_CHIP_ID :=
-  CFE_EXTRAS :=
-endef
-DEVICE_VARS += CFE_BOARD_ID CFE_CHIP_ID CFE_EXTRAS
-
-# BCM63xx CFE BC221 devices: both ramdisks and parallel/spi bin images
-# Generates a generic image and a layout version 5 image
-define Device/bcm63xxCfeBc221
-  $(Device/bcm63xxCfeCommon)
-  IMAGES := cfe.bin cfe-bc221.bin
-  IMAGE/cfe.bin := cfe-bin
-  IMAGE/cfe-bc221.bin := cfe-bin --layoutver 5
-  CFE_BOARD_ID :=
-  CFE_CHIP_ID :=
-  CFE_EXTRAS :=
-endef
-
-# BCM63xx CFE MultiFlash devices: both ramdisks and parallel/spi bin images
-# Generates generic images padded for 4M/8M/16M flashes
-define Device/bcm63xxCfeMultiFlash
-  $(Device/bcm63xxCfeCommon)
-  IMAGES := cfe-4M.bin cfe-8M.bin cfe-16M.bin
-  IMAGE/cfe-4M.bin := cfe-bin --pad 2
-  IMAGE/cfe-8M.bin := cfe-bin --pad 4
-  IMAGE/cfe-16M.bin := cfe-bin --pad 8
-  CFE_BOARD_ID :=
-  CFE_CHIP_ID :=
-  CFE_EXTRAS :=
-endef
-
-# BCM63xx CFE NETGEAR devices: both ramdisks and parallel/spi bin images
-# factory.chk: netgear images for bootloader/original firmware upgrades
-# sysupgrade.bin: openwrt images for sysupgrades
-define Device/bcm63xxCfeNetgear
-  $(Device/bcm63xxCfeCommon)
-  IMAGES := factory.chk sysupgrade.bin
-  IMAGE/factory.chk := cfe-bin | netgear-chk
-  IMAGE/sysupgrade.bin := cfe-bin
-  CFE_BOARD_ID :=
-  CFE_CHIP_ID :=
-  CFE_EXTRAS :=
-  NETGEAR_BOARD_ID :=
-  NETGEAR_REGION :=
-endef
-DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION
-
-# BCM63xx Old CFE devices: both ramdisks and parallel/spi bin images
-# Old versions of CFE bootloader not compatible with imagetag
-define Device/bcm63xxCfeOld
-  $(Device/bcm63xxCfeCommon)
-  IMAGES := cfe-old.bin
-  IMAGE/cfe-old.bin := cfe-old-bin
-  CFE_BOARD_ID :=
-  CFE_CHIP_ID :=
-  CFE_EXTRAS :=
-endef
-
-# BCM63xx CFE SPW303V devices: both ramdisks and parallel/spi bin images
-# factory.bin: SPW303V images for bootloader/original firmware upgrades
-# sysupgrade.bin: openwrt images for sysupgrades
-define Device/bcm63xxCfeSpw303v
-  $(Device/bcm63xxCfeCommon)
-  IMAGES := factory.bin sysupgrade.bin
-  IMAGE/factory.bin := cfe-spw303v-bin | spw303v-bin | xor-image
-  IMAGE/sysupgrade.bin := cfe-spw303v-bin | spw303v-bin
-  CFE_BOARD_ID :=
-  CFE_CHIP_ID :=
-  CFE_EXTRAS :=
-endef
-
-# BCM63xx CFE ZyXEL devices: both ramdisks and parallel/spi bin images
-# factory.bin: ZyXEL specific CFE images (sysupgrade compatible)
-define Device/bcm63xxCfeZyxel
-  $(Device/bcm63xxCfeCommon)
-  IMAGES := factory.bin
-  IMAGE/factory.bin := cfe-bin | zyxel-bin
-  CFE_BOARD_ID :=
-  CFE_CHIP_ID :=
-  CFE_EXTRAS :=
-endef
-
-# BCM63xx RedBoot devices: both ramdisks and parallel/spi bin images
-# Generates images compatible with RedBoot bootloader
-define Device/bcm63xxRedBoot
-  FILESYSTEMS := squashfs
-  KERNEL := kernel-bin | append-dtb | gzip
-  IMAGES := redboot.bin
-  IMAGE/redboot.bin := redboot-bin
-  REDBOOT_PREFIX := $$(IMAGE_PREFIX)
-endef
-DEVICE_VARS += REDBOOT_PREFIX
-
-### Device macros ###
-# $(1) = profile
-# $(2) = image name
-# $(3) = dts
-# $(4) = hcs magic bytes
-# $(5) = hcs rev min
-# $(6) = hcs rev major
-define bcm33xxHcsRamdisk
-  define Device/$(2)
-    $$(Device/bcm33xxHcsRamdisk)
-    DEVICE_PROFILE := $(1)
-    DEVICE_DTS := $(3)
-    HCS_MAGIC_BYTES := $(4)
-    HCS_REV_MIN := $(5)
-    HCS_REV_MAJ := $(6)
-  endef
-  TARGET_DEVICES += $(2)
-endef
-
-# $(1) = profile
-# $(2) = image name
-# $(3) = dts
-define bcm63xxCfeRamdisk
-  define Device/$(2)
-    $$(Device/bcm63xxCfeRamdisk)
-    DEVICE_PROFILE := $(1)
-    DEVICE_DTS := $(3)
-  endef
-  TARGET_DEVICES += $(2)
-endef
-
-# $(1) = profile
-# $(2) = image name
-# $(3) = dts
-# $(4) = cfe board name
-# $(5) = cfe chip id
-# $(6) = cfe additional options
-define bcm63xxCfe
-  define Device/$(2)
-    $$(Device/bcm63xxCfe)
-    DEVICE_PROFILE := $(1)
-    DEVICE_DTS := $(3)
-    CFE_BOARD_ID := $(4)
-    CFE_CHIP_ID := $(5)
-    CFE_EXTRAS := $(6)
-  endef
-  TARGET_DEVICES += $(2)
-endef
-
-# $(1) = profile
-# $(2) = image name
-# $(3) = dts
-# $(4) = cfe board name
-# $(5) = cfe chip id
-# $(6) = cfe additional options
-define bcm63xxCfeMultiFlash
-  define Device/$(2)
-    $$(Device/bcm63xxCfeMultiFlash)
-    DEVICE_PROFILE := $(1)
-    DEVICE_DTS := $(3)
-    CFE_BOARD_ID := $(4)
-    CFE_CHIP_ID := $(5)
-    CFE_EXTRAS := $(6)
-  endef
-  TARGET_DEVICES += $(2)
-endef
-
-# $(1) = profile
-# $(2) = image name
-# $(3) = dts
-# $(4) = cfe board name
-# $(5) = cfe chip id
-# $(6) = cfe additional options
-define bcm63xxCfeBc221
-  define Device/$(2)
-    $$(Device/bcm63xxCfeBc221)
-    DEVICE_PROFILE := $(1)
-    DEVICE_DTS := $(3)
-    CFE_BOARD_ID := $(4)
-    CFE_CHIP_ID := $(5)
-    CFE_EXTRAS := $(6)
-  endef
-  TARGET_DEVICES += $(2)
-endef
-
-# $(1) = profile
-# $(2) = image name
-# $(3) = dts
-# $(4) = cfe board name
-# $(5) = cfe chip id
-# $(6) = cfe additional options
-# $(7) = netgear id
-# $(8) = netgear region
-define bcm63xxCfeNetgear
-  define Device/$(2)
-    $$(Device/bcm63xxCfeNetgear)
-    DEVICE_PROFILE := $(1)
-    DEVICE_DTS := $(3)
-    CFE_BOARD_ID := $(4)
-    CFE_CHIP_ID := $(5)
-    CFE_EXTRAS := $(6)
-    NETGEAR_BOARD_ID := $(7)
-    NETGEAR_REGION := $(8)
-  endef
-  TARGET_DEVICES += $(2)
-endef
-
-# $(1) = profile
-# $(2) = image name
-# $(3) = dts
-# $(4) = cfe board name
-# $(5) = cfe chip id
-# $(6) = cfe additional options
-define bcm63xxCfeOld
-  define Device/$(2)
-    $$(Device/bcm63xxCfeOld)
-    DEVICE_PROFILE := $(1)
-    DEVICE_DTS := $(3)
-    CFE_BOARD_ID := $(4)
-    CFE_CHIP_ID := $(5)
-    CFE_EXTRAS := $(6)
-  endef
-  TARGET_DEVICES += $(2)
-endef
-
-# $(1) = profile
-# $(2) = image name
-# $(3) = dts
-# $(4) = cfe board name
-# $(5) = cfe chip id
-# $(6) = cfe additional options
-define bcm63xxCfeSpw303v
-  define Device/$(2)
-    $$(Device/bcm63xxCfeSpw303v)
-    DEVICE_PROFILE := $(1)
-    DEVICE_DTS := $(3)
-    CFE_BOARD_ID := $(4)
-    CFE_CHIP_ID := $(5)
-    CFE_EXTRAS := $(6)
-  endef
-  TARGET_DEVICES += $(2)
-endef
-
-# $(1) = profile
-# $(2) = image name
-# $(3) = dts
-# $(4) = cfe board name
-# $(5) = cfe chip id
-# $(6) = cfe additional options
-define bcm63xxCfeZyxel
-  define Device/$(2)
-    $$(Device/bcm63xxCfeZyxel)
-    DEVICE_PROFILE := $(1)
-    DEVICE_DTS := $(3)
-    CFE_BOARD_ID := $(4)
-    CFE_CHIP_ID := $(5)
-    CFE_EXTRAS := $(6)
-  endef
-  TARGET_DEVICES += $(2)
-endef
-
-# $(1) = profile
-# $(2) = image name
-# $(3) = dts
-define bcm63xxRedBoot
-  define Device/$(2)
-    $$(Device/bcm63xxRedBoot)
-    DEVICE_PROFILE := $(1)
-    DEVICE_DTS := $(3)
-  endef
-  TARGET_DEVICES += $(2)
-endef
-
-### Devices ###
-# Generic 963281TAN
-$(eval $(call bcm63xxCfeMultiFlash,963281TAN,963281TAN-generic,bcm963281TAN,963281TAN,6328))
-# Generic 96328avng
-$(eval $(call bcm63xxCfeMultiFlash,96328avng,96328avng-generic,bcm96328avng,96328avng,6328))
-# Generic 96338GW
-$(eval $(call bcm63xxCfe,96338GW,96338GW-generic,bcm96338GW,6338GW,6338))
-# Generic 96338W
-$(eval $(call bcm63xxCfe,96338W,96338W-generic,bcm96338W,6338W,6338))
-# Generic 96345GW2
-$(eval $(call bcm63xxCfeBc221,96345GW2,96345GW2-generic,bcm96345GW2,96345GW2,6345))
-# Generic 96348GW
-$(eval $(call bcm63xxCfeBc221,96348GW,96348GW-generic,bcm96348GW,96348GW,6348))
-# Generic 96348GW-10
-$(eval $(call bcm63xxCfe,96348GW_10,96348GW-10-generic,bcm96348GW-10,96348GW-10,6348))
-# Generic 96348GW-11
-$(eval $(call bcm63xxCfe,96348GW_11,96348GW-11-generic,bcm96348GW-11,96348GW-11,6348))
-# Generic 96348R
-$(eval $(call bcm63xxCfe,96348R,96348R-generic,bcm96348R,96348R,6348))
-# Generic 96358VW
-$(eval $(call bcm63xxCfe,96358VW,96358VW-generic,bcm96358VW,96358VW,6358))
-# Generic 96358VW2
-$(eval $(call bcm63xxCfe,96358VW2,96358VW2-generic,bcm96358VW2,96358VW2,6358))
-# Generic 96368MVNgr
-$(eval $(call bcm63xxCfe,96368MVNgr,96368MVNgr-generic,bcm96368MVNgr,96368MVNgr,6368))
-# Generic 96368MVWG
-$(eval $(call bcm63xxCfe,96368MVWG,96368MVWG-generic,bcm96368MVWG,96368MVWG,6368))
+ATH5K_PACKAGES := kmod-ath5k wpad-mini
+ATH9K_PACKAGES := kmod-ath9k wpad-mini
+B43_PACKAGES := kmod-b43 wpad-mini
+BRCMWL_PACKAGES := kmod-brcm-wl nas wlc
+RT28_PACKAGES := kmod-rt2800-pci wpad-mini
+RT61_PACKAGES := kmod-rt61-pci wpad-mini
+USB1_PACKAGES := kmod-usb-ohci kmod-ledtrig-usbdev
+USB2_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-ledtrig-usbdev
 
-# ADB P.DG A4001N
-$(eval $(call bcm63xxCfe,A4001N,A4001N,a4001n,96328dg2x2,6328,--pad 4))
-# ADB P.DG A4001N1
-$(eval $(call bcm63xxCfe,A4001N1,A4001N1,a4001n1,963281T_TEF,6328,--pad 8))
-# Alcatel RG100A
-$(eval $(call bcm63xxCfe,RG100A,RG100A,rg100a,96358VW2,6358,--block-size 0x20000 --image-offset 0x20000))
-# Asmax AR 1004g
-$(eval $(call bcm63xxCfe,AR1004G,AR1004G,ar1004g,96348GW-10,6348))
-# Belkin F5D7633
-$(eval $(call bcm63xxCfe,F5D7633,F5D7633,f5d7633,96348GW-10,6348,--block-size 0x20000 --image-offset 0x20000))
-# Broadcom BCM96318REF
-$(eval $(call bcm63xxCfeRamdisk,BCM96318REF,BCM96318REF,bcm96318ref,96318REF,6318))
-# Broadcom BCM96318REF_P300
-$(eval $(call bcm63xxCfeRamdisk,BCM96318REF_P300,BCM96318ref_P300,bcm96318ref_p300,96318REF_P300,6318))
-# Broadcom BCM963268BU_P300
-$(eval $(call bcm63xxCfeRamdisk,BCM963268BU_P300,BCM963268BU_P300,bcm963268bu_p300,963268BU_P300,63268))
-# Broadcom BCM963269BHR
-$(eval $(call bcm63xxCfeRamdisk,BCM963269BHR,BCM963269BHR,bcm963269bhr,963269BHR,63268))
-# BT Home Hub 2.0 A
-$(eval $(call bcm63xxCfe,BTHOMEHUB2A,HomeHub2A,homehub2a,HOMEHUB2A,6358,--image-offset 0x20000 --block-size 0x20000))
-# BT Voyager V2110, V2110_AA, V2110_ROI
-$(eval $(call bcm63xxCfe,BTV2110,BTV2110,v2110,V2110,6348,--layoutver 5))
-# BT Voyager V2500V, V2500V_SIP_CLUB, V2500V_AA
-$(eval $(call bcm63xxCfe,BTV2500V,BTV2500V,v2500v-bb,V2500V_BB,6348,--layoutver 5))
-# Comtrend AR-5381u
-$(eval $(call bcm63xxCfe,AR5381u,AR-5381u,ar-5381u,96328A-1241N,6328,--pad 8))
-# Comtrend AR-5387un
-$(eval $(call bcm63xxCfe,AR5387un,AR-5387un,ar-5387un,96328A-1441N1,6328,--pad 8))
-# Comtrend 536, 5621
-$(eval $(call bcm63xxCfe,CT536_CT5621,CT536_CT5621,ct536plus,96348GW-11,6348))
-# Comtrend CT-5365
-$(eval $(call bcm63xxCfe,CT5365,CT-5365,ct-5365,96348A-122,6348))
-# Comtrend CT-6373
-$(eval $(call bcm63xxCfe,CT6373,CT-6373,ct-6373,CT6373-1,6358))
-# Comtrend VR-3025u
-$(eval $(call bcm63xxCfe,VR3025u,VR-3025u,vr-3025u,96368M-1541N,6368,--pad 16 --image-offset 0x20000 --block-size 0x20000))
-# Comtrend VR-3025un
-$(eval $(call bcm63xxCfe,VR3025un,VR-3025un,vr-3025un,96368M-1341N,6368,--pad 4))
-# Comtrend VR-3026e
-$(eval $(call bcm63xxCfe,VR3026e,VR-3026e,vr-3026e,96368MT-1341N1,6368,--pad 4))
-# Comtrend WAP-5813n
-$(eval $(call bcm63xxCfe,WAP5813n,WAP-5813n,wap-5813n,96369R-1231N,6368,--pad 4))
-# D-Link DSL-2640B, rev B2
-$(eval $(call bcm63xxCfe,DSL2640B-B2,DSL2640B_B,dsl-2640b-b,D-4P-W,6348))
-# D-Link DSL-2640U, rev C1
-$(eval $(call bcm63xxCfe,DSL2640U,DSL2640U,dsl-2640u,96338W2_E7T,6338))
-# D-Link DSL-2650U
-$(eval $(call bcm63xxCfe,DSL2650U,DSL2650U,dsl-2650u,96358VW2,6358))
-# D-Link DSL-2740B/DSL-2741B, rev C2
-$(eval $(call bcm63xxCfe,DSL274XB_C,DSL274XB-C2,dsl-274xb-c,96358GW,6358))
-# D-Link DSL-2740B/DSL-2741B, rev C3
-$(eval $(call bcm63xxCfe,DSL274XB_C,DSL274XB-C3,dsl-274xb-c,AW4139,6358))
-# D-Link DSL-2740B/DSL-2741B, rev F1
-$(eval $(call bcm63xxCfe,DSL274XB_F,DSL274XB-F1-EU,dsl-274xb-f,AW4339U,6328,--signature2 "4.06.01.EUF1" --pad 4))
-$(eval $(call bcm63xxCfe,DSL274XB_F,DSL274XB-F1-AU,dsl-274xb-f,AW4339U,6328,--signature2 "4.06.01.AUF1" --pad 4))
-# D-Link DSL-2750B/DSL-2751, rev D1
-$(eval $(call bcm63xxCfe,DSL275XB_D,DSL275XB-D1,dsl-275xb-d,AW5200B,6318,--pad 4))
-# D-Link DVA-G3810BN/TL
-$(eval $(call bcm63xxCfe,DVAG3810BN,DVAG3810BN,dva-g3810bn_tl,96358VW,6358))
-# Davolink DV-201AMR
-$(eval $(call bcm63xxCfeOld,DV201AMR,DV-201AMR,dv-201amr,DV201AMR,6348))
-# Dynalink RTA770BW (Siemens SE515)
-$(eval $(call bcm63xxCfeRamdisk,RTA770BW,RTA770BW,rta770bw,RTA770BW,6345,--layoutver 5))
-# Dynalink RTA770W
-$(eval $(call bcm63xxCfeRamdisk,RTA770W,RTA770W,rta770w,RTA770W,6345,--layoutver 5))
-# Dynalink RTA1025W (numerous routers)
-$(eval $(call bcm63xxCfe,RTA1025W,RTA1025W_16,rta1025w,RTA1025W_16,6348,--layoutver 5))
-# Dynalink RTA1320 (numerous routers)
-$(eval $(call bcm63xxCfe,RTA1320,RTA1320_16M,rta1320,RTA1320_16M,6338,--layoutver 5))
-# Huawei HG520v
-$(eval $(call bcm63xxCfe,HG520v,HG520v,hg520v,HW6358GW_B,6358,--rsa-signature "EchoLife_HG520v"))
-# Huawei HG553
-$(eval $(call bcm63xxCfe,HG553,HG553,hg553,HW553,6358,--rsa-signature "EchoLife_HG553" --image-offset 0x20000 --block-size 0x20000 --tag-version 7))
-# Huawei HG556a
-$(eval $(call bcm63xxCfe,HG556a_AB,HG556a_A,hg556a-a,HW556,6358,--rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x10000 --tag-version 8))
-$(eval $(call bcm63xxCfe,HG556a_AB,HG556a_B,hg556a-b,HW556,6358,--rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x20000 --tag-version 8))
-$(eval $(call bcm63xxCfe,HG556a_C,HG556a_C,hg556a-c,HW556,6358,--rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x20000 --tag-version 8))
-# Huawei HG622
-$(eval $(call bcm63xxCfe,HG622,HG622,hg622,96368MVWG_hg622,6368,--image-offset 0x20000 --block-size 0x20000 --tag-version 7 --pad 8))
-# Huawei HG655b
-$(eval $(call bcm63xxCfe,HG655b,HG655b,hg655b,HW65x,6368,--image-offset 0x20000 --tag-version 7 --pad 4))
-# Inteno VG50
-$(eval $(call bcm63xxCfeRamdisk,VG50,vg50,vg50,VW6339GU,63268))
-# Inventel Livebox 1
-$(eval $(call bcm63xxRedBoot,Livebox,livebox,livebox-blue-5g))
-# Netgear CVG834G
-$(eval $(call bcm33xxHcsRamdisk,CVG834G,cvg834g,cvg834g,0xa020,0001,0022))
-# Netgear DG834GT/PN
-$(eval $(call bcm63xxCfe,DG834GTPN,DG834GT_PN,dg834gtpn,96348GW-10,6348))
-# Netgear DG834G v4
-$(eval $(call bcm63xxCfeRamdisk,DG834GV4,DG834GTv4,dg834g_v4,96348W3,6348))
-# Netgear DGND3700 v1
-$(eval $(call bcm63xxCfeNetgear,DGND3700v1_3800B,DGND3700v1,dgnd3700v1,96368MVWG,6368,--image-offset 0x20000 --block-size 0x20000,U12L144T01_NETGEAR_NEWLED,1))
-# Netgear DGND3800B
-$(eval $(call bcm63xxCfeNetgear,DGND3700v1_3800B,DGND3800B,dgnd3700v1,96368MVWG,6368,--image-offset 0x20000 --block-size 0x20000,U12L144T11_NETGEAR_NEWLED,1))
-# NuCom R5010UNv2
-$(eval $(call bcm63xxCfe,R5010UNV2,R5010UNv2,r5010unv2,96328ang,6328,--pad 8))
-# Pirelli Alice Gate VoIP 2 Plus Wi-Fi AGPF-S0
-$(eval $(call bcm63xxCfe,AGPF_S0,AGV2+W,agpf-s0,AGPF-S0,6358,--block-size 0x20000 --image-offset 0x20000 --signature2 IMAGE --tag-version 8))
-# Pirelli A226G
-$(eval $(call bcm63xxCfe,A226G,A226G,a226g,DWV-S0,6358,--signature2 IMAGE --tag-version 8))
-# Pirelli A226M/A226M-FWB
-$(eval $(call bcm63xxCfe,A226M,A226M,a226m,DWV-S0,6358,--signature2 IMAGE --tag-version 8))
-$(eval $(call bcm63xxCfe,A226M,A226M-FWB,a226m-fwb,DWV-S0,6358,--block-size 0x20000 --image-offset 0x20000 --signature2 IMAGE --tag-version 8))
-# Sagem F@ST2404
-$(eval $(call bcm63xxCfe,FAST2404,F@ST2404,fast2404,F@ST2404,6348))
-# Sagem F@ST2504n
-$(eval $(call bcm63xxCfe,FAST2504n,F@ST2504n,fast2504n,F@ST2504n,6362))
-# Sagem F@ST2604
-$(eval $(call bcm63xxCfe,FAST2604,F@ST2604,fast2604,F@ST2604,6348))
-# Sagem F@ST2704N V1 / Plusnet F@ST2704N V1
-$(eval $(call bcm63xxCfe,FAST2704N,FAST2704N,fast2704n,F@ST2704N,6318,--pad 4))
-# Sagem F@ST2704V2
-$(eval $(call bcm63xxCfe,FAST2704V2,F@ST2704V2,fast2704v2,F@ST2704V2,6328,--pad 4))
-# SFR Neufbox 4
-$(eval $(call bcm63xxCfe,Neufbox4,NEUFBOX4-SER,nb4-ser-r0,96358VW,6358,--rsa-signature "OpenWRT-$(REVISION)"))
-$(eval $(call bcm63xxCfe,Neufbox4,NEUFBOX4-FXC,nb4-fxc-r1,96358VW,6358,--rsa-signature "OpenWRT-$(REVISION)"))
-# SFR Neufbox 6
-$(eval $(call bcm63xxCfe,Neufbox6,NEUFBOX6,nb6-ser-r0,NB6-SER-r0,6362,--rsa-signature "OpenWRT-$(REVISION)"))
-# T-Com Speedport W 303V Typ B
-$(eval $(call bcm63xxCfeSpw303v,SPW303V,SPW303V,spw303v,96358-502V,6358,--pad 4))
-# T-Com Speedport W 500V
-$(eval $(call bcm63xxCfe,SPW500V,SPW500V,spw500v,96348GW,6348))
-# Tecom GW6000
-$(eval $(call bcm63xxCfe,GW6000,GW6000,gw6000,96348GW,6348))
-# Tecom GW6200
-$(eval $(call bcm63xxCfe,GW6200,GW6200,gw6200,96348GW,6348,--rsa-signature "$(shell printf '\x99')"))
-# Telsey CPVA502+
-$(eval $(call bcm63xxCfeRamdisk,CPVA502PLUS,CVPA502PLUS,cpva502plus,CPVA502+,6348,--signature "Telsey Tlc" --signature2 "99.99.999" --second-image-flag "0"))
-# Telsey CPVA642-type (e.g. CPA-ZNTE60T)
-$(eval $(call bcm63xxCfe,CPVA642,CPA-ZNTE60T,cpva642,CPVA642,6358,--signature "Telsey Tlc" --signature2 "99.99.999" --second-image-flag "0" --pad 4))
-# Telsey MAGIC (Alice W-Gate)
-$(eval $(call bcm63xxCfeRamdisk,MAGIC,MAGIC,magic,MAGIC,6348))
-# TP-Link TD-W8900GB
-$(eval $(call bcm63xxCfe,TDW8900GB,TD-W8900GB,td-w8900gb,96348GW-11,6348,--rsa-signature "$(shell printf 'PRID\x89\x10\x00\x02')" --image-offset 0x20000))
-# USRobotics 9108
-$(eval $(call bcm63xxCfe,USR9108,USR9108,usr9108,96348GW-A,6348))
-# ZyXEL P870HW-51a v2
-$(eval $(call bcm63xxCfeZyxel,P870HW_51a_v2,P870HW-51a_v2,p870hw-51a-v2,96368VVW,6368,--rsa-signature "ZyXEL" --signature "ZyXEL_0001"))
+include bcm63xx.mk
 
 $(eval $(call BuildImage))
diff --git a/target/linux/brcm63xx/image/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk
new file mode 100644
index 0000000000..148467375f
--- /dev/null
+++ b/target/linux/brcm63xx/image/bcm63xx.mk
@@ -0,0 +1,1056 @@
+#
+# BCM33XX/BCM63XX Profiles
+#
+
+define Device/bcm33xx
+  KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-lzma bin | hcs-initramfs
+  IMAGES :=
+  HCS_MAGIC_BYTES :=
+  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_INITRAMFS := kernel-bin | append-dtb | lzma | loader-lzma elf
+  IMAGES := cfe.bin
+  IMAGE/cfe.bin := cfe-bin
+  IMAGE/cfe-4M.bin := cfe-bin --pad 2
+  IMAGE/cfe-8M.bin := cfe-bin --pad 4
+  IMAGE/cfe-16M.bin := cfe-bin --pad 8
+  IMAGE/cfe-bc221.bin := cfe-bin --layoutver 5
+  IMAGE/cfe-old.bin := cfe-old-bin
+  CFE_BOARD_ID :=
+  CFE_CHIP_ID :=
+  CFE_EXTRAS :=
+endef
+DEVICE_VARS += CFE_BOARD_ID CFE_CHIP_ID CFE_EXTRAS
+
+define Device/bcm63xx_netgear
+  $(Device/bcm63xx)
+  IMAGES := factory.chk sysupgrade.bin
+  IMAGE/factory.chk := cfe-bin | netgear-chk
+  IMAGE/sysupgrade.bin := cfe-bin
+  NETGEAR_BOARD_ID :=
+  NETGEAR_REGION :=
+endef
+DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION
+
+define Device/bcm63xx_redboot
+  FILESYSTEMS := squashfs
+  KERNEL := kernel-bin | append-dtb | gzip
+  KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-lzma elf
+  IMAGES := redboot.bin
+  IMAGE/redboot.bin := redboot-bin
+  REDBOOT_PREFIX := $$(IMAGE_PREFIX)
+endef
+DEVICE_VARS += REDBOOT_PREFIX
+
+### Generic ###
+define Device/963281TAN-generic
+  $(Device/bcm63xx)
+  IMAGES := cfe-4M.bin cfe-8M.bin cfe-16M.bin
+  DEVICE_TITLE := Generic 963281TAN
+  DEVICE_DTS := bcm963281TAN
+  CFE_BOARD_ID := 963281TAN
+  CFE_CHIP_ID := 6328
+endef
+TARGET_DEVICES += 963281TAN-generic
+
+define Device/96328avng-generic
+  $(Device/bcm63xx)
+  IMAGES := cfe-4M.bin cfe-8M.bin cfe-16M.bin
+  DEVICE_TITLE := Generic 96328avng
+  DEVICE_DTS := bcm96328avng
+  CFE_BOARD_ID := 96328avng
+  CFE_CHIP_ID := 6328
+endef
+TARGET_DEVICES += 96328avng-generic
+
+define Device/96338GW-generic
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Generic 96338GW
+  DEVICE_DTS := bcm96338GW
+  CFE_BOARD_ID := 6338GW
+  CFE_CHIP_ID := 6338
+endef
+TARGET_DEVICES += 96338GW-generic
+
+define Device/96338W-generic
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Generic 96338W
+  DEVICE_DTS := bcm96338W
+  CFE_BOARD_ID := 6338W
+  CFE_CHIP_ID := 6338
+endef
+TARGET_DEVICES += 96338W-generic
+
+define Device/96345GW2-generic
+  $(Device/bcm63xx)
+  IMAGES += cfe-bc221.bin
+  DEVICE_TITLE := Generic 96345GW2
+  DEVICE_DTS := bcm96345GW2
+  CFE_BOARD_ID := 96345GW2
+  CFE_CHIP_ID := 6345
+endef
+TARGET_DEVICES += 96345GW2-generic
+
+define Device/96348GW-generic
+  $(Device/bcm63xx)
+  IMAGES += cfe-bc221.bin
+  DEVICE_TITLE := Generic 96348GW
+  DEVICE_DTS := bcm96348GW
+  CFE_BOARD_ID := 96348GW
+  CFE_CHIP_ID := 6348
+endef
+TARGET_DEVICES += 96348GW-generic
+
+define Device/96348GW-10-generic
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Generic 96348GW-10
+  DEVICE_DTS := bcm96348GW-10
+  CFE_BOARD_ID := 96348GW-10
+  CFE_CHIP_ID := 6348
+endef
+TARGET_DEVICES += 96348GW-10-generic
+
+define Device/96348GW-11-generic
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Generic 96348GW-11
+  DEVICE_DTS := bcm96348GW-11
+  CFE_BOARD_ID := 96348GW-11
+  CFE_CHIP_ID := 6348
+endef
+TARGET_DEVICES += 96348GW-11-generic
+
+define Device/96348R-generic
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Generic 96348R
+  DEVICE_DTS := bcm96348R
+  CFE_BOARD_ID := 96348R
+  CFE_CHIP_ID := 6348
+endef
+TARGET_DEVICES += 96348R-generic
+
+define Device/96358VW-generic
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Generic 96358VW
+  DEVICE_DTS := bcm96358VW
+  CFE_BOARD_ID := 96358VW
+  CFE_CHIP_ID := 6358
+endef
+TARGET_DEVICES += 96358VW-generic
+
+define Device/96358VW2-generic
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Generic 96358VW2
+  DEVICE_DTS := bcm96358VW2
+  CFE_BOARD_ID := 96358VW2
+  CFE_CHIP_ID := 6358
+endef
+TARGET_DEVICES += 96358VW2-generic
+
+define Device/96368MVNgr-generic
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Generic 96368MVNgr
+  DEVICE_DTS := bcm96368MVNgr
+  CFE_BOARD_ID := 96368MVNgr
+  CFE_CHIP_ID := 6368
+endef
+TARGET_DEVICES += 96368MVNgr-generic
+
+define Device/96368MVWG-generic
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Generic 96368MVWG
+  DEVICE_DTS := bcm96368MVWG
+  CFE_BOARD_ID := 96368MVWG
+  CFE_CHIP_ID := 6368
+endef
+TARGET_DEVICES += 96368MVWG-generic
+
+### ADB ###
+define Device/A4001N
+  $(Device/bcm63xx)
+  DEVICE_TITLE := ADB P.DG A4001N
+  DEVICE_DTS := a4001n
+  CFE_BOARD_ID := 96328dg2x2
+  CFE_CHIP_ID := 6328
+  CFE_EXTRAS := --pad 4
+  DEVICE_PACKAGES := \
+    $(USB2_PACKAGES) $(B43_PACKAGES)
+endef
+TARGET_DEVICES += A4001N
+
+define Device/A4001N1
+  $(Device/bcm63xx)
+  DEVICE_TITLE := ADB P.DG A4001N1
+  DEVICE_DTS := a4001n1
+  CFE_BOARD_ID := 963281T_TEF
+  CFE_CHIP_ID := 6328
+  CFE_EXTRAS := --pad 8
+  DEVICE_PACKAGES := \
+    $(USB2_PACKAGES) $(B43_PACKAGES)
+endef
+TARGET_DEVICES += A4001N1
+
+### Alcatel ###
+define Device/RG100A
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Alcatel RG100A
+  DEVICE_DTS := rg100a
+  CFE_BOARD_ID := 96358VW2
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --block-size 0x20000 --image-offset 0x20000
+  DEVICE_PACKAGES := \
+    $(USB2_PACKAGES) $(B43_PACKAGES)
+endef
+TARGET_DEVICES += RG100A
+
+### Asmax ###
+define Device/AR1004G
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Asmax AR 1004g
+  DEVICE_DTS := rg100a
+  CFE_BOARD_ID := 96348GW-10
+  CFE_CHIP_ID := 6348
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += AR1004G
+
+### Belkin ###
+define Device/F5D7633
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Belkin F5D7633
+  DEVICE_DTS := f5d7633
+  CFE_BOARD_ID := 96348GW-10
+  CFE_CHIP_ID := 6348
+  CFE_EXTRAS := --block-size 0x20000 --image-offset 0x20000
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += F5D7633
+
+### Broadcom ###
+define Device/BCM96318REF
+  $(Device/bcm63xx)
+  IMAGES :=
+  DEVICE_TITLE := Broadcom BCM96318REF reference board
+  DEVICE_DTS := bcm96318ref
+  CFE_BOARD_ID := 96318REF
+  CFE_CHIP_ID := 6318
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES) \
+    kmod-bcm63xx-udc
+endef
+TARGET_DEVICES += BCM96318REF
+
+define Device/BCM96318REF_P300
+  $(Device/bcm63xx)
+  IMAGES :=
+  DEVICE_TITLE := Broadcom BCM96318REF_P300 reference board
+  DEVICE_DTS := bcm96318ref_p300
+  CFE_BOARD_ID := 96318REF_P300
+  CFE_CHIP_ID := 6318
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES) \
+    kmod-bcm63xx-udc
+endef
+TARGET_DEVICES += BCM96318REF_P300
+
+define Device/BCM963268BU_P300
+  $(Device/bcm63xx)
+  IMAGES :=
+  DEVICE_TITLE := Broadcom BCM963268BU_P300 reference board
+  DEVICE_DTS := bcm963268bu_p300
+  CFE_BOARD_ID := 963268BU_P300
+  CFE_CHIP_ID := 63268
+  DEVICE_PACKAGES := \
+    $(USB2_PACKAGES) \
+    kmod-bcm63xx-udc
+endef
+TARGET_DEVICES += BCM963268BU_P300
+
+define Device/BCM963269BHR
+  $(Device/bcm63xx)
+  IMAGES :=
+  DEVICE_TITLE := Broadcom BCM963269BHR reference board
+  DEVICE_DTS := bcm963269bhr
+  CFE_BOARD_ID := 963269BHR
+  CFE_CHIP_ID := 63268
+  DEVICE_PACKAGES := \
+    $(USB2_PACKAGES) \
+    kmod-bcm63xx-udc
+endef
+TARGET_DEVICES += BCM963269BHR
+
+### BT ###
+define Device/HomeHub2A
+  $(Device/bcm63xx)
+  DEVICE_TITLE := BT Home Hub 2.0 A
+  DEVICE_DTS := homehub2a
+  CFE_BOARD_ID := HOMEHUB2A
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --image-offset 0x20000 --block-size 0x20000
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += HomeHub2A
+
+define Device/BTV2110
+  $(Device/bcm63xx)
+  DEVICE_TITLE := BT Voyager V2110
+  DEVICE_DTS := v2110
+  CFE_BOARD_ID := V2110
+  CFE_CHIP_ID := 6348
+  CFE_EXTRAS := --layoutver 5
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += BTV2110
+
+define Device/BTV2500V
+  $(Device/bcm63xx)
+  DEVICE_TITLE := BT Voyager V2500V
+  DEVICE_DTS := v2500v-bb
+  CFE_BOARD_ID := V2500V_BB
+  CFE_CHIP_ID := 6348
+  CFE_EXTRAS := --layoutver 5
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += BTV2500V
+
+### Comtrend ###
+define Device/AR5381u
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Comtrend AR-5381u
+  DEVICE_DTS := ar-5381u
+  CFE_BOARD_ID := 96328A-1241N
+  CFE_CHIP_ID := 6328
+  CFE_EXTRAS := --pad 8
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += AR5381u
+
+define Device/AR5387un
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Comtrend AR-5387un
+  DEVICE_DTS := ar-5387un
+  CFE_BOARD_ID := 96328A-1441N1
+  CFE_CHIP_ID := 6328
+  CFE_EXTRAS := --pad 8
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += AR5387un
+
+define Device/CT-536_CT-5621
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Comtrend CT-536+/CT-5621
+  DEVICE_DTS := ct536plus
+  CFE_BOARD_ID := 96348GW-11
+  CFE_CHIP_ID := 6348
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += CT-536_CT-5621
+
+define Device/CT-5365
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Comtrend CT-5365
+  DEVICE_DTS := ct-5365
+  CFE_BOARD_ID := 96348A-122
+  CFE_CHIP_ID := 6348
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += CT-5365
+
+define Device/CT-6373
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Comtrend CT-6373
+  DEVICE_DTS := ct-6373
+  CFE_BOARD_ID := CT6373-1
+  CFE_CHIP_ID := 6358
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += CT-6373
+
+define Device/VR-3025u
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Comtrend VR-3025u
+  DEVICE_DTS := vr-3025u
+  CFE_BOARD_ID := 96368M-1541N
+  CFE_CHIP_ID := 6368
+  CFE_EXTRAS := --pad 16 --image-offset 0x20000 --block-size 0x20000
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += VR-3025u
+
+define Device/VR-3025un
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Comtrend VR-3025un
+  DEVICE_DTS := vr-3025un
+  CFE_BOARD_ID := 96368M-1341N
+  CFE_CHIP_ID := 6368
+  CFE_EXTRAS := --pad 4
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += VR-3025un
+
+define Device/VR-3026e
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Comtrend VR-3026e
+  DEVICE_DTS := vr-3026e
+  CFE_BOARD_ID := 96368MT-1341N1
+  CFE_CHIP_ID := 6368
+  CFE_EXTRAS := --pad 4
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += VR-3026e
+
+define Device/WAP-5813n
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Comtrend WAP-5813n
+  DEVICE_DTS := wap-5813n
+  CFE_BOARD_ID := 96369R-1231N
+  CFE_CHIP_ID := 6368
+  CFE_EXTRAS := --pad 4
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += WAP-5813n
+
+### D-Link ###
+define Device/DSL2640B-B
+  $(Device/bcm63xx)
+  DEVICE_TITLE := D-Link DSL-2640B rev B2
+  DEVICE_DTS := dsl-2640b-b
+  CFE_BOARD_ID := D-4P-W
+  CFE_CHIP_ID := 6348
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += DSL2640B-B
+
+define Device/DSL2640U
+  $(Device/bcm63xx)
+  DEVICE_TITLE := D-Link DSL-2640U/BRU/C
+  DEVICE_DTS := dsl-2640u
+  CFE_BOARD_ID := 96338W2_E7T
+  CFE_CHIP_ID := 6338
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += DSL2640U
+
+define Device/DSL2650U
+  $(Device/bcm63xx)
+  DEVICE_TITLE := D-Link DSL-2650U
+  DEVICE_DTS := dsl-2650u
+  CFE_BOARD_ID := 96358VW2
+  CFE_CHIP_ID := 6358
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += DSL2650U
+
+define Device/DSL274XB-C2
+  $(Device/bcm63xx)
+  DEVICE_TITLE := D-Link DSL-2740B/DSL-2741B rev C2
+  DEVICE_DTS := dsl-274xb-c
+  CFE_BOARD_ID := 96358GW
+  CFE_CHIP_ID := 6358
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += DSL274XB-C2
+
+define Device/DSL274XB-C3
+  $(Device/bcm63xx)
+  DEVICE_TITLE := D-Link DSL-2740B/DSL-2741B rev C3
+  DEVICE_DTS := dsl-274xb-c
+  CFE_BOARD_ID := AW4139
+  CFE_CHIP_ID := 6358
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += DSL274XB-C3
+
+define Device/DSL274XB-F1-AU
+  $(Device/bcm63xx)
+  DEVICE_TITLE := D-Link DSL-2740B/DSL-2741B rev F1 (AU)
+  DEVICE_DTS := dsl-274xb-f
+  CFE_BOARD_ID := AW4339U
+  CFE_CHIP_ID := 6328
+  CFE_EXTRAS := --signature2 "4.06.01.AUF1" --pad 4
+  DEVICE_PACKAGES := \
+    $(ATH9K_PACKAGES)
+endef
+TARGET_DEVICES += DSL274XB-F1-AU
+
+define Device/DSL274XB-F1-EU
+  $(Device/bcm63xx)
+  DEVICE_TITLE := D-Link DSL-2740B/DSL-2741B rev F1 (EU)
+  DEVICE_DTS := dsl-274xb-f
+  CFE_BOARD_ID := AW4339U
+  CFE_CHIP_ID := 6328
+  CFE_EXTRAS := --signature2 "4.06.01.EUF1" --pad 4
+  DEVICE_PACKAGES := \
+    $(ATH9K_PACKAGES)
+endef
+TARGET_DEVICES += DSL274XB-F1-EU
+
+define Device/DSL275XB-D1
+  $(Device/bcm63xx)
+  DEVICE_TITLE := D-Link DSL-2750B/DSL-2751 rev D1
+  DEVICE_DTS := dsl-275xb-d
+  CFE_BOARD_ID := AW5200B
+  CFE_CHIP_ID := 6318
+  CFE_EXTRAS := --pad 4
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += DSL275XB-D1
+
+define Device/DVAG3810BN
+  $(Device/bcm63xx)
+  DEVICE_TITLE := D-Link DVA-G3810BN/TL
+  DEVICE_DTS := dva-g3810bn_tl
+  CFE_BOARD_ID := 96358VW
+  CFE_CHIP_ID := 6358
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += DVAG3810BN
+
+### Davolink ###
+define Device/DV-201AMR
+  $(Device/bcm63xx)
+  IMAGES := cfe-old.bin
+  DEVICE_TITLE := Davolink DV-201AMR
+  DEVICE_DTS := dv-201amr
+  CFE_BOARD_ID := DV201AMR
+  CFE_CHIP_ID := 6348
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += DV-201AMR
+
+### Dynalink ###
+define Device/RTA770BW
+  $(Device/bcm63xx)
+  IMAGES =
+  DEVICE_TITLE := Dynalink RTA770BW (Siemens SE 515)
+  DEVICE_DTS := rta770bw
+  CFE_BOARD_ID := RTA770BW
+  CFE_CHIP_ID := 6345
+  CFE_EXTRAS := --layoutver 5
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += RTA770BW
+
+define Device/RTA770W
+  $(Device/bcm63xx)
+  IMAGES =
+  DEVICE_TITLE := Dynalink RTA770W
+  DEVICE_DTS := rta770w
+  CFE_BOARD_ID := RTA770W
+  CFE_CHIP_ID := 6345
+  CFE_EXTRAS := --layoutver 5
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += RTA770W
+
+define Device/RTA1025W_16
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Dynalink RTA1025W
+  DEVICE_DTS := rta1025w
+  CFE_BOARD_ID := RTA1025W_16
+  CFE_CHIP_ID := 6348
+  CFE_EXTRAS := --layoutver 5
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += RTA1025W_16
+
+define Device/RTA1320_16M
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Dynalink RTA1320
+  DEVICE_DTS := rta1320
+  CFE_BOARD_ID := RTA1320_16M
+  CFE_CHIP_ID := 6338
+  CFE_EXTRAS := --layoutver 5
+endef
+TARGET_DEVICES += RTA1320_16M
+
+### Huawei ###
+define Device/HG520v
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Huawei EchoLife HG520v
+  DEVICE_DTS := hg520v
+  CFE_BOARD_ID := HW6358GW_B
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --rsa-signature "EchoLife_HG520v"
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += HG520v
+
+define Device/HG553
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Huawei EchoLife HG553
+  DEVICE_DTS := hg553
+  CFE_BOARD_ID := HW553
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --rsa-signature "EchoLife_HG553" --image-offset 0x20000 --block-size 0x20000 --tag-version 7
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += HG553
+
+define Device/HG556a-A
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Huawei EchoLife HG556a rev A
+  DEVICE_DESCRIPTION = Build firmware images for Huawei HG556a version A (Atheros)
+  DEVICE_DTS := hg556a-a
+  CFE_BOARD_ID := HW556
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x10000 --tag-version 8
+  DEVICE_PACKAGES := \
+    $(ATH9K_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += HG556a-A
+
+define Device/HG556a-B
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Huawei EchoLife HG556a rev B
+  DEVICE_DESCRIPTION = Build firmware images for Huawei HG556a version B (Atheros)
+  DEVICE_DTS := hg556a-b
+  CFE_BOARD_ID := HW556
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x20000 --tag-version 8
+  DEVICE_PACKAGES := \
+    $(ATH9K_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += HG556a-B
+
+define Device/HG556a-C
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Huawei EchoLife HG556a rev C
+  DEVICE_DESCRIPTION = Build firmware images for Huawei HG556a version B (Ralink)
+  DEVICE_DTS := hg556a-c
+  CFE_BOARD_ID := HW556
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x20000 --tag-version 8
+  DEVICE_PACKAGES := \
+    $(RT28_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += HG556a-C
+
+define Device/HG622
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Huawei EchoLife HG622
+  DEVICE_DTS := hg622
+  CFE_BOARD_ID := 96368MVWG_hg622
+  CFE_CHIP_ID := 6368
+  CFE_EXTRAS := --image-offset 0x20000 --block-size 0x20000 --tag-version 7 --pad 8
+  DEVICE_PACKAGES := \
+    $(RT28_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += HG622
+
+define Device/HG655b
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Huawei EchoLife HG655b
+  DEVICE_DTS := hg655b
+  CFE_BOARD_ID := HW65x
+  CFE_CHIP_ID := 6368
+  CFE_EXTRAS := --image-offset 0x20000 --tag-version 7 --pad 4
+  DEVICE_PACKAGES := \
+    $(RT28_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += HG655b
+
+### Inteno ###
+define Device/VG50
+  $(Device/bcm63xx)
+  IMAGES :=
+  DEVICE_TITLE := Inteno VG50 Multi-WAN CPE
+  DEVICE_DTS := vg50
+  CFE_BOARD_ID := VW6339GU
+  CFE_CHIP_ID := 63268
+  DEVICE_PACKAGES := \
+    $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += VG50
+
+### Inventel ###
+define Device/livebox
+  $(Device/bcm63xx_redboot)
+  DEVICE_TITLE := Inventel Livebox 1
+  DEVICE_DTS := livebox-blue-5g
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB1_PACKAGES)
+endef
+TARGET_DEVICES += livebox
+
+### Netgear ###
+define Device/CVG834G
+  $(Device/bcm33xx)
+  DEVICE_TITLE := Netgear CVG834G
+  DEVICE_DTS := cvg834g
+  HCS_MAGIC_BYTES := 0xa020
+  HCS_REV_MIN := 0001
+  HCS_REV_MAJ := 0022
+endef
+TARGET_DEVICES += CVG834G
+
+define Device/DG834GT_PN
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Netgear DG834GT/PN
+  DEVICE_DTS := dg834gtpn
+  CFE_BOARD_ID := 96348GW-10
+  CFE_CHIP_ID := 6348
+  DEVICE_PACKAGES := \
+    $(ATH5K_PACKAGES)
+endef
+TARGET_DEVICES += DG834GT_PN
+
+define Device/DG834GTv4
+  $(Device/bcm63xx)
+  IMAGES :=
+  DEVICE_TITLE := Netgear DG834G v4
+  DEVICE_DTS := dg834g_v4
+  CFE_BOARD_ID := 96348W3
+  CFE_CHIP_ID := 6348
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += DG834GTv4
+
+define Device/DGND3700v1
+  $(Device/bcm63xx_netgear)
+  IMAGES := factory.chk sysupgrade.bin
+  DEVICE_TITLE := Netgear DGND3700 v1
+  DEVICE_DTS := dgnd3700v1
+  CFE_BOARD_ID := 96368MVWG
+  CFE_CHIP_ID := 6368
+  CFE_EXTRAS := --image-offset 0x20000 --block-size 0x20000
+  NETGEAR_BOARD_ID := U12L144T01_NETGEAR_NEWLED
+  NETGEAR_REGION := 1
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += DGND3700v1
+
+define Device/DGND3800B
+  $(Device/bcm63xx_netgear)
+  IMAGES := factory.chk sysupgrade.bin
+  DEVICE_TITLE := Netgear DGND3800B
+  DEVICE_DTS := dgnd3700v1
+  CFE_BOARD_ID := 96368MVWG
+  CFE_CHIP_ID := 6368
+  CFE_EXTRAS := --image-offset 0x20000 --block-size 0x20000
+  NETGEAR_BOARD_ID := U12L144T11_NETGEAR_NEWLED
+  NETGEAR_REGION := 1
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += DGND3800B
+
+### NuCom ###
+define Device/R5010UNv2
+  $(Device/bcm63xx)
+  DEVICE_TITLE := NuCom R5010UN v2
+  DEVICE_DTS := r5010unv2
+  CFE_BOARD_ID := 96328ang
+  CFE_CHIP_ID := 6328
+  CFE_EXTRAS := --pad 8
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += R5010UNv2
+
+### Pirelli ###
+define Device/A226G
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Pirelli A226G
+  DEVICE_DTS := a226g
+  CFE_BOARD_ID := DWV-S0
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --signature2 IMAGE --tag-version 8
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += A226G
+
+define Device/A226M
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Pirelli A226M
+  DEVICE_DTS := a226m
+  CFE_BOARD_ID := DWV-S0
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --signature2 IMAGE --tag-version 8
+  DEVICE_PACKAGES := \
+    $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += A226M
+
+define Device/A226M-FWB
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Pirelli A226M-FWB
+  DEVICE_DTS := a226m-fwb
+  CFE_BOARD_ID := DWV-S0
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --block-size 0x20000 --image-offset 0x20000 --signature2 IMAGE --tag-version 8
+  DEVICE_PACKAGES := \
+    $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += A226M-FWB
+
+define Device/AGPF-S0
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Pirelli Alice Gate VoIP 2 Plus Wi-Fi AGPF-S0
+  DEVICE_DTS := agpf-s0
+  CFE_BOARD_ID := AGPF-S0
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --block-size 0x20000 --image-offset 0x20000 --signature2 IMAGE --tag-version 8
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += AGPF-S0
+
+### Sagem ###
+define Device/FAST2404
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Sagem F@ST2404
+  DEVICE_DTS := fast2404
+  CFE_BOARD_ID := F@ST2404
+  CFE_CHIP_ID := 6348
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += FAST2404
+
+define Device/FAST2504n
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Sagem F@ST2504n
+  DEVICE_DTS := fast2504n
+  CFE_BOARD_ID := F@ST2504n
+  CFE_CHIP_ID := 6362
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += FAST2504n
+
+define Device/FAST2604
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Sagem F@ST2604
+  DEVICE_DTS := fast2604
+  CFE_BOARD_ID := F@ST2604
+  CFE_CHIP_ID := 6348
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += FAST2604
+
+define Device/FAST2704N
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Sagem F@ST2704N
+  DEVICE_DTS := fast2704n
+  CFE_BOARD_ID := F@ST2704N
+  CFE_CHIP_ID := 6318
+  CFE_EXTRAS := --pad 4
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += FAST2704N
+
+define Device/FAST2704V2
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Sagem F@ST2704V2
+  DEVICE_DTS := fast2704v2
+  CFE_BOARD_ID := F@ST2704V2
+  CFE_CHIP_ID := 6328
+  CFE_EXTRAS := --pad 4
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += FAST2704V2
+
+### SFR ###
+define Device/NEUFBOX4-SER
+  $(Device/bcm63xx)
+  DEVICE_TITLE := SFR Neufbox4 (Sercomm)
+  DEVICE_DTS := nb4-ser-r0
+  CFE_BOARD_ID := 96358VW
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --rsa-signature "LEDE-$(REVISION)"
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += NEUFBOX4-SER
+
+define Device/NEUFBOX4-FXC
+  $(Device/bcm63xx)
+  DEVICE_TITLE := SFR Neufbox4 (Foxconn)
+  DEVICE_DTS := nb4-fxc-r1
+  CFE_BOARD_ID := 96358VW
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --rsa-signature "LEDE-$(REVISION)"
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += NEUFBOX4-FXC
+
+define Device/NEUFBOX6
+  $(Device/bcm63xx)
+  DEVICE_TITLE := SFR Neufbox6
+  DEVICE_DTS := nb6-ser-r0
+  CFE_BOARD_ID := NB6-SER-r0
+  CFE_CHIP_ID := 6362
+  CFE_EXTRAS := --rsa-signature "LEDE-$(REVISION)"
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += NEUFBOX6
+
+### T-Com ###
+define Device/SPW303V
+  $(Device/bcm63xx)
+  IMAGES := factory.bin sysupgrade.bin
+  IMAGE/factory.bin := cfe-spw303v-bin | spw303v-bin | xor-image
+  IMAGE/sysupgrade.bin := cfe-spw303v-bin | spw303v-bin
+  DEVICE_TITLE := T-Com Speedport W 303V
+  DEVICE_DTS := spw303v
+  CFE_BOARD_ID := 96358-502V
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --pad 4
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += SPW303V
+
+define Device/SPW500V
+  $(Device/bcm63xx)
+  DEVICE_TITLE := T-Com Speedport W 500V
+  DEVICE_DTS := spw500v
+  CFE_BOARD_ID := 96348GW
+  CFE_CHIP_ID := 6348
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += SPW500V
+
+### Tecom ###
+define Device/GW6000
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Tecom GW6000
+  DEVICE_DTS := gw6000
+  CFE_BOARD_ID := 96348GW
+  CFE_CHIP_ID := 6348
+  DEVICE_PACKAGES := \
+    $(BRCMWL_PACKAGES) $(USB1_PACKAGES)
+endef
+TARGET_DEVICES += GW6000
+
+define Device/GW6200
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Tecom GW6200
+  DEVICE_DTS := gw6200
+  CFE_BOARD_ID := 96348GW
+  CFE_CHIP_ID := 6348
+  CFE_EXTRAS := --rsa-signature "$(shell printf '\x99')"
+  DEVICE_PACKAGES := \
+    $(BRCMWL_PACKAGES) $(USB1_PACKAGES)
+endef
+TARGET_DEVICES += GW6200
+
+### Telsey ###
+define Device/CVPA502PLUS
+  $(Device/bcm63xx)
+  IMAGES :=
+  DEVICE_TITLE := Telsey CPVA502+
+  DEVICE_DTS := cpva502plus
+  CFE_BOARD_ID := CPVA502+
+  CFE_CHIP_ID := 6348
+  CFE_EXTRAS := --signature "Telsey Tlc" --signature2 "99.99.999" --second-image-flag "0"
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += CVPA502PLUS
+
+define Device/CPA-ZNTE60T
+  $(Device/bcm63xx)
+  DEVICE_TITLE := Telsey CPVA642-type (CPA-ZNTE60T)
+  DEVICE_DTS := cpva642
+  CFE_BOARD_ID := CPVA642
+  CFE_CHIP_ID := 6358
+  CFE_EXTRAS := --signature "Telsey Tlc" --signature2 "99.99.999" --second-image-flag "0" --pad 4
+  DEVICE_PACKAGES := \
+    $(RT63_PACKAGES) $(USB2_PACKAGES)
+endef
+TARGET_DEVICES += CPA-ZNTE60T
+
+define Device/MAGIC
+  $(Device/bcm63xx)
+  IMAGES :=
+  DEVICE_TITLE := Telsey MAGIC (Alice W-Gate)
+  DEVICE_DTS := magic
+  CFE_BOARD_ID := MAGIC
+  CFE_CHIP_ID := 6348
+  DEVICE_PACKAGES := \
+    $(RT63_PACKAGES)
+endef
+TARGET_DEVICES += MAGIC
+
+### TP-Link ###
+define Device/TD-W8900GB
+  $(Device/bcm63xx)
+  DEVICE_TITLE := TP-Link TD-W8900GB
+  DEVICE_DTS := td-w8900gb
+  CFE_BOARD_ID := 96348GW-11
+  CFE_CHIP_ID := 6348
+  CFE_EXTRAS := --rsa-signature "$(shell printf 'PRID\x89\x10\x00\x02')" --image-offset 0x20000
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += TD-W8900GB
+
+### USRobotics ###
+define Device/USR9108
+  $(Device/bcm63xx)
+  DEVICE_TITLE := USRobotics 9108
+  DEVICE_DTS := usr9108
+  CFE_BOARD_ID := 96348GW-A
+  CFE_CHIP_ID := 6348
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES) $(USB1_PACKAGES)
+endef
+TARGET_DEVICES += USR9108
+
+### ZyXEL ###
+define Device/P870HW-51a_v2
+  $(Device/bcm63xx)
+  IMAGES := factory.bin
+  IMAGE/factory.bin := cfe-bin | zyxel-bin
+  DEVICE_TITLE := ZyXEL P870HW-51a v2
+  DEVICE_DTS := p870hw-51a-v2
+  CFE_BOARD_ID := 96368VVW
+  CFE_CHIP_ID := 6368
+  CFE_EXTRAS := --rsa-signature "ZyXEL" --signature "ZyXEL_0001"
+  DEVICE_PACKAGES := \
+    $(B43_PACKAGES)
+endef
+TARGET_DEVICES += P870HW-51a_v2