ramips: make Netgear R7200 a separate device from R6700v2

With the various variants of Netgear R**** devices, make it more
obvious which image should be used for the R7200.

Signed-off-by: Dale Hui <strokes-races0b@icloud.com>
[provide proper commit message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ramips/dts/mt7621_netgear_r7200.dts b/target/linux/ramips/dts/mt7621_netgear_r7200.dts
new file mode 100644 (file)
index 0000000..0ff8083
--- /dev/null
+++ b/target/linux/ramips/dts/mt7621_netgear_r7200.dts
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "mt7621_netgear_sercomm_bzv.dtsi"
+
+/ {
+       compatible = "netgear,r7200", "mediatek,mt7621-soc";
+       model = "Netgear R7200";
+};
+
+&leds {
+       guest_wifi {
+               gpios = <&gpio_expander 6 GPIO_ACTIVE_LOW>;
+               label = "white:guest_wifi";
+       };
+};

diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 68993a02fb8b39edff36c9c06811167a2087134c..cab926dccd1ec7c91ea0aaeed43e911fa6311a07 100644 (file)
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -1065,9 +1065,6 @@ define Device/netgear_r6700-v2
   DEVICE_ALT0_VENDOR := NETGEAR
   DEVICE_ALT0_MODEL := Nighthawk AC2400
   DEVICE_ALT0_VARIANT := v1
-  DEVICE_ALT1_VENDOR := NETGEAR
-  DEVICE_ALT1_MODEL := R7200
-  DEVICE_ALT1_VARIANT := v1
   SERCOMM_HWNAME := R6950
   SERCOMM_HWID := BZV
   SERCOMM_HWVER := A001
@@ -1101,6 +1098,18 @@ define Device/netgear_r6850
 endef
 TARGET_DEVICES += netgear_r6850
 
+define Device/netgear_r7200
+  $(Device/netgear_sercomm_nand)
+  DEVICE_MODEL := R7200
+  SERCOMM_HWNAME := R6950
+  SERCOMM_HWID := BZV
+  SERCOMM_HWVER := A001
+  SERCOMM_SWVER := 0x1032
+  IMAGE_SIZE := 40960k
+  DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware
+endef
+TARGET_DEVICES += netgear_r7200
+
 define Device/netgear_wac104
   $(Device/netgear_sercomm_nand)
   DEVICE_MODEL := WAC104

diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
index d01ba5356801ae0823e8327c70fd00e122a4f462..314cb5bb103d481c6e444e671efc5fa62ece43d9 100644 (file)
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
@@ -89,7 +89,8 @@ netgear,wndr3700-v5)
        ucidef_set_led_netdev "wan" "wan" "green:wan" "wan"
        ;;
 netgear,r6700-v2|\
-netgear,r6800)
+netgear,r6800|\
+netgear,r7200)
        ucidef_set_led_netdev "wan" "WAN" "white:wan" "wan"
        ucidef_set_led_netdev "lan1" "LAN1" "white:lan1" "lan1"
        ucidef_set_led_netdev "lan2" "LAN2" "white:lan2" "lan2"

diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
index a925dd0f189fb6aaa16dfb13b32a5e515fc096c8..94d66382fa8ffdec7b1ce654fe1201bc83f9ccac 100755 (executable)
--- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
@@ -71,6 +71,7 @@ platform_do_upgrade() {
        netgear,r6700-v2|\
        netgear,r6800|\
        netgear,r6850|\
+       netgear,r7200|\
        netgear,wac104|\
        netgear,wac124|\
        netis,wf2881|\