[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: rockchip: reorder r66s/p2 eth ports rockchip: add smp tune for fastrhino r66s kernel: bump 5.10 to 5.10.136 kernel: bump 5.15 to 5.15.60 ipq807x: add default packages about nss (coolsnowwolf#9920)
aosan002 · Aug 12, 2022 · 51b5ad6 · 51b5ad6
2 parents d4e121a + 601c972
commit 51b5ad6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 20 deletions.
diff --git a/include/kernel-5.10 b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .135
-LINUX_KERNEL_HASH-5.10.135 = e499a61be9ce670716dd27b5124bb9ef6c6bc0e8fab443abf717a77136543344
+LINUX_VERSION-5.10 = .136
+LINUX_KERNEL_HASH-5.10.136 = 1c099d0d59e7d9f671dfc947e16891b7a3a45efd7dfcc6b1e55a194961e45159
diff --git a/include/kernel-5.15 b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .59
-LINUX_KERNEL_HASH-5.15.59 = e6ddc642057340db06b3b921c2b31bfed2c611359e8f144c3e5cf9c3ac33bccb
+LINUX_VERSION-5.15 = .60
+LINUX_KERNEL_HASH-5.15.60 = 2d9545f7c96faffd8407522011b9533adefd1360118494dfb6c862f2f15e237a
diff --git a/target/linux/ipq807x/Makefile b/target/linux/ipq807x/Makefile
@@ -18,6 +18,7 @@ DEFAULT_PACKAGES += \
 	autocore-arm htop wpad-openssl zram-swap uboot-envtools \
 	kmod-qca-nss-dp kmod-qca-nss-drv-64 \
 	kmod-qca-nss-drv-pppoe-64 kmod-qca-nss-ecm-64 \
+	kmod-qca-nss-drv-bridge-mgr-64 kmod-qca-nss-drv-vlan-mgr-64 \
 	nss-firmware-ipq8074 luci-app-ipsec-vpnd \
 	luci-app-unblockmusic luci-app-zerotier
 

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
@@ -10,17 +10,19 @@ rockchip_setup_interfaces()
 	case "$board" in
 	embedfire,doornet1|\
 	embedfire,doornet2|\
-	fastrhino,r66s|\
 	friendlyarm,nanopi-r2c|\
 	friendlyarm,nanopi-r2s|\
 	friendlyarm,nanopi-r4s|\
 	friendlyarm,nanopi-r4se|\
 	sharevdi,guangmiao-g4c|\
 	xunlong,orangepi-r1-plus|\
-	xunlong,orangepi-r1-plus-lts|\
-	firefly,rk3568-roc-pc)
+	xunlong,orangepi-r1-plus-lts)
 		ucidef_set_interfaces_lan_wan 'eth1' 'eth0'
 		;;
+	fastrhino,r66s|\
+	firefly,rk3568-roc-pc)
+		ucidef_set_interfaces_lan_wan "eth0" "eth1"
+		;;
 	friendlyelec,nanopi-r5s)
 		ucidef_set_interfaces_lan_wan "eth1 eth2" "eth0"
 		;;

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
@@ -43,6 +43,7 @@ sharevdi,guangmiao-g4c)
 	set_interface_core 10 "eth0"
 	set_interface_core 20 "eth1"
 	;;
+fastrhino,r66s|\
 firefly,rk3568-roc-pc)
 	set_interface_core 2 "eth0"
 	set_interface_core 4 "eth1"

diff --git a/target/linux/rockchip/armv8/base-files/lib/preinit/04_reorder_eth b/target/linux/rockchip/armv8/base-files/lib/preinit/04_reorder_eth