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

* https://github.com/coolsnowwolf/lede: rockchip: drop all ugly phy hack code rockchip: add Radxa ROCK3 Model A dummy dts for build (coolsnowwolf#9972) rockchip:supplement r5s missing symbols (coolsnowwolf#9975)
Azerz · Aug 21, 2022 · 31f0095 · 31f0095
2 parents 2ac18ec + 89cea59
commit 31f0095
Show file tree

Hide file tree

Showing 16 changed files with 626 additions and 5,371 deletions.
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
@@ -48,7 +48,7 @@ firefly,rk3568-roc-pc)
 	set_interface_core 2 "eth0"
 	set_interface_core 4 "eth1"
 	;;
-friendlyelec,nanopi-r5s
+friendlyelec,nanopi-r5s)
 	set_interface_core 0 "eth0"
 	set_interface_core 2 "eth1"
 	set_interface_core 4 "eth2"

diff --git a/target/linux/rockchip/armv8/config-5.10 b/target/linux/rockchip/armv8/config-5.10
@@ -318,7 +318,6 @@ CONFIG_IRQ_WORK=y
 CONFIG_JBD2=y
 CONFIG_JFFS2_ZLIB=y
 CONFIG_JUMP_LABEL=y
-CONFIG_JLSEMI_JL2XX1_PHY=y
 CONFIG_KALLSYMS=y
 CONFIG_KEXEC_CORE=y
 CONFIG_KEXEC_FILE=y

diff --git a/target/linux/rockchip/armv8/config-5.15 b/target/linux/rockchip/armv8/config-5.15
@@ -329,7 +329,6 @@ CONFIG_IRQ_WORK=y
 CONFIG_JBD2=y
 CONFIG_JFFS2_ZLIB=y
 CONFIG_JUMP_LABEL=y
-CONFIG_JLSEMI_JL2XX1_PHY=y
 CONFIG_KALLSYMS=y
 CONFIG_KEXEC_CORE=y
 CONFIG_KEXEC_FILE=y

diff --git a/target/linux/rockchip/armv8/config-5.4 b/target/linux/rockchip/armv8/config-5.4
@@ -304,7 +304,6 @@ CONFIG_IRQ_WORK=y
 CONFIG_JBD2=y
 CONFIG_JFFS2_ZLIB=y
 CONFIG_JUMP_LABEL=y
-CONFIG_JLSEMI_JL2XX1_PHY=y
 CONFIG_KALLSYMS=y
 CONFIG_KEXEC_CORE=y
 CONFIG_KEXEC_FILE=y