gluon-usteer: add package

Signed-off-by: David Bauer <mail@david-bauer.net>

.github/filters.yml

@@ -82,15 +82,6 @@
     "targets/generic",
     "targets/targets.mk"
   ],
-  "mpc85xx-p1010": [
-    "targets/mpc85xx-p1010",
-    "modules",
-    "Makefile",
-    "patches/**",
-    "scripts/**",
-    "targets/generic",
-    "targets/targets.mk"
-  ],
   "mpc85xx-p1020": [
     "targets/mpc85xx-p1020",
     "modules",
@@ -196,6 +187,14 @@
     "targets/targets.mk",
     "targets/bcm27xx.inc"
   ],
+  "bcm27xx-bcm2711": [
+    "targets/bcm27xx-bcm2711",
+    "modules",
+    "Makefile",
+    "patches/**",
+    "targets/generic",
+    "targets/targets.mk"
+  ],
   "mvebu-cortexa9": [
     "targets/mvebu-cortexa9",
     "modules",

modules

@@ -1,16 +1,16 @@
 GLUON_FEEDS='packages routing gluon'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
-OPENWRT_BRANCH=openwrt-21.02
+OPENWRT_BRANCH=master
-OPENWRT_COMMIT=cd17ca7d6f305ff93ee5436b883bc5ad3767e3a7
+OPENWRT_COMMIT=c41da167d21612916376c9125e8c75ed6fe706fe
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
-PACKAGES_PACKAGES_BRANCH=openwrt-21.02
+PACKAGES_PACKAGES_BRANCH=master
-PACKAGES_PACKAGES_COMMIT=ee69afe6f1c0ff9d257b5478ae6d50b18e023519
+PACKAGES_PACKAGES_COMMIT=2366b268131e4e114d4aff4ed86083b5a5e17ccb
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
-PACKAGES_ROUTING_BRANCH=openwrt-21.02
+PACKAGES_ROUTING_BRANCH=master
-PACKAGES_ROUTING_COMMIT=7c7d11e2904494820d5c28249bff8abd46493184
+PACKAGES_ROUTING_COMMIT=e3c68429239f77c895b32502e2609df8b72c6caa
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=308166e3c6b2d571606dd1dbfadd2bb8e31d8f90

package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg

@@ -37,7 +37,6 @@ local function replace_patterns(url)
 end
 
 
-local openwrt = site.opkg.openwrt()
 local extra = site.opkg.extra({})
 
 
@@ -52,8 +51,6 @@ for _, line in ipairs(distfeeds) do
 	local name = line:match('^src/gz%s' .. prefix .. '(%S+)%s')
 	if name == 'core' then
 		f:write('# ' .. line .. '\n')
-	elseif name and openwrt then
-		f:write(string.format('src/gz %s %s/%s\n', prefix .. name, replace_patterns(openwrt), name))
 	else
 		f:write(line .. '\n')
 	end

package/gluon-iptables-clamp-mss-to-pmtu/Makefile

@@ -6,7 +6,7 @@ include ../gluon.mk
 
 define Package/$(PKG_NAME)
   TITLE:=This will establish a firewall rule to clamp the mss to pmtu on the mesh-vpn interface when the connection is towards 64:ff9b::/96
-  DEPENDS:= +ip6tables
+  DEPENDS:= +ip6tables-legacy
 endef
 
 define Package/$(PKG_NAME)/description

package/gluon-usteer/Makefile

@@ -0,0 +1,12 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gluon-usteer
+
+include ../gluon.mk
+
+define Package/gluon-usteer
+  TITLE:=Gluon integration for the usteer daemon
+  DEPENDS:=+usteer
+endef
+
+$(eval $(call BuildPackageGluon,gluon-usteer))

package/gluon-usteer/README.md

@@ -0,0 +1,71 @@
+# ffda-gluon-usteer
+
+This package provides a Gluon-specific integration, the OpenWrt WiFi roaming & steering daemon.
+
+
+## Configuration
+
+This package provides a tiered configuration. It is hard to provide a configuration, which covers all possible deployment environments.
+
+The following configuration options can be configured using the site as well as the `gluon-usteer` configuration package.
+
+
+### network.enabled
+
+Default: 1
+
+Whether usteer contacts adjacent nodes using the mesh-interfaces.
+
+
+### network.wireless
+
+Default: 1
+
+Enabled networking with remote nodes using wireless mesh-interfaces.
+
+
+### network.wired
+
+Default: 1
+
+Enabled networking with remote nodes using wired mesh-interfaces.
+
+
+### network.update_interval
+
+Default: 5
+
+Interval (milliseconds) between node-updates sent.
+
+
+### network.update_timeout
+
+Default: 12
+
+Number of `network.update_interval` intervals after which a remote-node is deleted.
+
+
+### band_steering.enabled
+
+Default: 1
+
+Enables band-steering for clients connected on 2.4 GHz
+
+
+### band_steering.min_snr
+
+Default: -60
+
+Clients require to maintain a SNR / signal better than `band_steering.min_snr` to be steered to 5 GHz.
+
+
+### band_steering.interval
+
+Default: 40
+
+Clients require to maintain `band_steering.min_snr` for `band_steering.interval` milliseconds in order to be steered to 5GHz.
+
+
+## Site configuration
+
+The site configuration provides the site-wide default configuration for usteer.

package/gluon-usteer/check_site.lua

@@ -0,0 +1,14 @@
+-- Network
+
+need_boolean({'usteer', 'network', 'enabled'}, false)
+need_boolean({'usteer', 'network', 'wireless'}, false)
+need_boolean({'usteer', 'network', 'wired'}, false)
+need_number({'usteer', 'network', 'update_interval'}, false)
+need_number({'usteer', 'network', 'update_timeout'}, false)
+
+
+-- Band-Steering
+
+need_boolean({'usteer', 'band_steering', 'enabled'}, false)
+need_number({'usteer', 'band_steering', 'min_snr'}, false)
+need_number({'usteer', 'band_steering', 'interval'}, false)

package/gluon-usteer/files/etc/config/gluon-usteer

@@ -0,0 +1,3 @@
+config network network
+
+config band_steering band_steering

package/gluon-usteer/luasrc/lib/gluon/upgrade/750-gluon-usteer

@@ -0,0 +1,109 @@
+#!/usr/bin/lua
+
+local uci = require('simple-uci').cursor()
+
+local wireless = require 'gluon.wireless'
+local site = require 'gluon.site'
+
+
+local defaults = {
+	["network"]={
+		["enabled"]=site.usteer.network.enabled(true),
+		["wireless"]=site.usteer.network.wireless(true),
+		["wired"]=site.usteer.network.wired(true),
+		["update_interval"]=site.usteer.network.update_interval(5000),
+		["update_timeout"]=site.usteer.network.update_timeout(12),
+	},
+	["band_steering"]={
+		["enabled"]=site.usteer.band_steering.enabled(true),
+		["min_snr"]=site.usteer.band_steering.min_snr(-60),
+		["interval"]=site.usteer.band_steering.interval(40000),
+	},
+}
+
+local function get_config(section, option)
+	local default = defaults[section][option]
+	local user = uci:get("gluon-usteer", section, option)
+
+	if user ~= nil and default == true or default == false then
+		user = uci:get_bool("gluon-usteer", section, option)
+	end
+
+	if user ~= nil then
+		return user
+	end
+
+	return default
+end
+
+local function set_config(config, section, option)
+	-- Get config
+	local conf_val = get_config(section, option)
+
+	if conf_val == nil then return end
+
+
+	uci:set('usteer', 'usteer', config, conf_val)
+end
+
+
+uci:delete_all('usteer', 'usteer')
+
+uci:section('usteer', 'usteer', 'usteer', {
+	syslog = 1,
+	ipv6 = 1,
+	debug_level = 2,
+})
+
+
+-- Band steering
+
+if not get_config('band_steering', 'enabled') then
+	uci:set('usteer', 'usteer', 'band_steering_interval', '0')
+else
+	set_config('band_steering_min_snr', 'band_steering', 'min_snr')
+	set_config('band_steering_interval', 'band_steering', 'interval')
+end
+
+
+-- Network
+
+uci:set('usteer', 'usteer', 'local_mode', not get_config('network', 'enabled'))
+
+set_config('remote_update_interval', 'network', 'update_interval')
+set_config('remote_node_timeout', 'network', 'update_timeout')
+
+local networks = {}
+
+if get_config('network', 'wireless') then
+	wireless.foreach_radio(uci, function(radio)
+		local radio_name = radio['.name']
+		table.insert(networks, 'mesh_' .. radio_name)
+	end)
+end
+
+if get_config('network', 'wired') then
+	local prefix = ''
+	if site.mesh.vxlan(true) then
+		prefix = 'vx_'
+	end
+	table.insert(networks, prefix .. 'mesh_lan')
+	table.insert(networks, prefix .. 'mesh_wan')
+end
+
+uci:set('usteer', 'usteer', 'network', networks)
+uci:save('usteer')
+
+
+-- Firewall
+
+uci:section('firewall', 'rule', 'mesh_usteer_ll', {
+	dest_port = 16720,
+	src = 'mesh',
+	name = 'mesh_usteer_ll',
+	src_ip = 'fe80::/64',
+	target = 'ACCEPT',
+	proto = 'udp',
+})
+
+uci:save('firewall')

patches/openwrt/0004-wireguard-tools-allow-generating-private_key-v3.patch

@@ -1,53 +0,0 @@
-From: lemoer <git@irrelefant.net>
-Date: Sat, 3 Jul 2021 22:50:29 +0200
-Subject: wireguard-tools: allow generating private_key (v3)
-
-When the uci configuration is created automatically during a very early
-stage, where no entropy daemon is set up, generating the key directly is
-not an option. Therefore we allow to set the private_key to "generate"
-and generate the private key directly before the interface is taken up.
-
-v3: Somebody has implemented another uci cli flag '-t' upstream to handle
-    this, before my patch to implement the new uci flag '-x' syntax was
-    accepted. So I dropped my suggestion of '-x'.
-v2: We now use a new uci cli flag to commit only the private_key and do
-    not commit uncommited user changes. This is not yet upstream as of
-    now.
-
-diff --git a/package/network/utils/wireguard-tools/files/wireguard.sh b/package/network/utils/wireguard-tools/files/wireguard.sh
-index 63261aea71daa058bf37014ba7d670a5e74a2e04..845f9eb902bf3655b631d52aa3ee69231366f657 100644
---- a/package/network/utils/wireguard-tools/files/wireguard.sh
-+++ b/package/network/utils/wireguard-tools/files/wireguard.sh
-@@ -95,6 +95,23 @@ proto_wireguard_setup_peer() {
- 	fi
- }
- 
-+ensure_key_is_generated() {
-+	local private_key
-+	private_key="$(uci get network."$1".private_key)"
-+
-+	if [ "$private_key" == "generate" ]; then
-+		local ucitmp
-+		oldmask="$(umask)"
-+		umask 077
-+		ucitmp="$(mktemp -d)"
-+		private_key="$("${WG}" genkey)"
-+		uci -q -t "$ucitmp" set network."$1".private_key="$private_key" && \
-+			uci -q -t "$ucitmp" commit network
-+		rm -rf "$ucitmp"
-+		umask "$oldmask"
-+	fi
-+}
-+
- proto_wireguard_setup() {
- 	local config="$1"
- 	local wg_dir="/tmp/wireguard"
-@@ -104,6 +121,8 @@ proto_wireguard_setup() {
- 	local listen_port
- 	local mtu
- 
-+	ensure_key_is_generated "${config}"
-+
- 	config_load network
- 	config_get private_key "${config}" "private_key"
- 	config_get listen_port "${config}" "listen_port"

patches/openwrt/0005-ath79-Add-support-for-OpenMesh-A60.patch

@@ -1,337 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Mon, 23 Nov 2020 13:41:34 +0100
-Subject: ath79: Add support for OpenMesh A60
-
-Device specifications:
-======================
-
-* Qualcomm/Atheros QCA9558 ver 1 rev 0
-* 720/600/240 MHz (CPU/DDR/AHB)
-* 128 MB of RAM
-* 16 MB of SPI NOR flash
-  - 2x 7 MB available; but one of the 7 MB regions is the recovery image
-* 3T3R 2.4 GHz Wi-Fi (11n)
-* 3T3R 5 GHz Wi-Fi (11ac)
-* multi-color LED (controlled via red/green/blue GPIOs)
-* 1x GPIO-button (reset)
-* external h/w watchdog (enabled by default))
-* TTL pins are on board (arrow points to VCC, then follows: GND, TX, RX)
-* 2x ethernet
-  - eth0
-    + Label: Ethernet 1
-    + AR8035 ethernet PHY (RGMII)
-    + 10/100/1000 Mbps Ethernet
-    + 802.3af POE
-    + used as WAN interface
-  - eth1
-    + Label: Ethernet 2
-    + AR8031 ethernet PHY (SGMII)
-    + 10/100/1000 Mbps Ethernet
-    + used as LAN interface
-* 1x USB
-* internal antennas
-
-Flashing instructions:
-======================
-
-Various methods can be used to install the actual image on the flash.
-Two easy ones are:
-
-ap51-flash
-----------
-
-The tool ap51-flash (https://github.com/ap51-flash/ap51-flash) should be
-used to transfer the image to the u-boot when the device boots up.
-
-initramfs from TFTP
--------------------
-
-The serial console must be used to access the u-boot shell during bootup.
-It can then be used to first boot up the initramfs image from a TFTP server
-(here with the IP 192.168.1.21):
-
-   setenv serverip 192.168.1.21
-   setenv ipaddr 192.168.1.1
-   tftpboot 0c00000 <filename-of-initramfs-kernel>.bin && bootm $fileaddr
-
-The actual sysupgrade image can then be transferred (on the LAN port) to the
-device via
-
-  scp <filename-of-squashfs-sysupgrade>.bin root@192.168.1.1:/tmp/
-
-On the device, the sysupgrade must then be started using
-
-  sysupgrade -n /tmp/<filename-of-squashfs-sysupgrade>.bin
-
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-(cherry picked from commit eaf2e32c12655d7fb58e158086a784393dc6f69a)
-
-diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79
-index abcb99663dfd8e5d1ad0ee757e17972d63c856c7..0791d58b04cd108fcd2190bcf3c39f715f0b511f 100644
---- a/package/boot/uboot-envtools/files/ath79
-+++ b/package/boot/uboot-envtools/files/ath79
-@@ -49,6 +49,7 @@ netgear,wnr2200-16m|\
- netgear,wnr612-v2|\
- ocedo,koala|\
- ocedo,raccoon|\
-+openmesh,a60|\
- openmesh,mr600-v1|\
- openmesh,mr600-v2|\
- openmesh,mr900-v1|\
-diff --git a/target/linux/ath79/dts/qca9558_openmesh_a60.dts b/target/linux/ath79/dts/qca9558_openmesh_a60.dts
-new file mode 100644
-index 0000000000000000000000000000000000000000..473f055b492f6dffb0c460fd13e7ad9b604373c6
---- /dev/null
-+++ b/target/linux/ath79/dts/qca9558_openmesh_a60.dts
-@@ -0,0 +1,8 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+
-+#include "qca9558_openmesh_a60.dtsi"
-+
-+/ {
-+	compatible = "openmesh,a60", "qca,qca9558";
-+	model = "OpenMesh A60";
-+};
-diff --git a/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
-new file mode 100644
-index 0000000000000000000000000000000000000000..9938e5f4c013575c686edce5699f3541942133d3
---- /dev/null
-+++ b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
-@@ -0,0 +1,180 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+
-+#include "qca955x.dtsi"
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+	chosen {
-+		/delete-property/ bootargs;
-+	};
-+
-+	aliases {
-+		serial0 = &uart;
-+		led-boot = &led_status_green;
-+		led-failsafe = &led_status_green;
-+		led-running = &led_status_green;
-+		led-upgrade = &led_status_green;
-+		label-mac-device = &eth0;
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		reset {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		status_blue {
-+			label = "blue:status";
-+			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
-+		};
-+
-+		status_red {
-+			label = "red:status";
-+			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
-+		};
-+
-+		led_status_green: status_green {
-+			label = "green:status";
-+			gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
-+		};
-+	};
-+
-+	watchdog {
-+		compatible = "linux,wdt-gpio";
-+		gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-+		hw_algo = "toggle";
-+		/* hw_margin_ms is actually 300s but driver limits it to 60s */
-+		hw_margin_ms = <60000>;
-+		always-running;
-+	};
-+};
-+
-+&usb_phy1 {
-+	status = "okay";
-+};
-+
-+&usb1 {
-+	status = "okay";
-+};
-+
-+&spi {
-+	status = "okay";
-+
-+	flash@0 {
-+		compatible = "jedec,spi-nor";
-+		reg = <0>;
-+		spi-max-frequency = <40000000>;
-+
-+		/* partitions are passed via bootloader */
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "u-boot";
-+				reg = <0x000000 0x040000>;
-+				read-only;
-+			};
-+
-+			partition@40000 {
-+				label = "u-boot-env";
-+				reg = <0x040000 0x010000>;
-+			};
-+
-+			partition@50000 {
-+				label = "custom";
-+				reg = <0x050000 0x060000>;
-+				read-only;
-+			};
-+
-+			partition@b0000 {
-+				label = "inactive";
-+				reg = <0x0b0000 0x7a0000>;
-+			};
-+
-+			partition@850000 {
-+				label = "inactive2";
-+				reg = <0x850000 0x7a0000>;
-+			};
-+
-+			art: partition@ff0000 {
-+				label = "ART";
-+				reg = <0xff0000 0x010000>;
-+				read-only;
-+			};
-+		};
-+	};
-+};
-+
-+&mdio0 {
-+	status = "okay";
-+
-+	phy-mask = <0x6>;
-+
-+	phy1: ethernet-phy@1 {
-+		reg = <1>;
-+		eee-broken-100tx;
-+		eee-broken-1000t;
-+	};
-+
-+	phy2: ethernet-phy@2 {
-+		reg = <2>;
-+		eee-broken-100tx;
-+		eee-broken-1000t;
-+		at803x-override-sgmii-link-check;
-+	};
-+};
-+
-+&eth0 {
-+	status = "okay";
-+
-+	pll-data = <0x82000101 0x80000101 0x80001313>;
-+
-+	mtd-mac-address = <&art 0x0>;
-+
-+	phy-mode = "rgmii-id";
-+	phy-handle = <&phy1>;
-+
-+	gmac-config {
-+		device = <&gmac>;
-+		rgmii-enabled = <1>;
-+		rxd-delay = <3>;
-+		rxdv-delay = <3>;
-+		txd-delay = <0>;
-+		txen-delay = <0>;
-+	};
-+};
-+
-+&eth1 {
-+	status = "okay";
-+
-+	pll-data = <0x03000101 0x80000101 0x80001313>;
-+
-+	mtd-mac-address = <&art 0x6>;
-+
-+	qca955x-sgmii-fixup;
-+
-+	phy-handle = <&phy2>;
-+};
-+
-+&wmac {
-+	status = "okay";
-+
-+	mtd-cal-data = <&art 0x1000>;
-+	mtd-mac-address = <&art 0x0>;
-+	mtd-mac-address-increment = <2>;
-+};
-+
-+&pcie0 {
-+	status = "okay";
-+};
-diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-index d4f53e7dae16b84955d318b9d79b6912ee156bdb..4b83ac7d32fc372cd3b493e8ec427c04e0f2e0d1 100755
---- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
-+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-@@ -172,6 +172,7 @@ ath79_setup_interfaces()
- 	comfast,cf-e120a-v3|\
- 	comfast,cf-e314n-v2|\
- 	compex,wpj531-16m|\
-+	openmesh,a60|\
- 	openmesh,om2p-v4|\
- 	openmesh,om2p-hs-v4|\
- 	plasmacloud,pa300|\
-diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 69735f336070a48ddad76c72c2876bcd775c56a1..b4c8a78a7fe4ba5bd3ca1f9c6e2b5e51e7fd1882 100644
---- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -99,6 +99,7 @@ case "$FIRMWARE" in
- 		caldata_extract "art" 0x5000 0x844
- 		ath10k_patch_mac $(mtd_get_mac_binary art 0xc)
- 		;;
-+	openmesh,a60|\
- 	openmesh,mr1750-v1|\
- 	openmesh,mr1750-v2|\
- 	openmesh,om5p-ac-v2)
-diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-index 1240ef51e88ed2e5d24088746596da085c01ab5c..f7862bb032fbce56be77e9db8ae2e37bf5da30ea 100644
---- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-@@ -65,6 +65,7 @@ platform_do_upgrade() {
- 	jjplus,ja76pf2)
- 		redboot_fis_do_upgrade "$1" linux
- 		;;
-+	openmesh,a60|\
- 	openmesh,mr600-v1|\
- 	openmesh,mr600-v2|\
- 	openmesh,mr900-v1|\
-diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
-index 304e58980062465ba7955e5fe45dbd6b0097937b..c669eb2cdb3f868c320412801723ceb112b4089f 100644
---- a/target/linux/ath79/image/generic.mk
-+++ b/target/linux/ath79/image/generic.mk
-@@ -1640,6 +1640,16 @@ define Device/openmesh_common_256k
- 	openmesh-image ce_type=$$$$(OPENMESH_CE_TYPE) | append-metadata
- endef
- 
-+define Device/openmesh_a60
-+  $(Device/openmesh_common_64k)
-+  SOC := qca9558
-+  DEVICE_MODEL := A60
-+  DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct kmod-usb2
-+  OPENMESH_CE_TYPE := A60
-+  SUPPORTED_DEVICES += a60
-+endef
-+TARGET_DEVICES += openmesh_a60
-+
- define Device/openmesh_mr600-v1
-   $(Device/openmesh_common_64k)
-   SOC := ar9344

patches/openwrt/0006-ath79-Add-support-for-OpenMesh-A40.patch

@@ -1,151 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Mon, 23 Nov 2020 13:41:34 +0100
-Subject: ath79: Add support for OpenMesh A40
-
-Device specifications:
-======================
-
-* Qualcomm/Atheros QCA9558 ver 1 rev 0
-* 720/600/240 MHz (CPU/DDR/AHB)
-* 128 MB of RAM
-* 16 MB of SPI NOR flash
-  - 2x 7 MB available; but one of the 7 MB regions is the recovery image
-* 2T2R 2.4 GHz Wi-Fi (11n)
-* 2T2R 5 GHz Wi-Fi (11ac)
-* multi-color LED (controlled via red/green/blue GPIOs)
-* 1x GPIO-button (reset)
-* external h/w watchdog (enabled by default))
-* TTL pins are on board (arrow points to VCC, then follows: GND, TX, RX)
-* 2x ethernet
-  - eth0
-    + Label: Ethernet 1
-    + AR8035 ethernet PHY (RGMII)
-    + 10/100/1000 Mbps Ethernet
-    + 802.3af POE
-    + used as WAN interface
-  - eth1
-    + Label: Ethernet 2
-    + AR8035 ethernet PHY (SGMII)
-    + 10/100/1000 Mbps Ethernet
-    + used as LAN interface
-* 1x USB
-* internal antennas
-
-Flashing instructions:
-======================
-
-Various methods can be used to install the actual image on the flash.
-Two easy ones are:
-
-ap51-flash
-----------
-
-The tool ap51-flash (https://github.com/ap51-flash/ap51-flash) should be
-used to transfer the image to the u-boot when the device boots up.
-
-initramfs from TFTP
--------------------
-
-The serial console must be used to access the u-boot shell during bootup.
-It can then be used to first boot up the initramfs image from a TFTP server
-(here with the IP 192.168.1.21):
-
-   setenv serverip 192.168.1.21
-   setenv ipaddr 192.168.1.1
-   tftpboot 0c00000 <filename-of-initramfs-kernel>.bin && bootm $fileaddr
-
-The actual sysupgrade image can then be transferred (on the LAN port) to the
-device via
-
-  scp <filename-of-squashfs-sysupgrade>.bin root@192.168.1.1:/tmp/
-
-On the device, the sysupgrade must then be started using
-
-  sysupgrade -n /tmp/<filename-of-squashfs-sysupgrade>.bin
-
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-(cherry picked from commit 9a172797e593c061f6759a37eaeba2956ad8d72f)
-
-diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79
-index 0791d58b04cd108fcd2190bcf3c39f715f0b511f..a37057953bc1e9b7fdf2be02136142d0fc145054 100644
---- a/package/boot/uboot-envtools/files/ath79
-+++ b/package/boot/uboot-envtools/files/ath79
-@@ -49,6 +49,7 @@ netgear,wnr2200-16m|\
- netgear,wnr612-v2|\
- ocedo,koala|\
- ocedo,raccoon|\
-+openmesh,a40|\
- openmesh,a60|\
- openmesh,mr600-v1|\
- openmesh,mr600-v2|\
-diff --git a/target/linux/ath79/dts/qca9558_openmesh_a40.dts b/target/linux/ath79/dts/qca9558_openmesh_a40.dts
-new file mode 100644
-index 0000000000000000000000000000000000000000..d2b817031a9db6846de0632a64962a0197fa2c6f
---- /dev/null
-+++ b/target/linux/ath79/dts/qca9558_openmesh_a40.dts
-@@ -0,0 +1,8 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+
-+#include "qca9558_openmesh_a60.dtsi"
-+
-+/ {
-+	compatible = "openmesh,a40", "qca,qca9558";
-+	model = "OpenMesh A40";
-+};
-diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-index 4b83ac7d32fc372cd3b493e8ec427c04e0f2e0d1..c2932c1737d97f3eb732620041664f5060d16946 100755
---- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
-+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-@@ -172,6 +172,7 @@ ath79_setup_interfaces()
- 	comfast,cf-e120a-v3|\
- 	comfast,cf-e314n-v2|\
- 	compex,wpj531-16m|\
-+	openmesh,a40|\
- 	openmesh,a60|\
- 	openmesh,om2p-v4|\
- 	openmesh,om2p-hs-v4|\
-diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index b4c8a78a7fe4ba5bd3ca1f9c6e2b5e51e7fd1882..b70a87054b10fbe708d9aa8603ecdb591fc92591 100644
---- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -99,6 +99,7 @@ case "$FIRMWARE" in
- 		caldata_extract "art" 0x5000 0x844
- 		ath10k_patch_mac $(mtd_get_mac_binary art 0xc)
- 		;;
-+	openmesh,a40|\
- 	openmesh,a60|\
- 	openmesh,mr1750-v1|\
- 	openmesh,mr1750-v2|\
-diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-index f7862bb032fbce56be77e9db8ae2e37bf5da30ea..e979c11bb91cb20fd4168b8921499f03572d3512 100644
---- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-@@ -65,6 +65,7 @@ platform_do_upgrade() {
- 	jjplus,ja76pf2)
- 		redboot_fis_do_upgrade "$1" linux
- 		;;
-+	openmesh,a40|\
- 	openmesh,a60|\
- 	openmesh,mr600-v1|\
- 	openmesh,mr600-v2|\
-diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
-index c669eb2cdb3f868c320412801723ceb112b4089f..c63900dc701bbc21dce12086f7045d7d450fc5f3 100644
---- a/target/linux/ath79/image/generic.mk
-+++ b/target/linux/ath79/image/generic.mk
-@@ -1640,6 +1640,16 @@ define Device/openmesh_common_256k
- 	openmesh-image ce_type=$$$$(OPENMESH_CE_TYPE) | append-metadata
- endef
- 
-+define Device/openmesh_a40
-+  $(Device/openmesh_common_64k)
-+  SOC := qca9558
-+  DEVICE_MODEL := A40
-+  DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct kmod-usb2
-+  OPENMESH_CE_TYPE := A60
-+  SUPPORTED_DEVICES += a40
-+endef
-+TARGET_DEVICES += openmesh_a40
-+
- define Device/openmesh_a60
-   $(Device/openmesh_common_64k)
-   SOC := qca9558

patches/openwrt/0007-ath79-Allow-to-set-spi-nor-mtd-name-via-devicetree.patch

@@ -1,135 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Thu, 31 Dec 2020 00:25:10 +0100
-Subject: ath79: Allow to set spi-nor mtd name via devicetree
-
-On ar71xx, it was possible to overwrite the name of the spi-nor mtd device
-identifier using the flash_platform_data which each mach-*.c could adjust
-for its devices. A similar feature was introduced for mtd-physmap in
-devicetree's. The property linux,mtd-name can be used to set the name and
-provide a stable identifier for mtdpart from the bootloader.
-
-But this feature is not yet available upstream for spi-nor devices which
-also might receive their partition layout from the bootloader. But the
-OpenWrt pistachio support for this property can simply be imported into
-ath79 to gain this support.
-
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-(cherry picked from commit 7f074fe1a79f27d30560c35778d963bc520e9a3e)
-
-diff --git a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..af032df51e6dbc3824a45a8efaa1ce8db2261b2a
---- /dev/null
-+++ b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
-@@ -0,0 +1,51 @@
-+From f32bc2aa01edcba2f2ed5db151cf183eac9ef919 Mon Sep 17 00:00:00 2001
-+From: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
-+Date: Sat, 25 Feb 2017 16:42:50 +0000
-+Subject: mtd: nor: support mtd name from device tree
-+
-+Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
-+
-+--- a/drivers/mtd/spi-nor/core.c
-++++ b/drivers/mtd/spi-nor/core.c
-+@@ -3088,6 +3088,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,
-+ 	struct device *dev = nor->dev;
-+ 	struct mtd_info *mtd = &nor->mtd;
-+ 	struct device_node *np = spi_nor_get_flash_node(nor);
-++	const char __maybe_unused *of_mtd_name = NULL;
-+ 	int ret;
-+ 	int i;
-+ 
-+@@ -3142,7 +3143,12 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,
-+ 	if (ret)
-+ 		return ret;
-+ 
-+-	if (!mtd->name)
-++#ifdef CONFIG_MTD_OF_PARTS
-++	of_property_read_string(np, "linux,mtd-name", &of_mtd_name);
-++#endif
-++	if (of_mtd_name)
-++		mtd->name = of_mtd_name;
-++	else if (!mtd->name)
-+ 		mtd->name = dev_name(dev);
-+ 	mtd->priv = nor;
-+ 	mtd->type = MTD_NORFLASH;
-+--- a/drivers/mtd/mtdcore.c
-++++ b/drivers/mtd/mtdcore.c
-+@@ -762,6 +762,17 @@ int del_mtd_device(struct mtd_info *mtd)
-+  */
-+ static void mtd_set_dev_defaults(struct mtd_info *mtd)
-+ {
-++#ifdef CONFIG_MTD_OF_PARTS
-++	const char __maybe_unused *of_mtd_name = NULL;
-++	struct device_node *np;
-++
-++	np = mtd_get_of_node(mtd);
-++	if (np && !mtd->name) {
-++		of_property_read_string(np, "linux,mtd-name", &of_mtd_name);
-++		if (of_mtd_name)
-++			mtd->name = of_mtd_name;
-++	} else
-++#endif
-+ 	if (mtd->dev.parent) {
-+ 		if (!mtd->owner && mtd->dev.parent->driver)
-+ 			mtd->owner = mtd->dev.parent->driver->owner;
-diff --git a/target/linux/ath79/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..a02b632e8c48f4a2df7d66b732aa60dd6788b6b1
---- /dev/null
-+++ b/target/linux/ath79/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch
-@@ -0,0 +1,54 @@
-+From f32bc2aa01edcba2f2ed5db151cf183eac9ef919 Mon Sep 17 00:00:00 2001
-+From: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
-+Date: Sat, 25 Feb 2017 16:42:50 +0000
-+Subject: mtd: nor: support mtd name from device tree
-+
-+Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
-+---
-+ drivers/mtd/spi-nor/spi-nor.c | 8 +++++++-
-+ 1 file changed, 7 insertions(+), 1 deletion(-)
-+
-+--- a/drivers/mtd/spi-nor/spi-nor.c
-++++ b/drivers/mtd/spi-nor/spi-nor.c
-+@@ -4937,6 +4937,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ 	struct mtd_info *mtd = &nor->mtd;
-+ 	struct device_node *np = spi_nor_get_flash_node(nor);
-+ 	struct spi_nor_flash_parameter *params = &nor->params;
-++	const char __maybe_unused *of_mtd_name = NULL;
-+ 	int ret;
-+ 	int i;
-+ 
-+@@ -4999,7 +5000,12 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ 	/* Init flash parameters based on flash_info struct and SFDP */
-+ 	spi_nor_init_params(nor);
-+ 
-+-	if (!mtd->name)
-++#ifdef CONFIG_MTD_OF_PARTS
-++	of_property_read_string(np, "linux,mtd-name", &of_mtd_name);
-++#endif
-++	if (of_mtd_name)
-++		mtd->name = of_mtd_name;
-++	else if (!mtd->name)
-+ 		mtd->name = dev_name(dev);
-+ 	mtd->priv = nor;
-+ 	mtd->type = MTD_NORFLASH;
-+--- a/drivers/mtd/mtdcore.c
-++++ b/drivers/mtd/mtdcore.c
-+@@ -778,6 +778,17 @@ out_error:
-+  */
-+ static void mtd_set_dev_defaults(struct mtd_info *mtd)
-+ {
-++#ifdef CONFIG_MTD_OF_PARTS
-++	const char __maybe_unused *of_mtd_name = NULL;
-++	struct device_node *np;
-++
-++	np = mtd_get_of_node(mtd);
-++	if (np && !mtd->name) {
-++		of_property_read_string(np, "linux,mtd-name", &of_mtd_name);
-++		if (of_mtd_name)
-++			mtd->name = of_mtd_name;
-++	} else
-++#endif
-+ 	if (mtd->dev.parent) {
-+ 		if (!mtd->owner && mtd->dev.parent->driver)
-+ 			mtd->owner = mtd->dev.parent->driver->owner;

patches/openwrt/0008-ath79-Add-support-for-OpenMesh-OM2P-v1.patch

@@ -1,316 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Mon, 23 Nov 2020 13:41:34 +0100
-Subject: ath79: Add support for OpenMesh OM2P v1
-
-Device specifications:
-======================
-
-* Qualcomm/Atheros AR7240 rev 2
-* 350/350/175 MHz (CPU/DDR/AHB)
-* 32 MB of RAM
-* 16 MB of SPI NOR flash
-  - 2x 7 MB available; but one of the 7 MB regions is the recovery image
-* 2x 10/100 Mbps Ethernet
-* 1T1R 2.4 GHz Wi-Fi
-* 6x GPIO-LEDs (3x wifi, 2x ethernet, 1x power)
-* 1x GPIO-button (reset)
-* external h/w watchdog (enabled by default)
-* TTL pins are on board (arrow points to VCC, then follows: GND, TX, RX)
-* 2x fast ethernet
-  - eth0
-    + 18-24V passive POE (mode B)
-    + used as WAN interface
-  - eth1
-    + builtin switch port 4
-    + used as LAN interface
-* 12-24V 1A DC
-* external antenna
-
-The device itself requires the mtdparts from the uboot arguments to
-properly boot the flashed image and to support dual-boot (primary +
-recovery image). Unfortunately, the name of the mtd device in mtdparts is
-still using the legacy name "ar7240-nor0" which must be supplied using the
-Linux-specfic DT parameter linux,mtd-name to overwrite the generic name
-"spi0.0".
-
-Flashing instructions:
-======================
-
-Various methods can be used to install the actual image on the flash.
-Two easy ones are:
-
-ap51-flash
-----------
-
-The tool ap51-flash (https://github.com/ap51-flash/ap51-flash) should be
-used to transfer the image to the u-boot when the device boots up.
-
-initramfs from TFTP
--------------------
-
-The serial console must be used to access the u-boot shell during bootup.
-It can then be used to first boot up the initramfs image from a TFTP server
-(here with the IP 192.168.1.21):
-
-   setenv serverip 192.168.1.21
-   setenv ipaddr 192.168.1.1
-   tftpboot 0c00000 <filename-of-initramfs-kernel>.bin && bootm $fileaddr
-
-The actual sysupgrade image can then be transferred (on the LAN port) to the
-device via
-
-  scp <filename-of-squashfs-sysupgrade>.bin root@192.168.1.1:/tmp/
-
-On the device, the sysupgrade must then be started using
-
-  sysupgrade -n /tmp/<filename-of-squashfs-sysupgrade>.bin
-
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-(cherry picked from commit 8143709c90c3aa0a84e14cf4a9dfbcb365b0d966)
-
-diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79
-index a37057953bc1e9b7fdf2be02136142d0fc145054..f4ccb2faea4e5e6202413a76cd137065dc535fe7 100644
---- a/package/boot/uboot-envtools/files/ath79
-+++ b/package/boot/uboot-envtools/files/ath79
-@@ -95,6 +95,7 @@ netgear,wndr4300tn|\
- netgear,wndr4300sw)
- 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x20000"
- 	;;
-+openmesh,om2p-v1|\
- openmesh,om2p-v2|\
- openmesh,om2p-v4|\
- openmesh,om2p-hs-v1|\
-diff --git a/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts b/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts
-new file mode 100644
-index 0000000000000000000000000000000000000000..24d406f7ecd2e14729587190de1aecf71029a1eb
---- /dev/null
-+++ b/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts
-@@ -0,0 +1,154 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+
-+#include "ar7240.dtsi"
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+	compatible = "openmesh,om2p-v1", "qca,ar7240";
-+	model = "OpenMesh OM2P v1";
-+
-+	chosen {
-+		/delete-property/ bootargs;
-+	};
-+
-+	aliases {
-+		led-boot = &led_power_blue;
-+		led-failsafe = &led_power_blue;
-+		led-running = &led_power_blue;
-+		led-upgrade = &led_power_blue;
-+		label-mac-device = &eth0;
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		reset {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&switch_led_disable_pins>;
-+
-+		led_power_blue: power_blue {
-+			label = "blue:power";
-+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-+			default-state = "on";
-+		};
-+
-+		wifi_green {
-+			label = "green:wifi";
-+			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-+			linux,default-trigger = "phy0tpt";
-+		};
-+
-+		wifi_red {
-+			label = "red:wifi";
-+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wifi_yellow {
-+			label = "yellow:wifi";
-+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		lan_blue {
-+			label = "blue:lan";
-+			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wan_blue {
-+			label = "blue:wan";
-+			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	watchdog {
-+		compatible = "linux,wdt-gpio";
-+		gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-+		hw_algo = "toggle";
-+		/* hw_margin_ms is actually 300s but driver limits it to 60s */
-+		hw_margin_ms = <60000>;
-+		always-running;
-+	};
-+};
-+
-+&spi {
-+	status = "okay";
-+
-+	flash@0 {
-+		compatible = "jedec,spi-nor";
-+		reg = <0>;
-+		spi-max-frequency = <40000000>;
-+		linux,mtd-name = "ar7240-nor0";
-+
-+		/* partitions are passed via bootloader */
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "u-boot";
-+				reg = <0x000000 0x040000>;
-+				read-only;
-+			};
-+
-+			partition@40000 {
-+				label = "u-boot-env";
-+				reg = <0x040000 0x040000>;
-+			};
-+
-+			partition@80000 {
-+				label = "custom";
-+				reg = <0x080000 0x140000>;
-+				read-only;
-+			};
-+
-+			partition@1c0000 {
-+				label = "inactive";
-+				reg = <0x1c0000 0x700000>;
-+			};
-+
-+			partition@8c0000 {
-+				label = "inactive2";
-+				reg = <0x8c0000 0x700000>;
-+			};
-+
-+			art: partition@fc0000 {
-+				label = "ART";
-+				reg = <0xfc0000 0x040000>;
-+				read-only;
-+			};
-+		};
-+	};
-+};
-+
-+&eth0 {
-+	mtd-mac-address = <&art 0x0>;
-+};
-+
-+&eth1 {
-+	status = "okay";
-+
-+	mtd-mac-address = <&art 0x6>;
-+};
-+
-+&pcie {
-+	status = "okay";
-+
-+	wifi@0,0 {
-+		compatible = "pci168c,002a";
-+		reg = <0x0000 0 0 0 0>;
-+		qca,no-eeprom;
-+		#gpio-cells = <2>;
-+		gpio-controller;
-+	};
-+};
-diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
-index 3031b4703bfa885c5036856f0ba6a6dc332da4d8..f5384e7fc3859bab1d6c0422de7e173fad3abae2 100755
---- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds
-+++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
-@@ -253,6 +253,10 @@ openmesh,om2p-hs-v4)
- 	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth0"
- 	ucidef_set_led_switch "lan" "LAN" "blue:lan" "switch0" "0x02"
- 	;;
-+openmesh,om2p-v1)
-+	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth0"
-+	ucidef_set_led_switch "lan" "LAN" "blue:lan" "switch0" "0x10"
-+	;;
- pcs,cr3000)
- 	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
- 	ucidef_set_led_switch "lan1" "LAN1" "blue:lan1" "switch0" "0x04"
-diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-index c2932c1737d97f3eb732620041664f5060d16946..5626f79ee199865df4e9a4f04ce2ff9580bce012 100755
---- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
-+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-@@ -174,6 +174,7 @@ ath79_setup_interfaces()
- 	compex,wpj531-16m|\
- 	openmesh,a40|\
- 	openmesh,a60|\
-+	openmesh,om2p-v1|\
- 	openmesh,om2p-v4|\
- 	openmesh,om2p-hs-v4|\
- 	plasmacloud,pa300|\
-diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
-index 08d9e017a734e29c9b3be4c865e32f109847b4f5..cf07f138260170bcac789e617e09978776b3d2c5 100644
---- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
-+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
-@@ -128,6 +128,9 @@ case "$FIRMWARE" in
- 	openmesh,mr600-v2)
- 		caldata_extract "ART" 0x5000 0x440
- 		;;
-+	openmesh,om2p-v1)
-+		caldata_extract "ART" 0x1000 0x440
-+		;;
- 	wd,mynet-n750)
- 		caldata_extract "art" 0x5000 0x440
- 		ath9k_patch_mac $(mtd_get_mac_ascii devdata "wlan5mac")
-diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-index e979c11bb91cb20fd4168b8921499f03572d3512..e9203f3a5b624e1e9b46c474e95e27583bcb6765 100644
---- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-@@ -73,6 +73,7 @@ platform_do_upgrade() {
- 	openmesh,mr900-v2|\
- 	openmesh,mr1750-v1|\
- 	openmesh,mr1750-v2|\
-+	openmesh,om2p-v1|\
- 	openmesh,om2p-v2|\
- 	openmesh,om2p-v4|\
- 	openmesh,om2p-hs-v1|\
-diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
-index c63900dc701bbc21dce12086f7045d7d450fc5f3..8113b515368b253d0812fbbb86278e7fde63a038 100644
---- a/target/linux/ath79/image/generic.mk
-+++ b/target/linux/ath79/image/generic.mk
-@@ -1722,6 +1722,16 @@ define Device/openmesh_mr1750-v2
- endef
- TARGET_DEVICES += openmesh_mr1750-v2
- 
-+define Device/openmesh_om2p-v1
-+  $(Device/openmesh_common_256k)
-+  SOC := ar7240
-+  DEVICE_MODEL := OM2P
-+  DEVICE_VARIANT := v1
-+  OPENMESH_CE_TYPE := OM2P
-+  SUPPORTED_DEVICES += om2p
-+endef
-+TARGET_DEVICES += openmesh_om2p-v1
-+
- define Device/openmesh_om2p-v2
-   $(Device/openmesh_common_256k)
-   SOC := ar9330

patches/openwrt/0009-ath79-Add-support-for-OpenMesh-OM5P-AC-v1.patch

@@ -1,348 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Mon, 23 Nov 2020 13:41:34 +0100
-Subject: ath79: Add support for OpenMesh OM5P-AC v1
-
-Device specifications:
-======================
-
-* Qualcomm/Atheros QCA9558 ver 1 rev 0
-* 720/600/240 MHz (CPU/DDR/AHB)
-* 128 MB of RAM
-* 16 MB of SPI NOR flash
-  - 2x 7 MB available; but one of the 7 MB regions is the recovery image
-* 2T2R 2.4 GHz Wi-Fi (11n)
-* 2T2R 5 GHz Wi-Fi (11ac)
-* 6x GPIO-LEDs (3x wifi, 2x ethernet, 1x power)
-* external h/w watchdog (enabled by default))
-* TTL pins are on board (arrow points to VCC, then follows: GND, TX, RX)
-* TI tmp423 (package kmod-hwmon-tmp421) for temperature monitoring
-* 2x ethernet
-  - eth0
-    + AR8035 ethernet PHY (RGMII)
-    + 10/100/1000 Mbps Ethernet
-    + 802.3af POE
-    + used as LAN interface
-  - eth1
-    + AR8035 ethernet PHY (SGMII)
-    + 10/100/1000 Mbps Ethernet
-    + 18-24V passive POE (mode B)
-    + used as WAN interface
-* 12-24V 1A DC
-* internal antennas
-
-Flashing instructions:
-======================
-
-Various methods can be used to install the actual image on the flash.
-Two easy ones are:
-
-ap51-flash
-----------
-
-The tool ap51-flash (https://github.com/ap51-flash/ap51-flash) should be
-used to transfer the image to the u-boot when the device boots up.
-
-initramfs from TFTP
--------------------
-
-The serial console must be used to access the u-boot shell during bootup.
-It can then be used to first boot up the initramfs image from a TFTP server
-(here with the IP 192.168.1.21):
-
-   setenv serverip 192.168.1.21
-   setenv ipaddr 192.168.1.1
-   tftpboot 0c00000 <filename-of-initramfs-kernel>.bin && bootm $fileaddr
-
-The actual sysupgrade image can then be transferred (on the LAN port) to the
-device via
-
-  scp <filename-of-squashfs-sysupgrade>.bin root@192.168.1.1:/tmp/
-
-On the device, the sysupgrade must then be started using
-
-  sysupgrade -n /tmp/<filename-of-squashfs-sysupgrade>.bin
-
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-(cherry picked from commit 97f561725962ddb8823b2e01563a0f37f7930477)
-
-diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79
-index f4ccb2faea4e5e6202413a76cd137065dc535fe7..08c066c3494e8ea6fa5db639e11caa6406f3c6f9 100644
---- a/package/boot/uboot-envtools/files/ath79
-+++ b/package/boot/uboot-envtools/files/ath79
-@@ -58,6 +58,7 @@ openmesh,mr900-v2|\
- openmesh,mr1750-v1|\
- openmesh,mr1750-v2|\
- openmesh,om5p|\
-+openmesh,om5p-ac-v1|\
- openmesh,om5p-ac-v2|\
- samsung,wam250|\
- ubnt,nanostation-m|\
-diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
-new file mode 100644
-index 0000000000000000000000000000000000000000..ae69992abf583168a0ab9a017a9aee33758dd4d8
---- /dev/null
-+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
-@@ -0,0 +1,199 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+
-+#include "qca955x.dtsi"
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+	compatible = "openmesh,om5p-ac-v1", "qca,qca9558";
-+	model = "OpenMesh OM5P-AC v1";
-+
-+	chosen {
-+		/delete-property/ bootargs;
-+	};
-+
-+	aliases {
-+		serial0 = &uart;
-+		led-boot = &led_power_blue;
-+		led-failsafe = &led_power_blue;
-+		led-running = &led_power_blue;
-+		led-upgrade = &led_power_blue;
-+		label-mac-device = &eth0;
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		led_power_blue: power_blue {
-+			label = "blue:power";
-+			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-+			default-state = "on";
-+		};
-+
-+		wan_blue {
-+			label = "blue:wan";
-+			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		lan_blue {
-+			label = "blue:lan";
-+			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wifi_green {
-+			label = "green:wifi";
-+			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
-+			linux,default-trigger = "phy0tpt";
-+		};
-+
-+		wifi_yellow {
-+			label = "yellow:wifi";
-+			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wifi_red {
-+			label = "red:wifi";
-+			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	i2c {
-+		compatible = "i2c-gpio";
-+		gpios = <&gpio 11 GPIO_ACTIVE_HIGH /* sda */
-+			 &gpio 12 GPIO_ACTIVE_HIGH /* scl */
-+			>;
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		i2c-gpio,scl-open-drain;
-+		i2c-gpio,sda-open-drain;
-+
-+		tmp423a@4c {
-+			compatible = "ti,tmp423";
-+			reg = <0x4c>;
-+		};
-+	};
-+
-+	watchdog {
-+		compatible = "linux,wdt-gpio";
-+		gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-+		hw_algo = "toggle";
-+		/* hw_margin_ms is actually 300s but driver limits it to 60s */
-+		hw_margin_ms = <60000>;
-+		always-running;
-+	};
-+};
-+
-+&spi {
-+	status = "okay";
-+
-+	flash@0 {
-+		compatible = "jedec,spi-nor";
-+		reg = <0>;
-+		spi-max-frequency = <40000000>;
-+
-+		/* partitions are passed via bootloader */
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "u-boot";
-+				reg = <0x000000 0x040000>;
-+				read-only;
-+			};
-+
-+			partition@40000 {
-+				label = "u-boot-env";
-+				reg = <0x040000 0x010000>;
-+			};
-+
-+			partition@50000 {
-+				label = "custom";
-+				reg = <0x050000 0x060000>;
-+				read-only;
-+			};
-+
-+			partition@b0000 {
-+				label = "inactive";
-+				reg = <0x0b0000 0x7a0000>;
-+			};
-+
-+			partition@850000 {
-+				label = "inactive2";
-+				reg = <0x850000 0x7a0000>;
-+			};
-+
-+			art: partition@ff0000 {
-+				label = "ART";
-+				reg = <0xff0000 0x010000>;
-+				read-only;
-+			};
-+		};
-+	};
-+};
-+
-+&mdio0 {
-+	status = "okay";
-+
-+	phy-mask = <0x6>;
-+
-+	phy1: ethernet-phy@1 {
-+		reg = <1>;
-+		eee-broken-100tx;
-+		eee-broken-1000t;
-+	};
-+
-+	phy2: ethernet-phy@2 {
-+		reg = <2>;
-+		eee-broken-100tx;
-+		eee-broken-1000t;
-+		at803x-override-sgmii-link-check;
-+	};
-+};
-+
-+&eth0 {
-+	status = "okay";
-+
-+	pll-data = <0x82000101 0x80000101 0x80001313>;
-+
-+	mtd-mac-address = <&art 0x0>;
-+
-+	phy-mode = "rgmii-id";
-+	phy-handle = <&phy1>;
-+
-+	gmac-config {
-+		device = <&gmac>;
-+		rgmii-enabled = <1>;
-+		rxd-delay = <3>;
-+		rxdv-delay = <3>;
-+		txd-delay = <0>;
-+		txen-delay = <0>;
-+	};
-+};
-+
-+&eth1 {
-+	status = "okay";
-+
-+	pll-data = <0x03000101 0x80000101 0x80001313>;
-+
-+	mtd-mac-address = <&art 0x6>;
-+
-+	qca955x-sgmii-fixup;
-+
-+	phy-handle = <&phy2>;
-+};
-+
-+&wmac {
-+	status = "okay";
-+
-+	mtd-cal-data = <&art 0x1000>;
-+	mtd-mac-address = <&art 0x0>;
-+	mac-address-increment = <2>;
-+};
-+
-+&pcie1 {
-+	status = "okay";
-+};
-diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
-index f5384e7fc3859bab1d6c0422de7e173fad3abae2..68ea4281a56bff44147c7792990cc1e26bc10a7c 100755
---- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds
-+++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
-@@ -257,6 +257,10 @@ openmesh,om2p-v1)
- 	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth0"
- 	ucidef_set_led_switch "lan" "LAN" "blue:lan" "switch0" "0x10"
- 	;;
-+openmesh,om5p-ac-v1)
-+	ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
-+	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
-+	;;
- pcs,cr3000)
- 	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
- 	ucidef_set_led_switch "lan1" "LAN1" "blue:lan1" "switch0" "0x04"
-diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index b70a87054b10fbe708d9aa8603ecdb591fc92591..00dbeec6a51457c23ba97aa627bf14acd8349f74 100644
---- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -158,6 +158,10 @@ case "$FIRMWARE" in
- 	;;
- "ath10k/cal-pci-0000:01:00.0.bin")
- 	case $board in
-+	openmesh,om5p-ac-v1)
-+		caldata_extract "ART" 0x5000 0x844
-+		ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16)
-+		;;
- 	sitecom,wlr-8100)
- 		caldata_extract "art" 0x5000 0x844
- 		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +1)
-diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-index e9203f3a5b624e1e9b46c474e95e27583bcb6765..2cac42c9feaed3c0360091a5b7959e741d4a0473 100644
---- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-@@ -82,6 +82,7 @@ platform_do_upgrade() {
- 	openmesh,om2p-hs-v4|\
- 	openmesh,om2p-lc|\
- 	openmesh,om5p|\
-+	openmesh,om5p-ac-v1|\
- 	openmesh,om5p-ac-v2)
- 		PART_NAME="inactive"
- 		platform_do_upgrade_openmesh "$1"
-diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
-index 8113b515368b253d0812fbbb86278e7fde63a038..75dbc1c03b5c42b81463bf7c4ddd4aa5803afd69 100644
---- a/target/linux/ath79/image/generic.mk
-+++ b/target/linux/ath79/image/generic.mk
-@@ -1810,6 +1810,17 @@ define Device/openmesh_om5p
- endef
- TARGET_DEVICES += openmesh_om5p
- 
-+define Device/openmesh_om5p-ac-v1
-+  $(Device/openmesh_common_64k)
-+  SOC := qca9558
-+  DEVICE_MODEL := OM5P-AC
-+  DEVICE_VARIANT := v1
-+  DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct
-+  OPENMESH_CE_TYPE := OM5PAC
-+  SUPPORTED_DEVICES += om5p-ac
-+endef
-+TARGET_DEVICES += openmesh_om5p-ac-v1
-+
- define Device/openmesh_om5p-ac-v2
-   $(Device/openmesh_common_64k)
-   SOC := qca9558

patches/openwrt/0010-ath79-Add-support-for-OpenMesh-OM5P-AN.patch

@@ -1,365 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Mon, 23 Nov 2020 13:41:34 +0100
-Subject: ath79: Add support for OpenMesh OM5P-AN
-
-Device specifications:
-======================
-
-* Qualcomm/Atheros AR9344 rev 2
-* 560/450/225 MHz (CPU/DDR/AHB)
-* 64 MB of RAM
-* 16 MB of SPI NOR flash
-  - 2x 7 MB available; but one of the 7 MB regions is the recovery image
-* 1T1R 2.4 GHz Wi-Fi
-* 2T2R 5 GHz Wi-Fi
-* 6x GPIO-LEDs (3x wifi, 2x ethernet, 1x power)
-* 1x GPIO-button (reset)
-* external h/w watchdog (enabled by default)
-* TTL pins are on board (arrow points to VCC, then follows: GND, TX, RX)
-* TI tmp423 (package kmod-hwmon-tmp421) for temperature monitoring
-* 2x ethernet
-  - eth0
-    + AR8035 ethernet PHY
-    + 10/100/1000 Mbps Ethernet
-    + 802.3af POE
-    + used as LAN interface
-  - eth1
-    + 10/100 Mbps Ethernet
-    + builtin switch port 1
-    + 18-24V passive POE (mode B)
-    + used as WAN interface
-* 12-24V 1A DC
-* internal antennas
-
-Flashing instructions:
-======================
-
-Various methods can be used to install the actual image on the flash.
-Two easy ones are:
-
-ap51-flash
-----------
-
-The tool ap51-flash (https://github.com/ap51-flash/ap51-flash) should be
-used to transfer the image to the u-boot when the device boots up.
-
-initramfs from TFTP
--------------------
-
-The serial console must be used to access the u-boot shell during bootup.
-It can then be used to first boot up the initramfs image from a TFTP server
-(here with the IP 192.168.1.21):
-
-   setenv serverip 192.168.1.21
-   setenv ipaddr 192.168.1.1
-   tftpboot 0c00000 <filename-of-initramfs-kernel>.bin && bootm $fileaddr
-
-The actual sysupgrade image can then be transferred (on the LAN port) to the
-device via
-
-  scp <filename-of-squashfs-sysupgrade>.bin root@192.168.1.1:/tmp/
-
-On the device, the sysupgrade must then be started using
-
-  sysupgrade -n /tmp/<filename-of-squashfs-sysupgrade>.bin
-
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-(cherry picked from commit 72ef5945508193228544bcd7fcfe81b32e8dc042)
-
-diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79
-index 08c066c3494e8ea6fa5db639e11caa6406f3c6f9..78e5fc0a2be25e1ed676ac647214f237f29b4667 100644
---- a/package/boot/uboot-envtools/files/ath79
-+++ b/package/boot/uboot-envtools/files/ath79
-@@ -58,6 +58,7 @@ openmesh,mr900-v2|\
- openmesh,mr1750-v1|\
- openmesh,mr1750-v2|\
- openmesh,om5p|\
-+openmesh,om5p-an|\
- openmesh,om5p-ac-v1|\
- openmesh,om5p-ac-v2|\
- samsung,wam250|\
-diff --git a/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts b/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts
-new file mode 100644
-index 0000000000000000000000000000000000000000..6950ba3a2936cf8c9b12a22c966dc3b9215f2227
---- /dev/null
-+++ b/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts
-@@ -0,0 +1,216 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+
-+#include "ar9344.dtsi"
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+	compatible = "openmesh,om5p-an", "qca,ar9344";
-+	model = "OpenMesh OM5P-AN";
-+
-+	chosen {
-+		/delete-property/ bootargs;
-+	};
-+
-+	aliases {
-+		led-boot = &led_power_blue;
-+		led-failsafe = &led_power_blue;
-+		led-running = &led_power_blue;
-+		led-upgrade = &led_power_blue;
-+		label-mac-device = &eth0;
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		reset {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&led_lan_wan_blue_pin>;
-+
-+		led_power_blue: power_blue {
-+			label = "blue:power";
-+			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-+			default-state = "on";
-+		};
-+
-+		wan_blue {
-+			label = "blue:wan";
-+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		lan_blue {
-+			label = "blue:lan";
-+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wifi_green {
-+			label = "green:wifi";
-+			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-+			linux,default-trigger = "phy0tpt";
-+		};
-+
-+		wifi_yellow {
-+			label = "yellow:wifi";
-+			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wifi_red {
-+			label = "red:wifi";
-+			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	i2c {
-+		compatible = "i2c-gpio";
-+		gpios = <&gpio 21 GPIO_ACTIVE_HIGH /* sda */
-+			 &gpio 20 GPIO_ACTIVE_HIGH /* scl */
-+			>;
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		i2c-gpio,scl-open-drain;
-+		i2c-gpio,sda-open-drain;
-+
-+		tmp423a@4c {
-+			compatible = "ti,tmp423";
-+			reg = <0x4c>;
-+		};
-+	};
-+
-+	watchdog {
-+		compatible = "linux,wdt-gpio";
-+		gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-+		hw_algo = "toggle";
-+		/* hw_margin_ms is actually 300s but driver limits it to 60s */
-+		hw_margin_ms = <60000>;
-+		always-running;
-+	};
-+};
-+
-+&ref {
-+	clock-frequency = <40000000>;
-+};
-+
-+&pinmux {
-+	led_lan_wan_blue_pin: pinmux_lan_wan_blue_pin {
-+		pinctrl-single,bits = <0xc 0x0 0xffff0000>;
-+	};
-+};
-+
-+&spi {
-+	status = "okay";
-+
-+	flash@0 {
-+		compatible = "jedec,spi-nor";
-+		reg = <0>;
-+		spi-max-frequency = <40000000>;
-+
-+		/* partitions are passed via bootloader */
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "u-boot";
-+				reg = <0x000000 0x040000>;
-+				read-only;
-+			};
-+
-+			partition@40000 {
-+				label = "u-boot-env";
-+				reg = <0x040000 0x010000>;
-+			};
-+
-+			partition@50000 {
-+				label = "custom";
-+				reg = <0x050000 0x060000>;
-+				read-only;
-+			};
-+
-+			partition@b0000 {
-+				label = "inactive";
-+				reg = <0x0b0000 0x7a0000>;
-+			};
-+
-+			partition@850000 {
-+				label = "inactive2";
-+				reg = <0x850000 0x7a0000>;
-+			};
-+
-+			art: partition@ff0000 {
-+				label = "ART";
-+				reg = <0xff0000 0x010000>;
-+				read-only;
-+			};
-+		};
-+	};
-+};
-+
-+&mdio0 {
-+	status = "okay";
-+
-+	phy-mask = <0x80>;
-+
-+	phy7: ethernet-phy@7 {
-+		reg = <7>;
-+		eee-broken-100tx;
-+		eee-broken-1000t;
-+	};
-+};
-+
-+&eth0 {
-+	status = "okay";
-+
-+	pll-data = <0x02000000 0x00000101 0x00001313>;
-+
-+	mtd-mac-address = <&art 0x0>;
-+
-+	phy-mode = "rgmii-id";
-+	phy-handle = <&phy7>;
-+
-+	gmac-config {
-+		device = <&gmac>;
-+		rgmii-gmac0 = <1>;
-+		rxd-delay = <2>;
-+		rxdv-delay = <2>;
-+		switch-phy-swap = <1>;
-+	};
-+};
-+
-+&eth1 {
-+	status = "okay";
-+
-+	mtd-mac-address = <&art 0x0>;
-+	mac-address-increment = <1>;
-+};
-+
-+&wmac {
-+	status = "okay";
-+
-+	mtd-cal-data = <&art 0x1000>;
-+	mtd-mac-address = <&art 0x0>;
-+	mac-address-increment = <2>;
-+};
-+
-+&pcie {
-+	status = "okay";
-+
-+	wifi@0,0 {
-+		compatible = "pci168c,0030";
-+		reg = <0x0000 0 0 0 0>;
-+		qca,no-eeprom;
-+		mtd-mac-address = <&art 0x0>;
-+		mac-address-increment = <16>;
-+	};
-+};
-diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
-index 68ea4281a56bff44147c7792990cc1e26bc10a7c..403ca9edd940d76bf9695cc18fe0c8cdd7e22967 100755
---- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds
-+++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
-@@ -261,6 +261,10 @@ openmesh,om5p-ac-v1)
- 	ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
- 	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
- 	;;
-+openmesh,om5p-an)
-+	ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
-+	ucidef_set_led_switch "wan" "WAN" "blue:wan" "switch0" "0x02"
-+	;;
- pcs,cr3000)
- 	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
- 	ucidef_set_led_switch "lan1" "LAN1" "blue:lan1" "switch0" "0x04"
-diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
-index cf07f138260170bcac789e617e09978776b3d2c5..fbce7d672b2306094544aacf527257e7e6a6ba8c 100644
---- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
-+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
-@@ -125,7 +125,8 @@ case "$FIRMWARE" in
- 		caldata_extract "art" 0x1000 0x1000
- 		;;
- 	openmesh,mr600-v1|\
--	openmesh,mr600-v2)
-+	openmesh,mr600-v2|\
-+	openmesh,om5p-an)
- 		caldata_extract "ART" 0x5000 0x440
- 		;;
- 	openmesh,om2p-v1)
-diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-index 2cac42c9feaed3c0360091a5b7959e741d4a0473..67e53c5fdebf29e71b920753be829fa4e41ca207 100644
---- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
-@@ -83,7 +83,8 @@ platform_do_upgrade() {
- 	openmesh,om2p-lc|\
- 	openmesh,om5p|\
- 	openmesh,om5p-ac-v1|\
--	openmesh,om5p-ac-v2)
-+	openmesh,om5p-ac-v2|\
-+	openmesh,om5p-an)
- 		PART_NAME="inactive"
- 		platform_do_upgrade_openmesh "$1"
- 		;;
-diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
-index 75dbc1c03b5c42b81463bf7c4ddd4aa5803afd69..000fec405e161dc4906e88dd967f73c2df95f296 100644
---- a/target/linux/ath79/image/generic.mk
-+++ b/target/linux/ath79/image/generic.mk
-@@ -1832,6 +1832,15 @@ define Device/openmesh_om5p-ac-v2
- endef
- TARGET_DEVICES += openmesh_om5p-ac-v2
- 
-+define Device/openmesh_om5p-an
-+  $(Device/openmesh_common_64k)
-+  SOC := ar9344
-+  DEVICE_MODEL := OM5P-AN
-+  OPENMESH_CE_TYPE := OM5P
-+  SUPPORTED_DEVICES += om5p-an
-+endef
-+TARGET_DEVICES += openmesh_om5p-an
-+
- define Device/pcs_cap324
-   SOC := ar9344
-   DEVICE_VENDOR := PowerCloud Systems

patches/packages/packages/0001-perl-don-t-build-in-parallel-and-bump-release.patch

@@ -8,7 +8,7 @@ https://github.com/openwrt/packages/issues/8238
 https://github.com/openwrt/packages/pull/17274
 
 diff --git a/lang/perl/Makefile b/lang/perl/Makefile
-index 443164f0a4a6a1c9fa189bf9c3c033d70db30ca0..121a3bfe653f46ecac7d10b1f3ae480fcd02f155 100644
+index 99302cb1a4414c309b238342d3f1b8bc7f43dd47..66c6ce7aaf342e404b8d9a133a7e396d0108a31f 100644
 --- a/lang/perl/Makefile
 +++ b/lang/perl/Makefile
 @@ -34,8 +34,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION)

patches/packages/packages/0002-fastd-simplify-Config.in.patch

@@ -1,124 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 7 Mar 2021 11:48:32 +0100
-Subject: fastd: simplify Config.in
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-(cherry picked from commit 45976ff31a9894dec35fc4a077c9652f6cb59a54)
-
-diff --git a/net/fastd/Config.in b/net/fastd/Config.in
-index 8302f7ee4dac874b1303ebeeb836551ef202c261..89ff6850aa5ab4ad0e762d8fb9473d5e5c820089 100644
---- a/net/fastd/Config.in
-+++ b/net/fastd/Config.in
-@@ -1,102 +1,79 @@
-+if PACKAGE_fastd
-+
- menu "Configuration"
--	depends on PACKAGE_fastd
- 
- config FASTD_ENABLE_METHOD_CIPHER_TEST
- 	bool "Enable cipher-test method provider"
--	depends on PACKAGE_fastd
--	default n
- 
- config FASTD_ENABLE_METHOD_COMPOSED_GMAC
- 	bool "Enable composed-gmac method provider"
--	depends on PACKAGE_fastd
-+	select FASTD_ENABLE_MAC_GHASH
- 	default y
- 
- config FASTD_ENABLE_METHOD_COMPOSED_UMAC
- 	bool "Enable composed-umac method provider"
--	depends on PACKAGE_fastd
-+	select FASTD_ENABLE_MAC_UHASH
- 	default y
- 
- config FASTD_ENABLE_METHOD_GENERIC_GMAC
- 	bool "Enable generic-gmac method provider"
--	depends on PACKAGE_fastd
-+	select FASTD_ENABLE_MAC_GHASH
- 	default y
- 
- config FASTD_ENABLE_METHOD_GENERIC_POLY1305
- 	bool "Enable generic-poly1305 method provider"
--	depends on PACKAGE_fastd
--	default n
- 
- config FASTD_ENABLE_METHOD_GENERIC_UMAC
- 	bool "Enable generic-umac method provider"
--	depends on PACKAGE_fastd
-+	select FASTD_ENABLE_MAC_UHASH
- 	default y
- 
- config FASTD_ENABLE_METHOD_NULL
- 	bool "Enable null method"
--	depends on PACKAGE_fastd
- 	default y
- 
- 
- config FASTD_ENABLE_CIPHER_NULL
- 	bool "Enable the null cipher"
--	depends on PACKAGE_fastd
- 	default y
- 
- config FASTD_ENABLE_CIPHER_SALSA20
- 	bool "Enable the Salsa20 cipher"
--	depends on PACKAGE_fastd
--	default n
- 
- config FASTD_ENABLE_CIPHER_SALSA2012
- 	bool "Enable the Salsa20/12 cipher"
--	depends on PACKAGE_fastd
- 	default y
- 
- 
- config FASTD_ENABLE_MAC_GHASH
--	bool "Enable the GHASH message authentication code"
--	depends on PACKAGE_fastd
--	default y
-+	bool
- 
- config FASTD_ENABLE_MAC_UHASH
--	bool "Enable the UHASH message authentication code"
--	depends on PACKAGE_fastd
--	default y
-+	bool
- 
- 
- config FASTD_WITH_CAPABILITIES
- 	bool "Enable POSIX capability support"
--	depends on PACKAGE_fastd
--	default n
- 
- config FASTD_WITH_CMDLINE_USER
- 	bool "Include support for setting user/group related options on the command line"
--	depends on PACKAGE_fastd
--	default n
- 
- config FASTD_WITH_CMDLINE_LOGGING
- 	bool "Include support for setting logging related options on the command line"
--	depends on PACKAGE_fastd
--	default n
- 
- config FASTD_WITH_CMDLINE_OPERATION
- 	bool "Include support for setting options related to the VPN operation (like mode, interface, encryption method) on the command line"
--	depends on PACKAGE_fastd
--	default n
- 
- config FASTD_WITH_CMDLINE_COMMANDS
- 	bool "Include support for setting handler scripts (e.g. --on-up) on the command line"
--	depends on PACKAGE_fastd
--	default n
- 
- config FASTD_WITH_DYNAMIC_PEERS
- 	bool "Include support for dynamic peers (using on-verify handlers)"
--	depends on PACKAGE_fastd
--	default n
- 
- config FASTD_WITH_STATUS_SOCKET
- 	bool "Include support for status sockets"
--	depends on PACKAGE_fastd
- 	default y
- 
- endmenu
-+
-+endif

patches/packages/packages/0003-fastd-disable-GMAC-based-methods-by-default.patch

@@ -1,32 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 7 Mar 2021 11:50:04 +0100
-Subject: fastd: disable GMAC-based methods by default
-
-The UMAC-based methods provide higher performance than GMAC and aren't
-suspectible to timing attacks when implemented in software (which is
-always the case on OpenWrt, as OpenSSL support is disabled). Disable
-GMAC by default to save a few KiB.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-(cherry picked from commit 916a65781829d93856bfb82cf78ba333b8fbc973)
-
-diff --git a/net/fastd/Config.in b/net/fastd/Config.in
-index 89ff6850aa5ab4ad0e762d8fb9473d5e5c820089..b6d46246e53516cdb7fc6e4857ea62481b4e8276 100644
---- a/net/fastd/Config.in
-+++ b/net/fastd/Config.in
-@@ -8,7 +8,6 @@ config FASTD_ENABLE_METHOD_CIPHER_TEST
- config FASTD_ENABLE_METHOD_COMPOSED_GMAC
- 	bool "Enable composed-gmac method provider"
- 	select FASTD_ENABLE_MAC_GHASH
--	default y
- 
- config FASTD_ENABLE_METHOD_COMPOSED_UMAC
- 	bool "Enable composed-umac method provider"
-@@ -18,7 +17,6 @@ config FASTD_ENABLE_METHOD_COMPOSED_UMAC
- config FASTD_ENABLE_METHOD_GENERIC_GMAC
- 	bool "Enable generic-gmac method provider"
- 	select FASTD_ENABLE_MAC_GHASH
--	default y
- 
- config FASTD_ENABLE_METHOD_GENERIC_POLY1305
- 	bool "Enable generic-poly1305 method provider"

patches/packages/packages/0004-fastd-update-to-v22.patch

@@ -1,59 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 27 Jun 2021 13:07:49 +0200
-Subject: fastd: update to v22
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-(cherry picked from commit c8ca43865dcc7be0e3193f9b7d12f40d3441c258)
-
-diff --git a/net/fastd/Config.in b/net/fastd/Config.in
-index b6d46246e53516cdb7fc6e4857ea62481b4e8276..157d1e39931cc0163785212cb5eea7d8af4f46f2 100644
---- a/net/fastd/Config.in
-+++ b/net/fastd/Config.in
-@@ -30,6 +30,10 @@ config FASTD_ENABLE_METHOD_NULL
- 	bool "Enable null method"
- 	default y
- 
-+config FASTD_ENABLE_METHOD_NULL_L2TP
-+	bool "Enable null@l2tp method"
-+	default y
-+
- 
- config FASTD_ENABLE_CIPHER_NULL
- 	bool "Enable the null cipher"
-diff --git a/net/fastd/Makefile b/net/fastd/Makefile
-index c7ab056a9ae005a75a75911658607e64d6228aac..d1ed4cf9afbe2faf11a0fa3b7b4d281848a8df2d 100644
---- a/net/fastd/Makefile
-+++ b/net/fastd/Makefile
-@@ -8,12 +8,12 @@
- include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=fastd
--PKG_VERSION:=21
-+PKG_VERSION:=22
- 
- PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
- PKG_SOURCE_URL:=https://github.com/NeoRaider/fastd/releases/download/v$(PKG_VERSION)
--PKG_HASH:=942f33bcd794bcb8e19da4c30c875bdfd4d0f1c24ec4dcdf51237791bbfb0d4c
-+PKG_HASH:=19750b88705d66811b7c21b672537909c19ae6b21350688cbd1a3a54d08a8951
- 
- PKG_LICENSE:=BSD-2-Clause
- PKG_LICENSE_FILES:=COPYRIGHT
-@@ -26,6 +26,7 @@ PKG_CONFIG_DEPENDS:=\
- 	CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305 \
- 	CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC \
- 	CONFIG_FASTD_ENABLE_METHOD_NULL \
-+	CONFIG_FASTD_ENABLE_METHOD_NULL_L2TP \
- 	CONFIG_FASTD_ENABLE_CIPHER_NULL \
- 	CONFIG_FASTD_ENABLE_CIPHER_SALSA20 \
- 	CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 \
-@@ -81,7 +82,9 @@ MESON_ARGS += \
- 	-Dmethod_generic-poly1305=$(call feature,ENABLE_METHOD_GENERIC_POLY1305) \
- 	-Dmethod_generic-umac=$(call feature,ENABLE_METHOD_GENERIC_UMAC) \
- 	-Dmethod_null=$(call feature,ENABLE_METHOD_NULL) \
-+	-Dmethod_null_l2tp=$(call feature,ENABLE_METHOD_NULL_L2TP) \
- 	-Dstatus_socket=$(call feature,WITH_STATUS_SOCKET) \
-+	-Doffload_l2tp=disabled \
- 	-Dsystemd=disabled \
- 	-Duse_nacl=true \
- 	-Db_lto=true \

patches/packages/packages/0005-fastd-add-L2TP-variant.patch

@@ -1,88 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 27 Jun 2021 13:26:26 +0200
-Subject: fastd: add L2TP variant
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-(cherry picked from commit 7b9c04f95b5202d5eb75e4bf1c6831a667ac3d0f)
-
-diff --git a/net/fastd/Config.in b/net/fastd/Config.in
-index 157d1e39931cc0163785212cb5eea7d8af4f46f2..3da5e1f183c5400cc38650efad39edf31c6f18d0 100644
---- a/net/fastd/Config.in
-+++ b/net/fastd/Config.in
-@@ -1,4 +1,4 @@
--if PACKAGE_fastd
-+if PACKAGE_fastd || PACKAGE_fastd-l2tp
- 
- menu "Configuration"
- 
-diff --git a/net/fastd/Makefile b/net/fastd/Makefile
-index d1ed4cf9afbe2faf11a0fa3b7b4d281848a8df2d..58255cb0ba1a3b00fbca7cfdd44abd3a923603f3 100644
---- a/net/fastd/Makefile
-+++ b/net/fastd/Makefile
-@@ -15,8 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
- PKG_SOURCE_URL:=https://github.com/NeoRaider/fastd/releases/download/v$(PKG_VERSION)
- PKG_HASH:=19750b88705d66811b7c21b672537909c19ae6b21350688cbd1a3a54d08a8951
- 
--PKG_LICENSE:=BSD-2-Clause
--PKG_LICENSE_FILES:=COPYRIGHT
-+PKG_LICENSE:=BSD-2-Clause LGPL-2.1-or-later
-+PKG_LICENSE_FILES:=COPYRIGHT src/dep/libmnl/COPYING
- 
- PKG_CONFIG_DEPENDS:=\
- 	CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \
-@@ -54,6 +54,14 @@ define Package/fastd
-   TITLE:=Fast and Secure Tunneling Daemon
-   URL:=https://github.com/NeoRaider/fastd/
-   SUBMENU:=VPN
-+  VARIANT:=default
-+endef
-+define Package/fastd-l2tp
-+$(Package/fastd)
-+  DEPENDS+=+kmod-l2tp +kmod-l2tp-eth
-+  TITLE+=(L2TP kernel offloading)
-+  VARIANT:=l2tp
-+  PROVIDES:=fastd
- endef
- 
- define Package/fastd/config
-@@ -85,18 +93,31 @@ MESON_ARGS += \
- 	-Dmethod_null_l2tp=$(call feature,ENABLE_METHOD_NULL_L2TP) \
- 	-Dstatus_socket=$(call feature,WITH_STATUS_SOCKET) \
- 	-Doffload_l2tp=disabled \
-+	-Dlibmnl_builtin=true \
- 	-Dsystemd=disabled \
- 	-Duse_nacl=true \
- 	-Db_lto=true \
- 	-Dprefix=/usr
- 
-+ifeq ($(BUILD_VARIANT),l2tp)
-+  MESON_ARGS += \
-+	-Dmethod_null_l2tp=enabled \
-+	-Doffload_l2tp=enabled
-+endif
-+
- define Package/fastd/description
-- Fast and secure tunneling daemon, which is optimized on small code size and few dependencies
-+Fast and secure tunneling daemon, which is optimized on small code size and few dependencies
-+endef
-+define Package/fastd-l2tp/description
-+$(Package/fastd/description)
-+
-+This variant enables L2TP kernel offloadig support.
- endef
- 
- define Package/fastd/conffiles
- /etc/config/fastd
- endef
-+Package/fastd-l2tp/conffiles = $(Package/fastd/conffiles)
- 
- define Package/fastd/install
- 	$(INSTALL_DIR) $(1)/usr/bin
-@@ -110,5 +131,7 @@ define Package/fastd/install
- 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
- 	$(INSTALL_DATA) files/fastd.upgrade $(1)/lib/upgrade/keep.d/fastd
- endef
-+Package/fastd-l2tp/install = $(Package/fastd/install)
- 
- $(eval $(call BuildPackage,fastd))
-+$(eval $(call BuildPackage,fastd-l2tp))

patches/packages/packages/0006-fastd-fix-start-of-non-L2TP-variant.patch

@@ -1,63 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 27 Jun 2021 14:48:48 +0200
-Subject: fastd: fix start of non-L2TP variant
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-(cherry picked from commit 62742985d7cf15029b4d6027a7ccfa0e480278ca)
-
-diff --git a/net/fastd/Makefile b/net/fastd/Makefile
-index 58255cb0ba1a3b00fbca7cfdd44abd3a923603f3..6fd316374d876834995f696fc63e7fbb98fb437c 100644
---- a/net/fastd/Makefile
-+++ b/net/fastd/Makefile
-@@ -9,6 +9,7 @@ include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=fastd
- PKG_VERSION:=22
-+PKG_RELEASE=2
- 
- PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-diff --git a/net/fastd/patches/0001-config-allow-disabling-L2TP-offload-when-fastd-doesn.patch b/net/fastd/patches/0001-config-allow-disabling-L2TP-offload-when-fastd-doesn.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..f2eabc95d61abf070907239b9d5d5935bd82966c
---- /dev/null
-+++ b/net/fastd/patches/0001-config-allow-disabling-L2TP-offload-when-fastd-doesn.patch
-@@ -0,0 +1,38 @@
-+From d95ae843845760aecbbc62a734c2b93b401b1834 Mon Sep 17 00:00:00 2001
-+Message-Id: <d95ae843845760aecbbc62a734c2b93b401b1834.1624798048.git.mschiffer@universe-factory.net>
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Sun, 27 Jun 2021 14:45:46 +0200
-+Subject: [PATCH] config: allow disabling L2TP offload when fastd doesn't
-+ support it
-+
-+Only attempting to enable the offloading should raise an error when it
-+is not supported.
-+---
-+ src/config.y | 8 +++++---
-+ 1 file changed, 5 insertions(+), 3 deletions(-)
-+
-+diff --git a/src/config.y b/src/config.y
-+index a107d7b9fda7..7a3ec6a32649 100644
-+--- a/src/config.y
-++++ b/src/config.y
-+@@ -282,12 +282,14 @@ offload:	TOK_L2TP boolean {
-+ #ifdef WITH_OFFLOAD_L2TP
-+ 			conf.offload_l2tp = $2;
-+ #else
-++			if ($2) {
-+ # ifdef __linux__
-+-			fastd_config_error(&@$, state, "L2TP offload is not supported by this build of fastd");
-++				fastd_config_error(&@$, state, "L2TP offload is not supported by this build of fastd");
-+ # else
-+-			fastd_config_error(&@$, state, "L2TP offload is not supported on this platform");
-++				fastd_config_error(&@$, state, "L2TP offload is not supported on this platform");
-+ # endif
-+-			YYERROR;
-++				YYERROR;
-++			}
-+ #endif
-+ 		}
-+ 	;
-+-- 
-+2.32.0
-+

patches/packages/packages/0007-fastd-make-L2TP-support-a-config-option-instead-of-a-variant.patch

@@ -1,112 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 27 Jun 2021 16:46:38 +0200
-Subject: fastd: make L2TP support a config option instead of a variant
-
-We enable the option by default, but do not depend on the kernel modules
-required for L2TP offloading to avoid wasting space when the feature is
-not needed. To use offloading, kmod-l2tp-eth must be installed.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-(cherry picked from commit 03ff71d5ba955ad2d3f23de30e526ab6452297d4)
-
-diff --git a/net/fastd/Config.in b/net/fastd/Config.in
-index 3da5e1f183c5400cc38650efad39edf31c6f18d0..67ae7c6b1390632735c5d26bade2cb2c570a9a43 100644
---- a/net/fastd/Config.in
-+++ b/net/fastd/Config.in
-@@ -1,4 +1,4 @@
--if PACKAGE_fastd || PACKAGE_fastd-l2tp
-+if PACKAGE_fastd
- 
- menu "Configuration"
- 
-@@ -76,6 +76,10 @@ config FASTD_WITH_STATUS_SOCKET
- 	bool "Include support for status sockets"
- 	default y
- 
-+config FASTD_WITH_OFFLOAD_L2TP
-+	bool "Enable L2TP offloading"
-+	default y
-+
- endmenu
- 
- endif
-diff --git a/net/fastd/Makefile b/net/fastd/Makefile
-index 6fd316374d876834995f696fc63e7fbb98fb437c..9175227a5fe179bdb9d38d5e173f84908fb216ef 100644
---- a/net/fastd/Makefile
-+++ b/net/fastd/Makefile
-@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=fastd
- PKG_VERSION:=22
--PKG_RELEASE=2
-+PKG_RELEASE=3
- 
- PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-@@ -39,7 +39,8 @@ PKG_CONFIG_DEPENDS:=\
- 	CONFIG_FASTD_WITH_CMDLINE_OPERATION \
- 	CONFIG_FASTD_WITH_CMDLINE_COMMANDS \
- 	CONFIG_FASTD_WITH_DYNAMIC_PEERS \
--	CONFIG_FASTD_WITH_STATUS_SOCKET
-+	CONFIG_FASTD_WITH_STATUS_SOCKET \
-+	CONFIG_FASTD_WITH_OFFLOAD_L2TP
- 
- 
- PKG_BUILD_DEPENDS:=meson/host nacl
-@@ -55,14 +56,6 @@ define Package/fastd
-   TITLE:=Fast and Secure Tunneling Daemon
-   URL:=https://github.com/NeoRaider/fastd/
-   SUBMENU:=VPN
--  VARIANT:=default
--endef
--define Package/fastd-l2tp
--$(Package/fastd)
--  DEPENDS+=+kmod-l2tp +kmod-l2tp-eth
--  TITLE+=(L2TP kernel offloading)
--  VARIANT:=l2tp
--  PROVIDES:=fastd
- endef
- 
- define Package/fastd/config
-@@ -93,32 +86,20 @@ MESON_ARGS += \
- 	-Dmethod_null=$(call feature,ENABLE_METHOD_NULL) \
- 	-Dmethod_null_l2tp=$(call feature,ENABLE_METHOD_NULL_L2TP) \
- 	-Dstatus_socket=$(call feature,WITH_STATUS_SOCKET) \
--	-Doffload_l2tp=disabled \
-+	-Doffload_l2tp=$(call feature,WITH_OFFLOAD_L2TP) \
- 	-Dlibmnl_builtin=true \
- 	-Dsystemd=disabled \
- 	-Duse_nacl=true \
- 	-Db_lto=true \
- 	-Dprefix=/usr
- 
--ifeq ($(BUILD_VARIANT),l2tp)
--  MESON_ARGS += \
--	-Dmethod_null_l2tp=enabled \
--	-Doffload_l2tp=enabled
--endif
--
- define Package/fastd/description
- Fast and secure tunneling daemon, which is optimized on small code size and few dependencies
- endef
--define Package/fastd-l2tp/description
--$(Package/fastd/description)
--
--This variant enables L2TP kernel offloadig support.
--endef
- 
- define Package/fastd/conffiles
- /etc/config/fastd
- endef
--Package/fastd-l2tp/conffiles = $(Package/fastd/conffiles)
- 
- define Package/fastd/install
- 	$(INSTALL_DIR) $(1)/usr/bin
-@@ -132,7 +113,5 @@ define Package/fastd/install
- 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
- 	$(INSTALL_DATA) files/fastd.upgrade $(1)/lib/upgrade/keep.d/fastd
- endef
--Package/fastd-l2tp/install = $(Package/fastd/install)
- 
- $(eval $(call BuildPackage,fastd))
--$(eval $(call BuildPackage,fastd-l2tp))

targets/bcm27xx-bcm2711

@@ -0,0 +1,3 @@
+include 'bcm27xx.inc'
+
+device('raspberry-pi-4-model-b', 'rpi-4')

targets/generic

@@ -39,7 +39,6 @@ config('DEVEL', true)
 config('ALL_NONSHARED', true)
 
 config('PACKAGE_usbip', false) -- fails to build
-config('PACKAGE_kmod-jool', false) -- fails to build
 
 try_config('PACKAGE_ATH_DEBUG', true)
 
@@ -79,6 +78,7 @@ packages {
 	'-wpad-mini',
 	'-wpad-basic',
 	'-wpad-basic-wolfssl',
+	'-firewall4',
 	'gluon-core',
-	'ip6tables',
+	'ip6tables-legacy',
 }

targets/mpc85xx-p1010

@@ -7,4 +7,6 @@ device('sophos-red-15w-rev.1', 'sophos_red-15w-rev1', {
 
 -- TP-Link
 
-device('tp-link-tl-wdr4900-v1', 'tplink_tl-wdr4900-v1')
+device('tp-link-tl-wdr4900-v1', 'tplink_tl-wdr4900-v1', {
+	broken = true,
+})

targets/ramips-mt7621

@@ -29,6 +29,13 @@ device('netgear-wndr3700-v5', 'netgear_wndr3700-v5', {
 })
 
 
+-- Tenbay
+
+device('tenbay-t-mb5eu-v01', 'tenbay_t-mb5eu-v01', {
+	factory = false,
+})
+
+
 -- Ubiquiti
 
 device('ubiquiti-unifi-6-lite', 'ubnt_unifi-6-lite', {

targets/targets.mk

@@ -22,5 +22,6 @@ $(eval $(call GluonTarget,x86,64))
 
 ifneq ($(BROKEN),)
 $(eval $(call GluonTarget,bcm27xx,bcm2710)) # BROKEN: Untested
+$(eval $(call GluonTarget,bcm27xx,bcm2711)) # BROKEN: No WiFi support
 $(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support
 endif