Skip to content

Commit a8f6ddf

Browse files
github-actions[bot]github-actions[bot]
committed
[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)
2 parents 41a9f8b + 89cea59 commit a8f6ddf

16 files changed

+626
-5371
lines changed

‎target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ firefly,rk3568-roc-pc)
4848
set_interface_core 2 "eth0"
4949
set_interface_core 4 "eth1"
5050
;;
51-
friendlyelec,nanopi-r5s
51+
friendlyelec,nanopi-r5s)
5252
set_interface_core 0 "eth0"
5353
set_interface_core 2 "eth1"
5454
set_interface_core 4 "eth2"

‎target/linux/rockchip/armv8/config-5.10

-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ CONFIG_IRQ_WORK=y
318318
CONFIG_JBD2=y
319319
CONFIG_JFFS2_ZLIB=y
320320
CONFIG_JUMP_LABEL=y
321-
CONFIG_JLSEMI_JL2XX1_PHY=y
322321
CONFIG_KALLSYMS=y
323322
CONFIG_KEXEC_CORE=y
324323
CONFIG_KEXEC_FILE=y

‎target/linux/rockchip/armv8/config-5.15

-1
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@ CONFIG_IRQ_WORK=y
329329
CONFIG_JBD2=y
330330
CONFIG_JFFS2_ZLIB=y
331331
CONFIG_JUMP_LABEL=y
332-
CONFIG_JLSEMI_JL2XX1_PHY=y
333332
CONFIG_KALLSYMS=y
334333
CONFIG_KEXEC_CORE=y
335334
CONFIG_KEXEC_FILE=y

‎target/linux/rockchip/armv8/config-5.4

-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ CONFIG_IRQ_WORK=y
304304
CONFIG_JBD2=y
305305
CONFIG_JFFS2_ZLIB=y
306306
CONFIG_JUMP_LABEL=y
307-
CONFIG_JLSEMI_JL2XX1_PHY=y
308307
CONFIG_KALLSYMS=y
309308
CONFIG_KEXEC_CORE=y
310309
CONFIG_KEXEC_FILE=y

0 commit comments

Comments
 (0)