bcm47xx: base-files: hack sysinfo to allow ASU sysupgrades

This old platform(no DTS) is using nvram numeric fields (or "unknown"
string) for its board_name, let allow to use ASU sysupgrade by using
/tmp/sysinfo/boardtype for keep this value used for some board
detection-configure logic, and define a typical board_name as
"vendor,device-variant" derived from the /tmp/sysinfo/model.

Only a few target profile image names are not consistent in the last
prefix, uniform them.

Some images with (NA) and (ROW) variants are only meant to be
compatible with the upgrade process in the OEM firmware using these
NETGEAR_BOARD_ID and NETGEAR_REGION fields but the images are
compatibles (i.e. netgear_wnr3500l-v1).
Add SUPPORTED_DEVICES in one of these variant for ASU sysupgrade
profile identification.

Fixes: 7d10f2c1e8511fe07c9760e85f2272a85168f8d "brcm47xx: rework model detection"
Fixes: (Netgear wnr3500L) openwrt/asu#419
Closes: openwrt/asu#878
Closes: (Asus RT-N16) openwrt/asu#1042 [1]
Fixes: (Asus RT-N16) https://forum.openwrt.org/t/luci-attended-sysupgrade-support-thread/230552/115 [1]
[1]: https://wl500g.info/showthread.php?27828-Asus-amp-Broadcom&styleid=18

Signed-off-by: Mario Andrés Pérez <mapb_@outlook.com>

Author: map-b

target/linux/bcm47xx/base-files/etc/board.d/01_network

@@ -196,7 +196,7 @@ configure_by_model() {
 
 
 model="$(cat /tmp/sysinfo/model)"
-boardtype="$(board_name)"
+boardtype="$(cat /tmp/sysinfo/boardtype)"
 
 case "$boardtype" in
 	*:*)

target/linux/bcm47xx/base-files/lib/preinit/01_sysinfo

@@ -7,8 +7,19 @@ do_sysinfo_bcm47xx() {
 	[ -z "$boardtype" ] && boardtype="unknown"
 
 	[ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
-	echo "$boardtype${boardnum:+:$boardnum}" > /tmp/sysinfo/board_name
+	echo "$boardtype${boardnum:+:$boardnum}" > /tmp/sysinfo/boardtype
 	echo "$model" > /tmp/sysinfo/model
+	# Generate board_name in the form vendor,device for ASU sysupgrades
+	printf '%s' "$model" | awk '{
+		$0 = tolower($0);
+		if (NF>=2) {
+			printf "%s,%s", $1, $2;
+			for (i=3; i<=NF; i++) {
+				printf "-%s" $i;
+			}
+		}
+		else printf "%s", $1
+	}' > /tmp/sysinfo/board_name
 }
 
 boot_hook_add preinit_main do_sysinfo_bcm47xx

target/linux/bcm47xx/image/mips74k.mk

@@ -211,6 +211,7 @@ define Device/linksys_e1000
   $(Device/linksys)
   DEVICE_ID := E100
   VERSION := 1.1.3
+  SUPPORTED_DEVICES := linksys,e1000-v1 linksys,e1000-v2 linksys,e1000-v2.1
   DEFAULT := n
 endef
 TARGET_DEVICES += linksys_e1000
@@ -336,15 +337,15 @@ define Device/netgear_r6200-v1
 endef
 TARGET_DEVICES += netgear_r6200-v1
 
-define Device/netgear_wgr614-v10-na
+define Device/netgear_wgr614-v10na
   DEVICE_MODEL := WGR614
   DEVICE_VARIANT := v10 (NA)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H139T01_NETGEAR
   NETGEAR_REGION := 2
   DEFAULT := n
 endef
-TARGET_DEVICES += netgear_wgr614-v10-na
+TARGET_DEVICES += netgear_wgr614-v10na
 
 define Device/netgear_wgr614-v10
   DEVICE_MODEL := WGR614
@@ -405,16 +406,6 @@ define Device/netgear_wndr3400-v3
 endef
 TARGET_DEVICES += netgear_wndr3400-v3
 
-define Device/netgear_wndr3700-v3
-  DEVICE_MODEL := WNDR3700
-  DEVICE_VARIANT := v3
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H194T00_NETGEAR
-  NETGEAR_REGION := 2
-endef
-TARGET_DEVICES += netgear_wndr3700-v3
-
 define Device/netgear_wndr3400-vcna
   DEVICE_MODEL := WNDR3400
   DEVICE_VARIANT := vcna
@@ -426,6 +417,16 @@ define Device/netgear_wndr3400-vcna
 endef
 TARGET_DEVICES += netgear_wndr3400-vcna
 
+define Device/netgear_wndr3700-v3
+  DEVICE_MODEL := WNDR3700
+  DEVICE_VARIANT := v3
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H194T00_NETGEAR
+  NETGEAR_REGION := 2
+endef
+TARGET_DEVICES += netgear_wndr3700-v3
+
 define Device/netgear_wndr4000
   DEVICE_MODEL := WNDR4000
   DEVICE_VARIANT := v1
@@ -446,7 +447,7 @@ define Device/netgear_wnr1000-v3
 endef
 TARGET_DEVICES += netgear_wnr1000-v3
 
-define Device/netgear_wnr2000v2
+define Device/netgear_wnr2000-v2
   DEVICE_MODEL := WNR2000
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-b43
@@ -455,17 +456,17 @@ define Device/netgear_wnr2000v2
   NETGEAR_REGION := 2
   DEFAULT := n
 endef
-TARGET_DEVICES += netgear_wnr2000v2
+TARGET_DEVICES += netgear_wnr2000-v2
 
-define Device/netgear_wnr3500l-v1-na
+define Device/netgear_wnr3500l-v1na
   DEVICE_MODEL := WNR3500L
   DEVICE_VARIANT := v1 (NA)
   DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H136T99_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear_wnr3500l-v1-na
+TARGET_DEVICES += netgear_wnr3500l-v1na
 
 define Device/netgear_wnr3500l-v1
   DEVICE_MODEL := WNR3500L
@@ -474,6 +475,7 @@ define Device/netgear_wnr3500l-v1
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H136T99_NETGEAR
   NETGEAR_REGION := 1
+  SUPPORTED_DEVICES := netgear,wnr3500l
 endef
 TARGET_DEVICES += netgear_wnr3500l-v1
 
@@ -510,7 +512,7 @@ define Device/netgear_wnr3500-v2
 endef
 TARGET_DEVICES += netgear_wnr3500-v2
 
-define Device/netgear_wnr3500-v2-vc
+define Device/netgear_wnr3500-v2vc
   DEVICE_MODEL := WNR3500
   DEVICE_VARIANT := v2 (VC)
   DEVICE_PACKAGES := kmod-b43
@@ -519,6 +521,6 @@ define Device/netgear_wnr3500-v2-vc
   NETGEAR_REGION := 2
   DEFAULT := n
 endef
-TARGET_DEVICES += netgear_wnr3500-v2-vc
+TARGET_DEVICES += netgear_wnr3500-v2vc
 
 TARGET_DEVICES += standard standard-noloader-nodictionarylzma