[v2] mt7621: Add support for Netgear R6220

Details

Message ID	20200714132149.943438-1-fabian@blaese.de
State	Accepted
Headers	show Return-Path: <franken-dev-bounces@freifunk.net> sender: fabian@blaese.de) by mail.sgstbr.de (Postfix) with ESMTPSA id CA6C52C6DF3; Tue, 14 Jul 2020 15:22:02 +0200 (CEST) From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de> To: franken-dev@freifunk.net Subject: [PATCH v2] mt7621: Add support for Netgear R6220 Date: Tue, 14 Jul 2020 15:21:49 +0200 Message-Id: <20200714132149.943438-1-fabian@blaese.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Reply-To: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>, franken-dev@freifunk.net Errors-To: franken-dev-bounces@freifunk.net Sender: "franken-dev" <franken-dev-bounces@freifunk.net>

Message ID

20200714132149.943438-1-fabian@blaese.de

State

Accepted

Headers

From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
To: franken-dev@freifunk.net
Subject: [PATCH v2] mt7621: Add support for Netgear R6220
Date: Tue, 14 Jul 2020 15:21:49 +0200
Message-Id: <20200714132149.943438-1-fabian@blaese.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Reply-To: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>,
	franken-dev@freifunk.net
Errors-To: franken-dev-bounces@freifunk.net
Sender: "franken-dev" <franken-dev-bounces@freifunk.net>

Commit Message

Fabian Blaese July 14, 2020, 1:21 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>
---
Changes in v2:
- Remove {abc,def} wildcard, which is not working with our buildscript for some reason
- Add missing ETHMESHMAC
---
 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    | 12 ++++++++++++
 4 files changed, 16 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..c6fa39b 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-*"
         "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..800dcb4
--- /dev/null
+++ b/src/packages/fff/fff-network/mipsel/network.r6220
@@ -0,0 +1,12 @@ 
+. /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)
+ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")

Comments

Robert Langhammer July 15, 2020, 8:36 a.m.

Hallo Fabian,

Am 14.07.20 um 15:21 schrieb Fabian Bläse:
> 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>
> ---
> Changes in v2:
> - Remove {abc,def} wildcard, which is not working with our buildscript for some reason

Der Grund ist die Reihenfolge der Shell Expansion. Bracexpansion kommt
vor Variablenexpansion. Im buildscript Zeile 298 (  for image in
${images[@]}; do ) steht noch die Variable drin, wenn nach Bracexpansion
geschaut wird. Um auch in Zukunft nicht darüber zu stolpern, sollte man
es dort mit eval reparieren und du kannst deine Bracexpansion drin lassen.

Hint: man bash -> /^EXPANSION

Viele Grüße
Robert


> - Add missing ETHMESHMAC
> ---
>  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    | 12 ++++++++++++
>  4 files changed, 16 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..c6fa39b 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-*"
>          "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..800dcb4
> --- /dev/null
> +++ b/src/packages/fff/fff-network/mipsel/network.r6220
> @@ -0,0 +1,12 @@
> +. /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)
> +ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")

Adrian Schmutzler July 20, 2020, 12:33 p.m.

Applied.

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf
> Of Fabian Bläse
> Sent: Dienstag, 14. Juli 2020 15:22
> To: franken-dev@freifunk.net
> Subject: [PATCH v2] 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>
> ---
> Changes in v2:
> - Remove {abc,def} wildcard, which is not working with our buildscript for
> some reason
> - Add missing ETHMESHMAC
> ---
>  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    | 12 ++++++++++++
>  4 files changed, 16 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..c6fa39b 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-*"
>          "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..800dcb4
> --- /dev/null
> +++ b/src/packages/fff/fff-network/mipsel/network.r6220
> @@ -0,0 +1,12 @@
> +. /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)
> +ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")
> --
> 2.27.0