aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-11-30 10:43:31 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-11-30 10:43:31 +0000
commitfff1a8218099a95ebee2042708c1ec8805bede7d (patch)
tree4281792c0f6c44d2a6eccfefce24db7f94d18078 /target
parentb64f953cd8776d7bbcca085865f63c7ace473e48 (diff)
downloadupstream-fff1a8218099a95ebee2042708c1ec8805bede7d.tar.gz
upstream-fff1a8218099a95ebee2042708c1ec8805bede7d.tar.bz2
upstream-fff1a8218099a95ebee2042708c1ec8805bede7d.zip
mvebu: switch network and led config defaults to board detection framework
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 47674
Diffstat (limited to 'target')
-rwxr-xr-xtarget/linux/mvebu/base-files/etc/board.d/00_model13
-rwxr-xr-x[-rw-r--r--]target/linux/mvebu/base-files/etc/board.d/01_leds (renamed from target/linux/mvebu/base-files/etc/uci-defaults/01_leds)8
-rwxr-xr-x[-rw-r--r--]target/linux/mvebu/base-files/etc/board.d/02_network (renamed from target/linux/mvebu/base-files/etc/uci-defaults/02_network)14
3 files changed, 24 insertions, 11 deletions
diff --git a/target/linux/mvebu/base-files/etc/board.d/00_model b/target/linux/mvebu/base-files/etc/board.d/00_model
new file mode 100755
index 0000000000..ec07709e0c
--- /dev/null
+++ b/target/linux/mvebu/base-files/etc/board.d/00_model
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Copyright (C) 2015 OpenWrt.org
+
+. /lib/functions/uci-defaults-new.sh
+
+board_config_update
+
+ucidef_set_board_id "$(cat /tmp/sysinfo/board_name)"
+ucidef_set_model_name "$(cat /tmp/sysinfo/model)"
+
+board_config_flush
+
+exit 0
diff --git a/target/linux/mvebu/base-files/etc/uci-defaults/01_leds b/target/linux/mvebu/base-files/etc/board.d/01_leds
index 612f949da4..eb245d85ae 100644..100755
--- a/target/linux/mvebu/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/mvebu/base-files/etc/board.d/01_leds
@@ -1,11 +1,13 @@
#!/bin/sh
#
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
#
-. /lib/functions/uci-defaults.sh
+. /lib/functions/uci-defaults-new.sh
. /lib/mvebu.sh
+board_config_update
+
board=$(mvebu_board_name)
case "$board" in
@@ -32,6 +34,6 @@ armada-xp-linksys-mamba)
esac
-ucidef_commit_leds
+board_config_flush
exit 0
diff --git a/target/linux/mvebu/base-files/etc/uci-defaults/02_network b/target/linux/mvebu/base-files/etc/board.d/02_network
index d1da59fb48..b07091d74f 100644..100755
--- a/target/linux/mvebu/base-files/etc/uci-defaults/02_network
+++ b/target/linux/mvebu/base-files/etc/board.d/02_network
@@ -3,13 +3,11 @@
# Copyright (C) 2014-2015 OpenWrt.org
#
-[ -e /etc/config/network ] && exit 0
-
-touch /etc/config/network
-
-. /lib/functions/uci-defaults.sh
+. /lib/functions/uci-defaults-new.sh
. /lib/mvebu.sh
+board_config_update
+
ucidef_set_interface_loopback
board=$(mvebu_board_name)
@@ -27,8 +25,8 @@ armada-385-linksys-shelby)
armada-xp-linksys-mamba)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5"
- ucidef_add_switch_vlan "switch0" "2" "4 6"
+ ucidef_add_switch_ports "switch0" \
+ "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth0" "4:wan" "6@eth1"
;;
armada-385-db-ap)
ucidef_set_interfaces_lan_wan "eth0 eth1" "eth2"
@@ -41,6 +39,6 @@ armada-xp-gp)
;;
esac
-uci commit network
+board_config_flush
exit 0