From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 16 Apr 2015 12:18:34 +0000 (+0000)
Subject: bcm53xx: make use of the new board detection layer
X-Git-Tag: reboot~3279
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c64fdadea7292bf117668bfe5d254f7c6eeeb62e;p=openwrt%2Fstaging%2Fnoltari.git

bcm53xx: make use of the new board detection layer

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 45458
---

diff --git a/target/linux/bcm53xx/base-files/etc/board.d/02_network b/target/linux/bcm53xx/base-files/etc/board.d/02_network
new file mode 100755
index 0000000000..c36b47ca4d
--- /dev/null
+++ b/target/linux/bcm53xx/base-files/etc/board.d/02_network
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+
+. /lib/functions/uci-defaults-new.sh
+
+board_config_update
+
+ucidef_set_interface_loopback
+
+ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+ucidef_add_switch "switch0" "1" "1"
+
+vlan1ports="$(nvram get vlan1ports)"
+vlan2ports="$(nvram get vlan2ports)"
+if echo "$vlan1ports" | egrep -q "^1 2 3 4 5" && \
+   echo "$vlan2ports" | egrep -q "^0 5"; then
+	ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t"
+	ucidef_add_switch_vlan "switch0" "2" "0 5t"
+elif echo "$vlan1ports" | egrep -q "^0 1 2 3 5 7 8" && \
+     echo "$vlan2ports" | egrep -q "^4 8"; then
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5 7 8t"
+	ucidef_add_switch_vlan "switch0" "2" "4 8t"
+else
+	# This also handles some funcy (e.g. R6250) configs like:
+	# vlan1ports=3 2 1 0 5*
+	# vlan2ports=4 5u
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
+	ucidef_add_switch_vlan "switch0" "2" "4 5t"
+fi
+
+board_config_flush
+
+exit 0
diff --git a/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network b/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network
deleted file mode 100644
index 9ffb427d1c..0000000000
--- a/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-
-[ -e /etc/config/network ] && exit 0
-
-touch /etc/config/network
-
-. /lib/functions/uci-defaults.sh
-
-ucidef_set_interface_loopback
-
-ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-ucidef_add_switch "switch0" "1" "1"
-
-vlan1ports="$(nvram get vlan1ports)"
-vlan2ports="$(nvram get vlan2ports)"
-if echo "$vlan1ports" | egrep -q "^1 2 3 4 5" && \
-   echo "$vlan2ports" | egrep -q "^0 5"; then
-	ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t"
-	ucidef_add_switch_vlan "switch0" "2" "0 5t"
-elif echo "$vlan1ports" | egrep -q "^0 1 2 3 5 7 8" && \
-     echo "$vlan2ports" | egrep -q "^4 8"; then
-	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5 7 8t"
-	ucidef_add_switch_vlan "switch0" "2" "4 8t"
-else
-	# This also handles some funcy (e.g. R6250) configs like:
-	# vlan1ports=3 2 1 0 5*
-	# vlan2ports=4 5u
-	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
-	ucidef_add_switch_vlan "switch0" "2" "4 5t"
-fi
-
-uci commit network
-
-exit 0