mt7621: Add support for Netgear R6220

Submitted by Fabian Blaese on July 14, 2020, 12:36 p.m.

Details

Message ID 20200714123654.612354-1-fabian@blaese.de
State Superseded
Headers show

Commit Message

Fabian Blaese July 14, 2020, 12:36 p.m.
The factory image can either be flashed via the vendor WebUI or
the bootloader using nmrpflash.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
---
 bsp/ramips-mt7621.bsp                                 |  1 +
 bsp/ramips-mt7621/.config                             |  2 ++
 .../fff/fff-network/files/lib/functions/fff/cpuport   |  1 +
 src/packages/fff/fff-network/mipsel/network.r6220     | 11 +++++++++++
 4 files changed, 15 insertions(+)
 create mode 100644 src/packages/fff/fff-network/mipsel/network.r6220

Patch hide | download patch | download mbox

diff --git a/bsp/ramips-mt7621.bsp b/bsp/ramips-mt7621.bsp
index 7cff37d..cf5b7bf 100644
--- a/bsp/ramips-mt7621.bsp
+++ b/bsp/ramips-mt7621.bsp
@@ -2,6 +2,7 @@  chipset=ramips
 subtarget=mt7621
 
 images=(
+        "openwrt-ramips-mt7621-r6220-squashfs-{sysupgrade,factory}*"
         "openwrt-ramips-mt7621-ubnt-erx-squashfs-*"
         "openwrt-ramips-mt7621-ubnt-erx-sfp-squashfs-*"
        )
diff --git a/bsp/ramips-mt7621/.config b/bsp/ramips-mt7621/.config
index ee58108..877e561 100644
--- a/bsp/ramips-mt7621/.config
+++ b/bsp/ramips-mt7621/.config
@@ -4,6 +4,8 @@ 
 CONFIG_TARGET_ramips=y
 CONFIG_TARGET_ramips_mt7621=y
 CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_r6220=y
+CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_r6220=""
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt-erx=y
 CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt-erx=""
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt-erx-sfp=y
diff --git a/src/packages/fff/fff-network/files/lib/functions/fff/cpuport b/src/packages/fff/fff-network/files/lib/functions/fff/cpuport
index 5a9278c..27558a8 100644
--- a/src/packages/fff/fff-network/files/lib/functions/fff/cpuport
+++ b/src/packages/fff/fff-network/files/lib/functions/fff/cpuport
@@ -11,6 +11,7 @@  case "$BOARD" in
 	tplink,tl-wr1043nd-v2|\
 	tplink,tl-wr1043nd-v3|\
 	tl-wr841n-v13|\
+	r6220|\
 	ubnt-erx|\
 	ubnt-erx-sfp)
 		CPUPORT="6t"
diff --git a/src/packages/fff/fff-network/mipsel/network.r6220 b/src/packages/fff/fff-network/mipsel/network.r6220
new file mode 100644
index 0000000..393ec02
--- /dev/null
+++ b/src/packages/fff/fff-network/mipsel/network.r6220
@@ -0,0 +1,11 @@ 
+. /lib/functions/fff/network
+
+PORTORDER="4 3 2 1 0"
+
+WANDEV=eth0
+SWITCHDEV=eth0
+CLIENT_PORTS="6t 0 1"
+WAN_PORTS="6t 4"
+BATMAN_PORTS="6t 2 3"
+
+ROUTERMAC=$(cat /sys/class/net/eth0/address)

Comments

Adrian Schmutzler July 14, 2020, 1 p.m.
Hi,

schaut soweit gut aus, nach Anpassen der zwei Kommentare ganz unten dann

Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf
> Of Fabian Bläse
> Sent: Dienstag, 14. Juli 2020 14:37
> To: franken-dev@freifunk.net
> Subject: [PATCH] mt7621: Add support for Netgear R6220
> 
> The factory image can either be flashed via the vendor WebUI or the
> bootloader using nmrpflash.
> 
> Signed-off-by: Fabian Bläse <fabian@blaese.de>
> ---
>  bsp/ramips-mt7621.bsp                                 |  1 +
>  bsp/ramips-mt7621/.config                             |  2 ++
>  .../fff/fff-network/files/lib/functions/fff/cpuport   |  1 +
>  src/packages/fff/fff-network/mipsel/network.r6220     | 11 +++++++++++
>  4 files changed, 15 insertions(+)
>  create mode 100644 src/packages/fff/fff-network/mipsel/network.r6220
> 
> diff --git a/bsp/ramips-mt7621.bsp b/bsp/ramips-mt7621.bsp index
> 7cff37d..cf5b7bf 100644
> --- a/bsp/ramips-mt7621.bsp
> +++ b/bsp/ramips-mt7621.bsp
> @@ -2,6 +2,7 @@ chipset=ramips
>  subtarget=mt7621
> 
>  images=(
> +        "openwrt-ramips-mt7621-r6220-squashfs-{sysupgrade,factory}*"
>          "openwrt-ramips-mt7621-ubnt-erx-squashfs-*"
>          "openwrt-ramips-mt7621-ubnt-erx-sfp-squashfs-*"
>         )
> diff --git a/bsp/ramips-mt7621/.config b/bsp/ramips-mt7621/.config index
> ee58108..877e561 100644
> --- a/bsp/ramips-mt7621/.config
> +++ b/bsp/ramips-mt7621/.config
> @@ -4,6 +4,8 @@
>  CONFIG_TARGET_ramips=y
>  CONFIG_TARGET_ramips_mt7621=y
>  CONFIG_TARGET_MULTI_PROFILE=y
> +CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_r6220=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_r6220=""
>  CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt-erx=y
>  CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt-erx=""
>  CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt-erx-sfp=y
> diff --git a/src/packages/fff/fff-network/files/lib/functions/fff/cpuport
> b/src/packages/fff/fff-network/files/lib/functions/fff/cpuport
> index 5a9278c..27558a8 100644
> --- a/src/packages/fff/fff-network/files/lib/functions/fff/cpuport
> +++ b/src/packages/fff/fff-network/files/lib/functions/fff/cpuport
> @@ -11,6 +11,7 @@ case "$BOARD" in
>  	tplink,tl-wr1043nd-v2|\
>  	tplink,tl-wr1043nd-v3|\
>  	tl-wr841n-v13|\
> +	r6220|\
>  	ubnt-erx|\
>  	ubnt-erx-sfp)
>  		CPUPORT="6t"
> diff --git a/src/packages/fff/fff-network/mipsel/network.r6220
> b/src/packages/fff/fff-network/mipsel/network.r6220
> new file mode 100644
> index 0000000..393ec02
> --- /dev/null
> +++ b/src/packages/fff/fff-network/mipsel/network.r6220
> @@ -0,0 +1,11 @@
> +. /lib/functions/fff/network

Brauchen wir im Moment nicht.

> +
> +PORTORDER="4 3 2 1 0"
> +
> +WANDEV=eth0
> +SWITCHDEV=eth0
> +CLIENT_PORTS="6t 0 1"
> +WAN_PORTS="6t 4"
> +BATMAN_PORTS="6t 2 3"
> +
> +ROUTERMAC=$(cat /sys/class/net/eth0/address)

Hier brauchen wir eine ethmeshmac:

Eines der beiden WiFi Interfaces und eth0 holen ihre Adresse aus factory 0x4.

Also z.B. wie beim 841n v13:

ETHMESHMAC=$(macaddr_setbit_la "$ROUTERMAC")

Dafür bräuchten wir dann den include:
. /lib/functions/system.sh

Beste Grüße

Adrian

> --
> 2.27.0