From 601c97212893aa439ebdb25fda8cbf4c123124c5 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 12 Aug 2022 02:38:46 +0000 Subject: [PATCH] rockchip: reorder r66s/p2 eth ports --- .../armv8/base-files/etc/board.d/02_network | 8 +++++--- .../armv8/base-files/lib/preinit/04_reorder_eth | 13 ------------- 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 target/linux/rockchip/armv8/base-files/lib/preinit/04_reorder_eth 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 ecf4348fe..16530cea3 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 @@ -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/lib/preinit/04_reorder_eth b/target/linux/rockchip/armv8/base-files/lib/preinit/04_reorder_eth deleted file mode 100644 index e4576fd92..000000000 --- a/target/linux/rockchip/armv8/base-files/lib/preinit/04_reorder_eth +++ /dev/null @@ -1,13 +0,0 @@ -. /lib/functions.sh - -preinit_reorder_eth() { - case $(board_name) in - firefly,rk3568-roc-pc) - ip link set eth0 name ethtmp - ip link set eth1 name eth0 - ip link set ethtmp name eth1 - ;; - esac -} - -boot_hook_add preinit_main preinit_reorder_eth