From dd30a6e65825697c2f339fb6f23fd6401499847d 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] rockchip-armv8: add support for NanoPi R4S (#2633)

---
 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 3d698335d..956d5ebcc 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 5ee492ac7..597201f3a 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 4cd790334..17d5bd419 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
-- 
GitLab