From: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
Date: Sun, 19 Apr 2020 07:36:04 +0000 (+0800)
Subject: mvebu: update default config for DSA
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f799c65946e147258fbea2ea18fae82ad567f7dc;p=openwrt%2Fstaging%2Fjow.git

mvebu: update default config for DSA

Update network/LED configuration for DSA driver.
sysupgrade from images prior to this commit with config preserved
will break the ethernet.

Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
---

diff --git a/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds b/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds
index a7762f0080..450bc1f32a 100755
--- a/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds
+++ b/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds
@@ -16,19 +16,19 @@ linksys,caiman|\
 linksys,cobra|\
 linksys,rango|\
 linksys,shelby)
-	ucidef_set_led_netdev "wan" "WAN" "pca963x:$boardname:white:wan" "eth1"
+	ucidef_set_led_netdev "wan" "WAN" "pca963x:$boardname:white:wan" "wan"
 	ucidef_set_led_usbport "usb1" "USB 1" "pca963x:$boardname:white:usb2" "usb1-port1"
 	ucidef_set_led_usbport "usb2" "USB 2" "pca963x:$boardname:white:usb3_1" "usb2-port1" "usb3-port1"
 	ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:$boardname:white:usb3_2" "usb3-port1"
 	;;
 linksys,mamba)
-	ucidef_set_led_netdev "wan" "WAN" "mamba:white:wan" "eth1"
+	ucidef_set_led_netdev "wan" "WAN" "mamba:white:wan" "wan"
 	ucidef_set_led_usbport "usb1" "USB 1" "mamba:white:usb2" "usb1-port1"
 	ucidef_set_led_usbport "usb2" "USB 2" "mamba:white:usb3_1" "usb2-port1" "usb3-port1"
 	ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "mamba:white:usb3_2" "usb3-port2"
 	;;
 linksys,venom)
-	ucidef_set_led_netdev "wan" "WAN" "pca963x:venom:blue:wan" "eth1"
+	ucidef_set_led_netdev "wan" "WAN" "pca963x:venom:blue:wan" "wan"
 	ucidef_set_led_usbport "usb1" "USB 1" "pca963x:venom:blue:usb2" "usb1-port1"
 	ucidef_set_led_usbport "usb2" "USB 2" "pca963x:venom:blue:usb3_1" "usb2-port1" "usb3-port1"
 	ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:venom:blue:usb3_2" "usb3-port1"
diff --git a/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network
index b10e1419b5..a2290ce532 100755
--- a/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network
@@ -21,9 +21,7 @@ linksys,mamba|\
 linksys,rango|\
 linksys,shelby|\
 linksys,venom)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth1.2"
-	ucidef_add_switch "switch0" \
-		"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth0" "4:wan" "6@eth1"
+	ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
 	;;
 marvell,a385-db-ap)
 	ucidef_set_interfaces_lan_wan "eth0 eth1" "eth2"
@@ -36,11 +34,7 @@ solidrun,clearfog-pro-a1)
 	# eth0 is standalone ethernet
 	# eth1 is switch
 	# eth2 is SFP
-	ucidef_set_interfaces_lan_wan "eth1" "eth0 eth2"
-
-	# switch port 5 is connected to eth1
-	ucidef_add_switch "switch0" \
-		"0:lan:5" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5u@eth1" "6:lan:6"
+	ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5 lan6" "eth0 eth2"
 	;;
 solidrun,clearfog-base-a1)
 	# eth0 is standalone ethernet