From 81cf8164d58ae4dc1d8044282038825c1723a35a Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Mon, 5 Sep 2022 21:18:35 +0200
Subject: [PATCH 1/3] ath79-nand: add support for ZTE MF281

Signed-off-by: David Bauer <mail@david-bauer.net>
(cherry picked from commit 94249bfa6a6a662346531d679eba566c85a17eac)
---
 targets/ath79-nand | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/targets/ath79-nand b/targets/ath79-nand
index fff1eea8..62bb654b 100644
--- a/targets/ath79-nand
+++ b/targets/ath79-nand
@@ -6,6 +6,8 @@ local ATH10K_PACKAGES_QCA9887 = {
 	'-ath10k-firmware-qca9887-ct',
 }
 
+local ATH10K_PACKAGES_QCA9888 = {}
+
 
 -- GL.iNet
 
@@ -30,3 +32,11 @@ device('netgear-wndr3700-v4', 'netgear_wndr3700-v4', {
 		'netgear-wndr3700v4', -- Upgrade from OpenWrt 19.07
 	},
 })
+
+
+-- ZTE
+
+device('zte-mf281', 'zte_mf281', {
+	broken = true,
+	packages = ATH10K_PACKAGES_QCA9888,
+})

From 8a2fdc502a61faab05593fc6f4d1009f5acd4f5f Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Mon, 12 Sep 2022 02:44:30 +0200
Subject: [PATCH 2/3] rockchip-armv8: add support for NanoPi R4S (#2633)

(cherry picked from commit dd30a6e65825697c2f339fb6f23fd6401499847d)
---
 docs/user/supported_devices.rst                             | 1 +
 package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac | 1 +
 targets/rockchip-armv8                                      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
index 3d698335..956d5ebc 100644
--- a/docs/user/supported_devices.rst
+++ b/docs/user/supported_devices.rst
@@ -416,6 +416,7 @@ rockchip-armv8
 * FriendlyElec
 
   - NanoPi R2S
+  - NanoPi R4S (4GB LPDDR4)
 
 sunxi-cortexa7
 --------------
diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
index 5ee492ac..597201f3 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
@@ -102,6 +102,7 @@ local primary_addrs = {
 		}},
 		{'rockchip', 'armv8', {
 			'friendlyarm,nanopi-r2s',
+			'friendlyarm,nanopi-r4s',
 		}},
 		{'x86'},
 	}},
diff --git a/targets/rockchip-armv8 b/targets/rockchip-armv8
index 4cd79033..17d5bd41 100644
--- a/targets/rockchip-armv8
+++ b/targets/rockchip-armv8
@@ -4,3 +4,4 @@ defaults {
 }
 
 device('friendlyelec-nanopi-r2s', 'friendlyarm_nanopi-r2s')
+device('friendlyelec-nanopi-r4s', 'friendlyarm_nanopi-r4s') -- 4GB LPDDR4

From 411f6c38595743147c6f436470a69fcc43ceda20 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Mon, 12 Sep 2022 02:45:01 +0200
Subject: [PATCH 3/3] ipq40xx-generic: add suppot for GL.iNet GL-AP1300 (#2635)

(cherry picked from commit 3ab8007a1e927cc51387e09c244aa573118e5576)
---
 docs/user/supported_devices.rst | 1 +
 targets/ipq40xx-generic         | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
index 956d5ebc..bd7ed532 100644
--- a/docs/user/supported_devices.rst
+++ b/docs/user/supported_devices.rst
@@ -185,6 +185,7 @@ ipq40xx-generic
 
 * GL.iNet
 
+  - GL-AP1300
   - GL-B1300
 
 * Linksys
diff --git a/targets/ipq40xx-generic b/targets/ipq40xx-generic
index 10464d00..ec5d6b70 100644
--- a/targets/ipq40xx-generic
+++ b/targets/ipq40xx-generic
@@ -56,6 +56,13 @@ device('engenius-ens620ext', 'engenius_ens620ext', {
 
 -- GL.iNet
 
+device('gl.inet-gl-ap1300', 'glinet_gl-ap1300', {
+	factory = '-squashfs-nand-factory',
+	factory_ext = '.ubi',
+	sysupgrade = '-squashfs-nand-sysupgrade',
+	sysupgrade_ext = '.bin',
+})
+
 device('gl.inet-gl-b1300', 'glinet_gl-b1300', {
 	factory = false,
 })