From 83134525fd5f8fc361ecd66c23f9e20f7d71bfd4 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Thu, 27 Feb 2025 23:15:38 +0800
Subject: [PATCH] rockchip: sync base with upstream

Fixes: #13402
---
 .../armv8/base-files/etc/board.d/01_leds       |  1 +
 .../armv8/base-files/etc/board.d/02_network    | 14 ++++----------
 .../etc/hotplug.d/net/40-net-smp-affinity      | 18 +++++++++++-------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds b/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
index a4b2c52d6..b31382df4 100755
--- a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
+++ b/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
@@ -13,6 +13,7 @@ friendlyarm,nanopi-r2c|\
 friendlyarm,nanopi-r2c-plus|\
 friendlyarm,nanopi-r2s|\
 friendlyarm,nanopi-r2s-plus|\
+friendlyarm,nanopi-r4se|\
 friendlyarm,nanopi-r4s|\
 friendlyarm,nanopi-r6c|\
 sharevdi,guangmiao-g4c|\
diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
index 71526b9e0..81333d21c 100755
--- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
+++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
@@ -59,7 +59,7 @@ rockchip_setup_interfaces()
 		;;
 	hinlink,opc-h69k|\
 	friendlyarm,nanopi-r5s)
-		ucidef_set_interfaces_lan_wan "eth1 eth2" "eth0"
+		ucidef_set_interfaces_lan_wan 'eth1 eth2' 'eth0'
 		;;
 	lyt,t68m)
 		ucidef_set_interfaces_lan_wan 'lan2 lan3 lan4' 'lan1'
@@ -99,6 +99,7 @@ rockchip_setup_macs()
 	local label_mac=""
 
 	case "$board" in
+	armsom,sige*|\
 	advantech,rsb4810|\
 	ariaboard,photonicat|\
 	codinge,xiaobao-nas-v1|\
@@ -122,19 +123,12 @@ rockchip_setup_macs()
 	rumu3f,fine-3399|\
 	seewo,srcm3588-*|\
 	sharevdi,h3399pc|\
+	widora,mangopi-m28k|\
+	widora,mangopi-m28k-pro|\
 	xunlong,orangepi-5-plus)
 		wan_mac=$(macaddr_generate_from_mmc_cid mmcblk0)
 		lan_mac=$(macaddr_add "$wan_mac" +1)
 		;;
-	armsom,sige1|\
-	armsom,sige3|\
-	armsom,sige5|\
-	armsom,sige7|\
-	widora,mangopi-m28k|\
-	widora,mangopi-m28k-pro)
-		wan_mac=$(macaddr_generate_from_mmc_cid mmcblk2)
-		lan_mac=$(macaddr_add "$wan_mac" +1)
-		;;
 	friendlyarm,nanopi-r4s|\
 	friendlyarm,nanopi-r4se)
 		wan_mac=$(nanopi_r4s_get_mac wan)
diff --git a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
index 44a24c682..6ed5a87ab 100644
--- a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
+++ b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
@@ -39,12 +39,9 @@ widora,mangopi-m28k|\
 widora,mangopi-m28k-pro)
 	set_interface_core 4 "eth0"
 	;;
-friendlyarm,nanopc-t6|\
 friendlyarm,nanopi-r3s|\
 friendlyarm,nanopi-r5c|\
-friendlyarm,nanopi-r6c|\
-mmbox,anas3035|\
-xunlong,orangepi-5-plus)
+sinovoip,rk3568-bpi-r2pro)
 	set_interface_core 2 "eth0"
 	set_interface_core 4 "eth1"
 	;;
@@ -59,16 +56,23 @@ xunlong,orangepi-r1-plus-lts)
 	;;
 friendlyarm,nanopi-r4s|\
 friendlyarm,nanopi-r4se|\
-sharevdi,guangmiao-g4c)
+friendlyarm,nanopi-r6c|\
+friendlyarm,nanopc-t6|\
+sharevdi,guangmiao-g4c|\
+xunlong,orangepi-5-plus)
 	set_interface_core 10 "eth0"
 	set_interface_core 20 "eth1"
 	;;
-friendlyarm,nanopi-r5s|\
-friendlyarm,nanopi-r6s)
+friendlyarm,nanopi-r5s)
 	set_interface_core 2 "eth0"
 	set_interface_core 4 "eth1"
 	set_interface_core 8 "eth2"
 	;;
+friendlyarm,nanopi-r6s)
+	set_interface_core 10 "eth0"
+	set_interface_core 20 "eth1"
+	set_interface_core 40 "eth2"
+	;;
 widora,mangopi-m28c)
 	set_interface_core 4 "eth0"
 	set_interface_core 8 "xhci-hcd:usb1"