From: Paul Wassi <p.wassi@gmx.at>
Date: Fri, 28 Oct 2016 18:22:22 +0000 (+0200)
Subject: mvebu: simplify etc/board.d/02_network
X-Git-Tag: v17.01.0-rc1~89
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9641ceea0ce68d1c507b9d2bbe7cf8da518a2eb8;p=oweals%2Fopenwrt.git

mvebu: simplify etc/board.d/02_network

Unify switch configuration on Linksys WRTxx00AC series.
LAN = eth0, WAN = eth1

Signed-off-by: Paul Wassi <p.wassi@gmx.at>
[Álvaro]: also change WAN LEDs
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---

diff --git a/target/linux/mvebu/base-files/etc/board.d/01_leds b/target/linux/mvebu/base-files/etc/board.d/01_leds
index 441dd04bfa..d6e42ddfd5 100755
--- a/target/linux/mvebu/base-files/etc/board.d/01_leds
+++ b/target/linux/mvebu/base-files/etc/board.d/01_leds
@@ -13,22 +13,22 @@ board=$(mvebu_board_name)
 
 case "$board" in
 armada-385-linksys-caiman)
-	ucidef_set_led_netdev "wan" "WAN" "pca963x:caiman:white:wan" "eth0"
+	ucidef_set_led_netdev "wan" "WAN" "pca963x:caiman:white:wan" "eth1"
 	ucidef_set_led_usbdev "usb2" "USB2" "pca963x:caiman:white:usb2" "1-1"
 	ucidef_set_led_usbdev "usb3" "USB3" "pca963x:caiman:white:usb3_1" "3-1"
 	;;
 armada-385-linksys-cobra)
-	ucidef_set_led_netdev "wan" "WAN" "pca963x:cobra:white:wan" "eth0"
+	ucidef_set_led_netdev "wan" "WAN" "pca963x:cobra:white:wan" "eth1"
 	ucidef_set_led_usbdev "usb2" "USB2" "pca963x:cobra:white:usb2" "1-1"
 	ucidef_set_led_usbdev "usb3" "USB3" "pca963x:cobra:white:usb3_1" "3-1"
 	;;
 armada-385-linksys-rango)
-	ucidef_set_led_netdev "wan" "WAN" "pca963x:rango:white:wan" "eth0"
+	ucidef_set_led_netdev "wan" "WAN" "pca963x:rango:white:wan" "eth1"
 	ucidef_set_led_usbdev "usb2" "USB2" "pca963x:rango:white:usb2" "1-1"
 	ucidef_set_led_usbdev "usb3" "USB3" "pca963x:rango:white:usb3_1" "3-1"
 	;;
 armada-385-linksys-shelby)
-	ucidef_set_led_netdev "wan" "WAN" "pca963x:shelby:white:wan" "eth0"
+	ucidef_set_led_netdev "wan" "WAN" "pca963x:shelby:white:wan" "eth1"
 	ucidef_set_led_usbdev "usb2" "USB2" "pca963x:shelby:white:usb2" "1-1"
 	ucidef_set_led_usbdev "usb3" "USB3" "pca963x:shelby:white:usb3_1" "3-1"
 	;;
diff --git a/target/linux/mvebu/base-files/etc/board.d/02_network b/target/linux/mvebu/base-files/etc/board.d/02_network
index 614a0e2887..f4a87efc91 100755
--- a/target/linux/mvebu/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/base-files/etc/board.d/02_network
@@ -15,11 +15,7 @@ case "$board" in
 armada-385-linksys-caiman|\
 armada-385-linksys-cobra|\
 armada-385-linksys-rango|\
-armada-385-linksys-shelby)
-	ucidef_set_interfaces_lan_wan "eth1" "eth0"
-	ucidef_add_switch "switch0" \
-		"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "6@eth1" "4:wan" "5@eth0"
-	;;
+armada-385-linksys-shelby|\
 armada-xp-linksys-mamba)
 	ucidef_set_interfaces_lan_wan "eth0" "eth1"
 	ucidef_add_switch "switch0" \