From cb6a2ee58c7deed4e0b3d77c13cca98d220156e9 Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Wed, 3 Jan 2024 14:20:05 +0100
Subject: [PATCH] ath79-generic: (re)add support for Ubiquiti AirMax targets

A workarround has been found for the read-only filesystems
after upgrades on Ubiquiti airmax devices:

https://github.com/openwrt/openwrt/commit/f024f4b1b0380b3b2e18115bd8e4f35393fccc70

This reverts commit a0f5b4e9468e9c2fa28459143a7df6ced348f452.
This reverts commit d6dd6293ba9c090da43b403b2c58613c8128fb5c partially.
---
 docs/user/supported_devices.rst               |  4 ++++
 .../luasrc/lib/gluon/upgrade/020-interfaces   |  1 +
 .../luasrc/usr/lib/lua/gluon/platform.lua     |  4 ++++
 targets/ath79-generic                         | 21 +++++++++++++++++++
 4 files changed, 30 insertions(+)

diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
index b69402c51bf..6d006d3325f 100644
--- a/docs/user/supported_devices.rst
+++ b/docs/user/supported_devices.rst
@@ -145,6 +145,10 @@ ath79-generic
 
 * Ubiquiti
 
+  - NanoBeam 5AC 19 (XC)
+  - NanoBeam M5 (XW)
+  - NanoStation Loco M2/M5 (XW)
+  - NanoStation M2/M5 (XW)
   - UniFi AC Lite
   - UniFi AC LR
   - UniFi AC Mesh
diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
index 22bf7bb8842..ad0ab8e1580 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
@@ -49,6 +49,7 @@ if platform.match('ath79', 'generic', {
 	'tplink,wbs210-v1',
 	'tplink,wbs210-v2',
 	'tplink,wbs510-v1',
+	'ubnt,nanostation-m-xw',
 	'ubnt,unifi-ap-pro',
 }) then
 	lan_ifname, wan_ifname = wan_ifname, lan_ifname
diff --git a/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
index 7ba3103f63f..0355d0da76c 100644
--- a/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
+++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
@@ -41,6 +41,10 @@ function M.is_outdoor_device()
 		'tplink,wbs210-v1',
 		'tplink,wbs210-v2',
 		'tplink,wbs510-v1',
+		'ubnt,nanobeam-ac-xc',
+		'ubnt,nanobeam-m5-xw',
+		'ubnt,nanostation-loco-m-xw',
+		'ubnt,nanostation-m-xw',
 		'ubnt,unifi-ap-outdoor-plus',
 		'ubnt,unifiac-mesh',
 		'ubnt,unifiac-mesh-pro',
diff --git a/targets/ath79-generic b/targets/ath79-generic
index 626b6520cb6..ee474e56a38 100644
--- a/targets/ath79-generic
+++ b/targets/ath79-generic
@@ -563,6 +563,21 @@ device('tp-link-wbs510-v1', 'tplink_wbs510-v1', {
 
 -- Ubiquiti
 
+device('ubiquiti-nanostation-loco-m-xw', 'ubnt_nanostation-loco-m-xw', {
+	manifest_aliases = {
+		'ubiquiti-loco-m-xw', -- upgrade from OpenWrt 19.07
+		'ubiquiti-nanostation-loco-m2-xw', -- upgrade from OpenWrt 19.07
+		'ubiquiti-nanostation-loco-m5-xw', -- upgrade from OpenWrt 19.07
+	},
+})
+
+device('ubiquiti-nanostation-m-xw', 'ubnt_nanostation-m-xw', {
+	manifest_aliases = {
+		'ubiquiti-nanostation-m2-xw', -- upgrade from OpenWrt 19.07
+		'ubiquiti-nanostation-m5-xw', -- upgrade from OpenWrt 19.07
+	},
+})
+
 device('ubiquiti-unifi-ac-lite', 'ubnt_unifiac-lite', {
 	factory = false,
 	packages = ATH10K_PACKAGES_QCA9880,
@@ -597,6 +612,12 @@ device('ubiquiti-unifi-ap', 'ubnt_unifi-ap', {
 	},
 })
 
+device('ubiquiti-nanobeam-ac-gen1-xc', 'ubnt_nanobeam-ac-xc', {
+	packages = ATH10K_PACKAGES_QCA9880,
+})
+
+device('ubiquiti-nanobeam-m5-xw', 'ubnt_nanobeam-m5-xw')
+
 device('ubiquiti-unifi-ap-outdoor+', 'ubnt_unifi-ap-outdoor-plus', {
 	manifest_aliases = {
 		'ubiquiti-unifiap-outdoor+', -- upgrade from OpenWrt 19.07