From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Fri, 7 Aug 2020 19:11:14 +0000 (+0200)
Subject: bcm47xx: use vendor_model scheme for device/image names
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d0cb71a8962719f2e64d43f9bed808633cfc9cd9;p=openwrt%2Fstaging%2Fjogo.git

bcm47xx: use vendor_model scheme for device/image names

Most targets have been updated to consistently use the vendor_model
scheme for device definitions and thus, image names.

Apply this to bcm47xx as well. This does _not_ apply any other
specific naming changes.

Cc: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/bcm47xx/image/generic.mk b/target/linux/bcm47xx/image/generic.mk
index e5ae952137..61204bf232 100644
--- a/target/linux/bcm47xx/image/generic.mk
+++ b/target/linux/bcm47xx/image/generic.mk
@@ -3,7 +3,7 @@
 #################################################
 
   # BCM4705 with tg3
-define Device/linksys-wrt300n-v1.1
+define Device/linksys_wrt300n-v1.1
   DEVICE_MODEL := WRT300N
   DEVICE_VARIANT := v1.1
   DEVICE_PACKAGES := kmod-tg3 kmod-b43
@@ -11,9 +11,9 @@ define Device/linksys-wrt300n-v1.1
   DEVICE_ID := EWC2
   VERSION := 1.51.2
 endef
-TARGET_DEVICES += linksys-wrt300n-v1.1
+TARGET_DEVICES += linksys_wrt300n-v1.1
 
-define Device/linksys-wrt310n-v1
+define Device/linksys_wrt310n-v1
   DEVICE_MODEL := WRT310N
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-tg3 kmod-b43
@@ -21,9 +21,9 @@ define Device/linksys-wrt310n-v1
   DEVICE_ID := 310N
   VERSION := 1.0.10
 endef
-TARGET_DEVICES += linksys-wrt310n-v1
+TARGET_DEVICES += linksys_wrt310n-v1
 
-define Device/linksys-wrt350n-v1
+define Device/linksys_wrt350n-v1
   DEVICE_MODEL := WRT350N
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-tg3 kmod-b43 $(USB2_PACKAGES)
@@ -31,9 +31,9 @@ define Device/linksys-wrt350n-v1
   DEVICE_ID := EWCG
   VERSION := 1.04.1
 endef
-TARGET_DEVICES += linksys-wrt350n-v1
+TARGET_DEVICES += linksys_wrt350n-v1
 
-define Device/linksys-wrt610n-v1
+define Device/linksys_wrt610n-v1
   DEVICE_MODEL := WRT610N
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-tg3 kmod-b43 $(USB2_PACKAGES)
@@ -41,10 +41,10 @@ define Device/linksys-wrt610n-v1
   DEVICE_ID := 610N
   VERSION := 1.0.1
 endef
-TARGET_DEVICES += linksys-wrt610n-v1
+TARGET_DEVICES += linksys_wrt610n-v1
 
   # BCMA SoC with SSB WiFi
-define Device/linksys-wrt610n-v2
+define Device/linksys_wrt610n-v2
   DEVICE_MODEL := WRT610N
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-bgmac kmod-b43 $(USB2_PACKAGES)
@@ -52,9 +52,9 @@ define Device/linksys-wrt610n-v2
   DEVICE_ID := 610N
   VERSION := 2.0.0
 endef
-TARGET_DEVICES += linksys-wrt610n-v2
+TARGET_DEVICES += linksys_wrt610n-v2
 
-define Device/linksys-e3000-v1
+define Device/linksys_e3000-v1
   DEVICE_MODEL := E3000
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-bgmac kmod-b43 $(USB2_PACKAGES)
@@ -62,7 +62,7 @@ define Device/linksys-e3000-v1
   DEVICE_ID := 61XN
   VERSION := 1.0.3
 endef
-TARGET_DEVICES += linksys-e3000-v1
+TARGET_DEVICES += linksys_e3000-v1
 
 # generic has Ethernet drivers as modules so overwrite standard image
 define Device/standard
diff --git a/target/linux/bcm47xx/image/legacy.mk b/target/linux/bcm47xx/image/legacy.mk
index 66d7efd5d2..4538813b91 100644
--- a/target/linux/bcm47xx/image/legacy.mk
+++ b/target/linux/bcm47xx/image/legacy.mk
@@ -2,107 +2,107 @@
 # Subtarget legacy
 #################################################
 
-define Device/asus-wl-300g
+define Device/asus_wl-300g
   DEVICE_MODEL := WL-300g
   DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
   $(Device/asus)
   PRODUCTID := "WL300g      "
 endef
-TARGET_DEVICES += asus-wl-300g
+TARGET_DEVICES += asus_wl-300g
 
-define Device/asus-wl-320gp
+define Device/asus_wl-320gp
   DEVICE_MODEL := WL-320gP
   DEVICE_PACKAGES := kmod-b43
   $(Device/asus)
   PRODUCTID := "WL320gP     "
 endef
-TARGET_DEVICES += asus-wl-320gp
+TARGET_DEVICES += asus_wl-320gp
 
-define Device/asus-wl-330ge
+define Device/asus_wl-330ge
   DEVICE_MODEL := WL-330gE
   DEVICE_PACKAGES := kmod-b43
   $(Device/asus)
   PRODUCTID := "WL-330gE    "
 endef
-TARGET_DEVICES += asus-wl-330ge
+TARGET_DEVICES += asus_wl-330ge
 
-define Device/asus-wl-500gd
+define Device/asus_wl-500gd
   DEVICE_MODEL := WL-500g Deluxe
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := "WL500gx     "
 endef
-TARGET_DEVICES += asus-wl-500gd
+TARGET_DEVICES += asus_wl-500gd
 
-define Device/asus-wl-500gp-v1
+define Device/asus_wl-500gp-v1
   DEVICE_MODEL := WL-500gP
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := "WL500gp     "
 endef
-TARGET_DEVICES += asus-wl-500gp-v1
+TARGET_DEVICES += asus_wl-500gp-v1
 
-define Device/asus-wl-500gp-v2
+define Device/asus_wl-500gp-v2
   DEVICE_MODEL := WL-500gP
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := "WL500gpv2   "
 endef
-TARGET_DEVICES += asus-wl-500gp-v2
+TARGET_DEVICES += asus_wl-500gp-v2
 
-define Device/asus-wl-500w
+define Device/asus_wl-500w
   DEVICE_MODEL := WL-500W
   DEVICE_PACKAGES := kmod-b43 kmod-usb-uhci kmod-usb2-pci
   $(Device/asus)
   PRODUCTID := "WL500W      "
 endef
-TARGET_DEVICES += asus-wl-500w
+TARGET_DEVICES += asus_wl-500w
 
-define Device/asus-wl-520gu
+define Device/asus_wl-520gu
   DEVICE_MODEL := WL-520gU
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := "WL520gu     "
 endef
-TARGET_DEVICES += asus-wl-520gu
+TARGET_DEVICES += asus_wl-520gu
 
-define Device/asus-wl-550ge
+define Device/asus_wl-550ge
   DEVICE_MODEL := WL-550gE
   DEVICE_PACKAGES := kmod-b43
   $(Device/asus)
   PRODUCTID := "WL550gE     "
 endef
-TARGET_DEVICES += asus-wl-550ge
+TARGET_DEVICES += asus_wl-550ge
 
-define Device/asus-wl-hdd25
+define Device/asus_wl-hdd25
   DEVICE_MODEL := WL-HDD25
   DEVICE_PACKAGES := kmod-b43 kmod-b43legacy $(USB1_PACKAGES)
   $(Device/asus)
   PRODUCTID := "WLHDD       "
 endef
-TARGET_DEVICES += asus-wl-hdd25
+TARGET_DEVICES += asus_wl-hdd25
 
-define Device/dlink-dwl-3150
+define Device/dlink_dwl-3150
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DWL-3150
   IMAGES := bin
   IMAGE/bin := append-rootfs | trx-with-loader | tailed-bin
   BIN_TAIL := BCM-5352-2050-0000000-01
 endef
-TARGET_DEVICES += dlink-dwl-3150
+TARGET_DEVICES += dlink_dwl-3150
 
-define Device/edimax-ps1208-mfg
+define Device/edimax_ps1208-mfg
   DEVICE_VENDOR := Edimax
   DEVICE_MODEL := PS-1208MFg
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   IMAGES := bin
   IMAGE/bin := append-rootfs | trx-with-loader | edimax-bin
 endef
-TARGET_DEVICES += edimax-ps1208-mfg
+TARGET_DEVICES += edimax_ps1208-mfg
 
-define Device/huawei-e970
+define Device/huawei_e970
   DEVICE_VENDOR := Huawei
   DEVICE_MODEL := E970
   DEVICE_PACKAGES := kmod-b43
@@ -110,26 +110,26 @@ define Device/huawei-e970
   IMAGES := bin
   IMAGE/bin := append-rootfs | trx-without-loader | huawei-bin
 endef
-TARGET_DEVICES += huawei-e970
+TARGET_DEVICES += huawei_e970
 
-define Device/linksys-wrt54g3g
+define Device/linksys_wrt54g3g
   DEVICE_MODEL := WRT54G3G
   DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := W54F
   VERSION := 2.20.1
 endef
-TARGET_DEVICES += linksys-wrt54g3g
+TARGET_DEVICES += linksys_wrt54g3g
 
-define Device/linksys-wrt54g3g-em
+define Device/linksys_wrt54g3g-em
   DEVICE_MODEL := WRT54G3G-EM
   $(Device/linksys)
   DEVICE_ID := W3GN
   VERSION := 2.20.1
 endef
-TARGET_DEVICES += linksys-wrt54g3g-em
+TARGET_DEVICES += linksys_wrt54g3g-em
 
-define Device/linksys-wrt54g3gv2-vf
+define Device/linksys_wrt54g3gv2-vf
   DEVICE_VENDOR := Linksys
   DEVICE_MODEL := WRT54G3GV2-VF
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
@@ -141,18 +141,18 @@ define Device/linksys-wrt54g3gv2-vf
   VERSION := 3.00.24
   SERIAL := 6
 endef
-TARGET_DEVICES += linksys-wrt54g3gv2-vf
+TARGET_DEVICES += linksys_wrt54g3gv2-vf
 
-define Device/linksys-wrt54g
+define Device/linksys_wrt54g
   DEVICE_MODEL := WRT54G
   DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
   $(Device/linksys)
   DEVICE_ID := W54G
   VERSION := 4.71.1
 endef
-TARGET_DEVICES += linksys-wrt54g
+TARGET_DEVICES += linksys_wrt54g
 
-define Device/linksys-wrt54gs
+define Device/linksys_wrt54gs
   DEVICE_MODEL := WRT54GS
   DEVICE_VARIANT := v1/v2/v3
   DEVICE_ALT0_VENDOR := Linksys
@@ -164,9 +164,9 @@ define Device/linksys-wrt54gs
   DEVICE_ID := W54S
   VERSION := 4.80.1
 endef
-TARGET_DEVICES += linksys-wrt54gs
+TARGET_DEVICES += linksys_wrt54gs
 
-define Device/linksys-wrt54gs-v4
+define Device/linksys_wrt54gs-v4
   DEVICE_MODEL := WRT54GS
   DEVICE_VARIANT := v4
   DEVICE_PACKAGES := kmod-b43
@@ -174,9 +174,9 @@ define Device/linksys-wrt54gs-v4
   DEVICE_ID := W54s
   VERSION := 1.09.1
 endef
-TARGET_DEVICES += linksys-wrt54gs-v4
+TARGET_DEVICES += linksys_wrt54gs-v4
 
-define Device/linksys-wrtsl54gs
+define Device/linksys_wrtsl54gs
   DEVICE_MODEL := WRTSL54GS
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/linksys)
@@ -184,18 +184,18 @@ define Device/linksys-wrtsl54gs
   DEVICE_ID := W54U
   VERSION := 2.08.1
 endef
-TARGET_DEVICES += linksys-wrtsl54gs
+TARGET_DEVICES += linksys_wrtsl54gs
 
-define Device/linksys-wrt150n
+define Device/linksys_wrt150n
   DEVICE_MODEL := WRT150N
   DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := N150
   VERSION := 1.51.3
 endef
-TARGET_DEVICES += linksys-wrt150n
+TARGET_DEVICES += linksys_wrt150n
 
-define Device/linksys-wrt160n-v1
+define Device/linksys_wrt160n-v1
   DEVICE_MODEL := WRT160N
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43
@@ -203,9 +203,9 @@ define Device/linksys-wrt160n-v1
   DEVICE_ID := N150
   VERSION := 1.50.1
 endef
-TARGET_DEVICES += linksys-wrt160n-v1
+TARGET_DEVICES += linksys_wrt160n-v1
 
-define Device/linksys-wrt300n-v1
+define Device/linksys_wrt300n-v1
   DEVICE_MODEL := WRT300N
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43
@@ -214,33 +214,33 @@ define Device/linksys-wrt300n-v1
   DEVICE_ID := EWCB
   VERSION := 1.03.6
 endef
-TARGET_DEVICES += linksys-wrt300n-v1
+TARGET_DEVICES += linksys_wrt300n-v1
 
-define Device/motorola-wa840g
+define Device/motorola_wa840g
   DEVICE_MODEL := WA840G
   DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
   $(Device/motorola)
   MOTOROLA_DEVICE := 2
 endef
-TARGET_DEVICES += motorola-wa840g
+TARGET_DEVICES += motorola_wa840g
 
-define Device/motorola-we800g
+define Device/motorola_we800g
   DEVICE_MODEL := WE800G
   DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
   $(Device/motorola)
   MOTOROLA_DEVICE := 3
 endef
-TARGET_DEVICES += motorola-we800g
+TARGET_DEVICES += motorola_we800g
 
-define Device/motorola-wr850g
+define Device/motorola_wr850g
   DEVICE_MODEL := WR850G
   DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
   $(Device/motorola)
   MOTOROLA_DEVICE := 1
 endef
-TARGET_DEVICES += motorola-wr850g
+TARGET_DEVICES += motorola_wr850g
 
-define Device/netgear-wgr614-v8
+define Device/netgear_wgr614-v8
   DEVICE_MODEL := WGR614
   DEVICE_VARIANT := v8
   DEVICE_PACKAGES := kmod-b43
@@ -248,9 +248,9 @@ define Device/netgear-wgr614-v8
   NETGEAR_BOARD_ID := U12H072T00_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear-wgr614-v8
+TARGET_DEVICES += netgear_wgr614-v8
 
-define Device/netgear-wgt634u
+define Device/netgear_wgt634u
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := WGT634U
   DEVICE_PACKAGES := kmod-ath5k $(USB2_PACKAGES)
@@ -258,9 +258,9 @@ define Device/netgear-wgt634u
   IMAGES := bin
   IMAGE/bin := append-rootfs | trx-with-loader | prepend-with-elf
 endef
-TARGET_DEVICES += netgear-wgt634u
+TARGET_DEVICES += netgear_wgt634u
 
-define Device/netgear-wndr3300-v1
+define Device/netgear_wndr3300-v1
   DEVICE_MODEL := WNDR3300
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43
@@ -268,9 +268,9 @@ define Device/netgear-wndr3300-v1
   NETGEAR_BOARD_ID := U12H093T00_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear-wndr3300-v1
+TARGET_DEVICES += netgear_wndr3300-v1
 
-define Device/netgear-wnr834b-v2
+define Device/netgear_wnr834b-v2
   DEVICE_MODEL := WNR834B
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-b43
@@ -278,15 +278,15 @@ define Device/netgear-wnr834b-v2
   NETGEAR_BOARD_ID := U12H081T00_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear-wnr834b-v2
+TARGET_DEVICES += netgear_wnr834b-v2
 
-define Device/usrobotics-usr5461
+define Device/usrobotics_usr5461
   DEVICE_VENDOR := US Robotics
   DEVICE_MODEL := USR5461
   DEVICE_PACKAGES := kmod-b43 $(USB1_PACKAGES)
   IMAGES := bin
   IMAGE/bin := append-rootfs | trx-with-loader | usrobotics-bin
 endef
-TARGET_DEVICES += usrobotics-usr5461
+TARGET_DEVICES += usrobotics_usr5461
 
 TARGET_DEVICES += standard standard-noloader-gz
diff --git a/target/linux/bcm47xx/image/mips74k.mk b/target/linux/bcm47xx/image/mips74k.mk
index fb3c594c03..53e7b53eba 100644
--- a/target/linux/bcm47xx/image/mips74k.mk
+++ b/target/linux/bcm47xx/image/mips74k.mk
@@ -2,155 +2,155 @@
 # Subtarget mips74k
 #################################################
 
-define Device/asus-rt-ac53u
+define Device/asus_rt-ac53u
   DEVICE_MODEL := RT-AC53U
   DEVICE_PACKAGES := $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-AC53U
 endef
-TARGET_DEVICES += asus-rt-ac53u
+TARGET_DEVICES += asus_rt-ac53u
 
-define Device/asus-rt-ac66u
+define Device/asus_rt-ac66u
   DEVICE_MODEL := RT-AC66U
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-AC66U
   DEFAULT := n
 endef
-TARGET_DEVICES += asus-rt-ac66u
+TARGET_DEVICES += asus_rt-ac66u
 
-define Device/asus-rt-n10
+define Device/asus_rt-n10
   DEVICE_MODEL := RT-N10
   DEVICE_PACKAGES := kmod-b43
   $(Device/asus)
   PRODUCTID := "RT-N10      "
 endef
-TARGET_DEVICES += asus-rt-n10
+TARGET_DEVICES += asus_rt-n10
 
-define Device/asus-rt-n10p
+define Device/asus_rt-n10p
   DEVICE_MODEL := RT-N10P
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43
   $(Device/asus)
   PRODUCTID := RT-N10P
 endef
-TARGET_DEVICES += asus-rt-n10p
+TARGET_DEVICES += asus_rt-n10p
 
-define Device/asus-rt-n10p-v2
+define Device/asus_rt-n10p-v2
   DEVICE_MODEL := RT-N10P
   DEVICE_VARIANT := v2
   $(Device/asus)
   PRODUCTID := RT-N10PV2
 endef
-TARGET_DEVICES += asus-rt-n10p-v2
+TARGET_DEVICES += asus_rt-n10p-v2
 
-define Device/asus-rt-n10u
+define Device/asus_rt-n10u
   DEVICE_MODEL := RT-N10U
   DEVICE_VARIANT := A
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-N10U
 endef
-TARGET_DEVICES += asus-rt-n10u
+TARGET_DEVICES += asus_rt-n10u
 
-define Device/asus-rt-n10u-b
+define Device/asus_rt-n10u-b
   DEVICE_MODEL := RT-N10U
   DEVICE_VARIANT := B
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-N10U
 endef
-TARGET_DEVICES += asus-rt-n10u-b
+TARGET_DEVICES += asus_rt-n10u-b
 
-define Device/asus-rt-n12
+define Device/asus_rt-n12
   DEVICE_MODEL := RT-N12
   DEVICE_VARIANT := A1
   DEVICE_PACKAGES := kmod-b43
   $(Device/asus)
   PRODUCTID := "RT-N12      "
 endef
-TARGET_DEVICES += asus-rt-n12
+TARGET_DEVICES += asus_rt-n12
 
-define Device/asus-rt-n12-b1
+define Device/asus_rt-n12-b1
   DEVICE_MODEL := RT-N12
   DEVICE_VARIANT := B1
   $(Device/asus)
   PRODUCTID := RT-N12B1
 endef
-TARGET_DEVICES += asus-rt-n12-b1
+TARGET_DEVICES += asus_rt-n12-b1
 
-define Device/asus-rt-n12-c1
+define Device/asus_rt-n12-c1
   DEVICE_MODEL := RT-N12
   DEVICE_VARIANT := C1
   $(Device/asus)
   PRODUCTID := RT-N12C1
 endef
-TARGET_DEVICES += asus-rt-n12-c1
+TARGET_DEVICES += asus_rt-n12-c1
 
-define Device/asus-rt-n12-d1
+define Device/asus_rt-n12-d1
   DEVICE_MODEL := RT-N12
   DEVICE_VARIANT := D1
   $(Device/asus)
   PRODUCTID := RT-N12D1
 endef
-TARGET_DEVICES += asus-rt-n12-d1
+TARGET_DEVICES += asus_rt-n12-d1
 
-define Device/asus-rt-n12hp
+define Device/asus_rt-n12hp
   DEVICE_MODEL := RT-N12HP
   $(Device/asus)
   PRODUCTID := RT-N12HP
 endef
-TARGET_DEVICES += asus-rt-n12hp
+TARGET_DEVICES += asus_rt-n12hp
 
-define Device/asus-rt-n14uhp
+define Device/asus_rt-n14uhp
   DEVICE_MODEL := RT-N14UHP
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-N14UHP
 endef
-TARGET_DEVICES += asus-rt-n14uhp
+TARGET_DEVICES += asus_rt-n14uhp
 
-define Device/asus-rt-n15u
+define Device/asus_rt-n15u
   DEVICE_MODEL := RT-N15U
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-N15U
 endef
-TARGET_DEVICES += asus-rt-n15u
+TARGET_DEVICES += asus_rt-n15u
 
-define Device/asus-rt-n16
+define Device/asus_rt-n16
   DEVICE_MODEL := RT-N16
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-N16
 endef
-TARGET_DEVICES += asus-rt-n16
+TARGET_DEVICES += asus_rt-n16
 
-define Device/asus-rt-n53
+define Device/asus_rt-n53
   DEVICE_MODEL := RT-N53
   DEVICE_PACKAGES := kmod-b43
   $(Device/asus)
   PRODUCTID := RT-N53
 endef
-TARGET_DEVICES += asus-rt-n53
+TARGET_DEVICES += asus_rt-n53
 
-define Device/asus-rt-n66u
+define Device/asus_rt-n66u
   DEVICE_MODEL := RT-N66U
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-N66U
 endef
-TARGET_DEVICES += asus-rt-n66u
+TARGET_DEVICES += asus_rt-n66u
 
-define Device/asus-rt-n66w
+define Device/asus_rt-n66w
   DEVICE_MODEL := RT-N66W
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-N66U
 endef
-TARGET_DEVICES += asus-rt-n66w
+TARGET_DEVICES += asus_rt-n66w
 
-define Device/linksys-wrt160n-v3
+define Device/linksys_wrt160n-v3
   DEVICE_MODEL := WRT160N
   DEVICE_VARIANT := v3
   DEVICE_PACKAGES := kmod-b43
@@ -159,9 +159,9 @@ define Device/linksys-wrt160n-v3
   VERSION := 3.0.3
   DEFAULT := n
 endef
-TARGET_DEVICES += linksys-wrt160n-v3
+TARGET_DEVICES += linksys_wrt160n-v3
 
-define Device/linksys-wrt310n-v2
+define Device/linksys_wrt310n-v2
   DEVICE_MODEL := WRT310N
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-b43
@@ -169,9 +169,9 @@ define Device/linksys-wrt310n-v2
   DEVICE_ID := 310N
   VERSION := 2.0.1
 endef
-TARGET_DEVICES += linksys-wrt310n-v2
+TARGET_DEVICES += linksys_wrt310n-v2
 
-define Device/linksys-wrt320n-v1
+define Device/linksys_wrt320n-v1
   DEVICE_MODEL := WRT320N
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43
@@ -179,18 +179,18 @@ define Device/linksys-wrt320n-v1
   DEVICE_ID := 320N
   VERSION := 1.0.5
 endef
-TARGET_DEVICES += linksys-wrt320n-v1
+TARGET_DEVICES += linksys_wrt320n-v1
 
-define Device/linksys-e900-v1
+define Device/linksys_e900-v1
   DEVICE_MODEL := E900
   DEVICE_VARIANT := v1
   $(Device/linksys)
   DEVICE_ID := E900
   VERSION := 1.0.4
 endef
-TARGET_DEVICES += linksys-e900-v1
+TARGET_DEVICES += linksys_e900-v1
 
-define Device/linksys-e1000
+define Device/linksys_e1000
   DEVICE_MODEL := E1000
   DEVICE_VARIANT := v1/v2/v2.1
   DEVICE_PACKAGES := kmod-b43
@@ -198,36 +198,36 @@ define Device/linksys-e1000
   DEVICE_ID := E100
   VERSION := 1.1.3
 endef
-TARGET_DEVICES += linksys-e1000
+TARGET_DEVICES += linksys_e1000
 
-define Device/linksys-e1200-v1
+define Device/linksys_e1200-v1
   DEVICE_MODEL := E1200
   DEVICE_VARIANT := v1
   $(Device/linksys)
   DEVICE_ID := E120
   VERSION := 1.0.3
 endef
-TARGET_DEVICES += linksys-e1200-v1
+TARGET_DEVICES += linksys_e1200-v1
 
-define Device/linksys-e1200-v2
+define Device/linksys_e1200-v2
   DEVICE_MODEL := E1200
   DEVICE_VARIANT := v2
   $(Device/linksys)
   DEVICE_ID := E122
   VERSION := 1.0.4
 endef
-TARGET_DEVICES += linksys-e1200-v2
+TARGET_DEVICES += linksys_e1200-v2
 
-define Device/linksys-e1500-v1
+define Device/linksys_e1500-v1
   DEVICE_MODEL := E1500
   DEVICE_VARIANT := v1
   $(Device/linksys)
   DEVICE_ID := E150
   VERSION := 1.0.5
 endef
-TARGET_DEVICES += linksys-e1500-v1
+TARGET_DEVICES += linksys_e1500-v1
 
-define Device/linksys-e1550-v1
+define Device/linksys_e1550-v1
   DEVICE_MODEL := E1550
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
@@ -235,9 +235,9 @@ define Device/linksys-e1550-v1
   DEVICE_ID := 1550
   VERSION := 1.0.3
 endef
-TARGET_DEVICES += linksys-e1550-v1
+TARGET_DEVICES += linksys_e1550-v1
 
-define Device/linksys-e2000-v1
+define Device/linksys_e2000-v1
   DEVICE_MODEL := E2000
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43
@@ -245,9 +245,9 @@ define Device/linksys-e2000-v1
   DEVICE_ID := 32XN
   VERSION := 1.0.4
 endef
-TARGET_DEVICES += linksys-e2000-v1
+TARGET_DEVICES += linksys_e2000-v1
 
-define Device/linksys-e2500-v1
+define Device/linksys_e2500-v1
   DEVICE_MODEL := E2500
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43
@@ -255,9 +255,9 @@ define Device/linksys-e2500-v1
   DEVICE_ID := E25X
   VERSION := 1.0.7
 endef
-TARGET_DEVICES += linksys-e2500-v1
+TARGET_DEVICES += linksys_e2500-v1
 
-define Device/linksys-e2500-v2
+define Device/linksys_e2500-v2
   DEVICE_MODEL := E2500
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-b43
@@ -265,9 +265,9 @@ define Device/linksys-e2500-v2
   DEVICE_ID := E25X
   VERSION := 2.0.0
 endef
-TARGET_DEVICES += linksys-e2500-v2
+TARGET_DEVICES += linksys_e2500-v2
 
-define Device/linksys-e2500-v2.1
+define Device/linksys_e2500-v2.1
   DEVICE_MODEL := E2500
   DEVICE_VARIANT := v2.1
   DEVICE_PACKAGES := kmod-b43
@@ -275,9 +275,9 @@ define Device/linksys-e2500-v2.1
   DEVICE_ID := 25RU
   VERSION := 2.1.0
 endef
-TARGET_DEVICES += linksys-e2500-v2.1
+TARGET_DEVICES += linksys_e2500-v2.1
 
-define Device/linksys-e2500-v3
+define Device/linksys_e2500-v3
   DEVICE_MODEL := E2500
   DEVICE_VARIANT := v3
   DEVICE_PACKAGES := kmod-b43
@@ -285,9 +285,9 @@ define Device/linksys-e2500-v3
   DEVICE_ID := 25V3
   VERSION := 3.0.0
 endef
-TARGET_DEVICES += linksys-e2500-v3
+TARGET_DEVICES += linksys_e2500-v3
 
-define Device/linksys-e3200-v1
+define Device/linksys_e3200-v1
   DEVICE_MODEL := E3200
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43
@@ -295,9 +295,9 @@ define Device/linksys-e3200-v1
   DEVICE_ID := 3200
   VERSION := 1.0.1
 endef
-TARGET_DEVICES += linksys-e3200-v1
+TARGET_DEVICES += linksys_e3200-v1
 
-define Device/linksys-e4200-v1
+define Device/linksys_e4200-v1
   DEVICE_MODEL := E4200
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
@@ -305,9 +305,9 @@ define Device/linksys-e4200-v1
   DEVICE_ID := 4200
   VERSION := 1.0.5
 endef
-TARGET_DEVICES += linksys-e4200-v1
+TARGET_DEVICES += linksys_e4200-v1
 
-define Device/netgear-r6200-v1
+define Device/netgear_r6200-v1
   DEVICE_MODEL := R6200
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
@@ -315,27 +315,27 @@ define Device/netgear-r6200-v1
   NETGEAR_BOARD_ID := U12H192T00_NETGEAR
   NETGEAR_REGION := 1
 endef
-TARGET_DEVICES += netgear-r6200-v1
+TARGET_DEVICES += netgear_r6200-v1
 
-define Device/netgear-wgr614-v10-na
+define Device/netgear_wgr614-v10-na
   DEVICE_MODEL := WGR614
   DEVICE_VARIANT := v10 (NA)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H139T01_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear-wgr614-v10-na
+TARGET_DEVICES += netgear_wgr614-v10-na
 
-define Device/netgear-wgr614-v10
+define Device/netgear_wgr614-v10
   DEVICE_MODEL := WGR614
   DEVICE_VARIANT := v10
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H139T01_NETGEAR
   NETGEAR_REGION := 1
 endef
-TARGET_DEVICES += netgear-wgr614-v10
+TARGET_DEVICES += netgear_wgr614-v10
 
-define Device/netgear-wn2500rp-v1
+define Device/netgear_wn2500rp-v1
   DEVICE_MODEL := WN2500RP
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43
@@ -343,17 +343,17 @@ define Device/netgear-wn2500rp-v1
   NETGEAR_BOARD_ID := U12H197T00_NETGEAR
   NETGEAR_REGION := 1
 endef
-TARGET_DEVICES += netgear-wn2500rp-v1
+TARGET_DEVICES += netgear_wn2500rp-v1
 
-define Device/netgear-wn3000rp
+define Device/netgear_wn3000rp
   DEVICE_MODEL := WN3000RP
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H163T01_NETGEAR
   NETGEAR_REGION := 1
 endef
-TARGET_DEVICES += netgear-wn3000rp
+TARGET_DEVICES += netgear_wn3000rp
 
-define Device/netgear-wndr3400-v1
+define Device/netgear_wndr3400-v1
   DEVICE_MODEL := WNDR3400
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
@@ -361,9 +361,9 @@ define Device/netgear-wndr3400-v1
   NETGEAR_BOARD_ID := U12H155T00_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear-wndr3400-v1
+TARGET_DEVICES += netgear_wndr3400-v1
 
-define Device/netgear-wndr3400-v2
+define Device/netgear_wndr3400-v2
   DEVICE_MODEL := WNDR3400
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
@@ -371,9 +371,9 @@ define Device/netgear-wndr3400-v2
   NETGEAR_BOARD_ID := U12H187T00_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear-wndr3400-v2
+TARGET_DEVICES += netgear_wndr3400-v2
 
-define Device/netgear-wndr3400-v3
+define Device/netgear_wndr3400-v3
   DEVICE_MODEL := WNDR3400
   DEVICE_VARIANT := v3
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
@@ -381,9 +381,9 @@ define Device/netgear-wndr3400-v3
   NETGEAR_BOARD_ID := U12H208T00_NETGEAR
   NETGEAR_REGION := 1
 endef
-TARGET_DEVICES += netgear-wndr3400-v3
+TARGET_DEVICES += netgear_wndr3400-v3
 
-define Device/netgear-wndr3700-v3
+define Device/netgear_wndr3700-v3
   DEVICE_MODEL := WNDR3700
   DEVICE_VARIANT := v3
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
@@ -391,9 +391,9 @@ define Device/netgear-wndr3700-v3
   NETGEAR_BOARD_ID := U12H194T00_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear-wndr3700-v3
+TARGET_DEVICES += netgear_wndr3700-v3
 
-define Device/netgear-wndr3400-vcna
+define Device/netgear_wndr3400-vcna
   DEVICE_MODEL := WNDR3400
   DEVICE_VARIANT := vcna
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
@@ -402,9 +402,9 @@ define Device/netgear-wndr3400-vcna
   NETGEAR_REGION := 2
   DEFAULT := n
 endef
-TARGET_DEVICES += netgear-wndr3400-vcna
+TARGET_DEVICES += netgear_wndr3400-vcna
 
-define Device/netgear-wndr4000
+define Device/netgear_wndr4000
   DEVICE_MODEL := WNDR4000
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
@@ -412,18 +412,18 @@ define Device/netgear-wndr4000
   NETGEAR_BOARD_ID := U12H181T00_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear-wndr4000
+TARGET_DEVICES += netgear_wndr4000
 
-define Device/netgear-wnr1000-v3
+define Device/netgear_wnr1000-v3
   DEVICE_MODEL := WNR1000
   DEVICE_VARIANT := v3
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H139T00_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear-wnr1000-v3
+TARGET_DEVICES += netgear_wnr1000-v3
 
-define Device/netgear-wnr2000v2
+define Device/netgear_wnr2000v2
   DEVICE_MODEL := WNR2000
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-b43
@@ -431,9 +431,9 @@ define Device/netgear-wnr2000v2
   NETGEAR_BOARD_ID := U12H114T00_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear-wnr2000v2
+TARGET_DEVICES += netgear_wnr2000v2
 
-define Device/netgear-wnr3500l-v1-na
+define Device/netgear_wnr3500l-v1-na
   DEVICE_MODEL := WNR3500L
   DEVICE_VARIANT := v1 (NA)
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
@@ -441,9 +441,9 @@ define Device/netgear-wnr3500l-v1-na
   NETGEAR_BOARD_ID := U12H136T99_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear-wnr3500l-v1-na
+TARGET_DEVICES += netgear_wnr3500l-v1-na
 
-define Device/netgear-wnr3500l-v1
+define Device/netgear_wnr3500l-v1
   DEVICE_MODEL := WNR3500L
   DEVICE_VARIANT := v1 (ROW)
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
@@ -451,9 +451,9 @@ define Device/netgear-wnr3500l-v1
   NETGEAR_BOARD_ID := U12H136T99_NETGEAR
   NETGEAR_REGION := 1
 endef
-TARGET_DEVICES += netgear-wnr3500l-v1
+TARGET_DEVICES += netgear_wnr3500l-v1
 
-define Device/netgear-wnr3500l-v2
+define Device/netgear_wnr3500l-v2
   DEVICE_MODEL := WNR3500L
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := $(USB2_PACKAGES)
@@ -461,9 +461,9 @@ define Device/netgear-wnr3500l-v2
   NETGEAR_BOARD_ID := U12H172T00_NETGEAR
   NETGEAR_REGION := 1
 endef
-TARGET_DEVICES += netgear-wnr3500l-v2
+TARGET_DEVICES += netgear_wnr3500l-v2
 
-define Device/netgear-wnr3500u
+define Device/netgear_wnr3500u
   DEVICE_MODEL := WNR3500U
   DEVICE_PACKAGES := $(USB2_PACKAGES)
   $(Device/netgear)
@@ -471,9 +471,9 @@ define Device/netgear-wnr3500u
   NETGEAR_REGION := 2
   DEFAULT := n
 endef
-TARGET_DEVICES += netgear-wnr3500u
+TARGET_DEVICES += netgear_wnr3500u
 
-define Device/netgear-wnr3500-v2
+define Device/netgear_wnr3500-v2
   DEVICE_MODEL := WNR3500
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-b43
@@ -481,9 +481,9 @@ define Device/netgear-wnr3500-v2
   NETGEAR_BOARD_ID := U12H127T00_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear-wnr3500-v2
+TARGET_DEVICES += netgear_wnr3500-v2
 
-define Device/netgear-wnr3500-v2-vc
+define Device/netgear_wnr3500-v2-vc
   DEVICE_MODEL := WNR3500
   DEVICE_VARIANT := v2 (VC)
   DEVICE_PACKAGES := kmod-b43
@@ -492,6 +492,6 @@ define Device/netgear-wnr3500-v2-vc
   NETGEAR_REGION := 2
   DEFAULT := n
 endef
-TARGET_DEVICES += netgear-wnr3500-v2-vc
+TARGET_DEVICES += netgear_wnr3500-v2-vc
 
 TARGET_DEVICES += standard standard-noloader-nodictionarylzma