From: Mathias Kresin <dev@kresin.me>
Date: Fri, 9 Sep 2016 18:57:58 +0000 (+0200)
Subject: ramips: board.d merge redundant switch/interface configs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0f6d0afa1391dfe74d790a9637b9bbbbaebeb2fb;p=openwrt%2Fstaging%2Frmilecki.git

ramips: board.d merge redundant switch/interface configs

Fix alphabetical order distortions as well.

Signed-off-by: Mathias Kresin <dev@kresin.me>
---

diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index e9df34524b5..772f5e10dea 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -94,9 +94,12 @@ ramips_setup_interfaces()
 	wsr-600|\
 	wt1520|\
 	y1|\
+	youku-yk1|\
+	zbt-ape522ii|\
+	zbt-we826|\
 	zbt-wg2626|\
 	zbt-wg3526|\
-	youku-yk1)
+	zbt-wr8305rt)
 		ucidef_add_switch "switch0" \
 			"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
 		;;
@@ -126,10 +129,10 @@ ramips_setup_interfaces()
 	gl-mt300n|\
 	gl-mt750|\
 	hg255d|\
-	mzk-wdpr|\
 	jhr-n805r|\
 	jhr-n825r|\
 	jhr-n926r|\
+	mzk-wdpr|\
 	rt-n14u|\
 	ubnt-erx|\
 	ur-326n4g|\
@@ -175,6 +178,7 @@ ramips_setup_interfaces()
 	mzk-ex750np|\
 	na930|\
 	wli-tx4-ag300n|\
+	wmr-300|\
 	wrh-300cr)
 		ucidef_set_interface_lan "eth0"
 		;;
@@ -197,9 +201,6 @@ ramips_setup_interfaces()
 	wl-330n)
 		ucidef_set_interface_lan "eth0.1"
 		;;
-	wmr-300)
-		ucidef_set_interface_lan "eth0"
-		;;
 	mzk-dp150n|\
 	vocore)
 		ucidef_add_switch "switch0" \
@@ -232,12 +233,6 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "0:wan" "6@eth0"
 		;;
-	zbt-ape522ii|\
-	zbt-we826|\
-	zbt-wr8305rt)
-		ucidef_add_switch "switch0" \
-			"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
-		;;
 	*)
 		RT3X5X=`cat /proc/cpuinfo | egrep "(RT3.5|RT5350)"`
 		if [ -n "${RT3X5X}" ]; then