aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/base-files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-12-04 14:32:52 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-12-04 14:32:52 +0000
commitb6a9c5c40095701eeaf48819e047ba231a3f2748 (patch)
tree4a87aa89dd2d6a6e96aaa108882b1f056cdb05b0 /target/linux/sunxi/base-files
parentca00bd2be44037fa9acbb43b6b29e7f06eb855d9 (diff)
downloadupstream-b6a9c5c40095701eeaf48819e047ba231a3f2748.tar.gz
upstream-b6a9c5c40095701eeaf48819e047ba231a3f2748.tar.bz2
upstream-b6a9c5c40095701eeaf48819e047ba231a3f2748.zip
sunxi: switch from uci-defaults to board.d
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 47758
Diffstat (limited to 'target/linux/sunxi/base-files')
-rw-r--r--target/linux/sunxi/base-files/etc/board.d/02_network26
-rw-r--r--target/linux/sunxi/base-files/etc/uci-defaults/02_network32
2 files changed, 26 insertions, 32 deletions
diff --git a/target/linux/sunxi/base-files/etc/board.d/02_network b/target/linux/sunxi/base-files/etc/board.d/02_network
new file mode 100644
index 0000000000..59af55c7a1
--- /dev/null
+++ b/target/linux/sunxi/base-files/etc/board.d/02_network
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Copyright (C) 2013-2015 OpenWrt.org
+#
+
+. /lib/sunxi.sh
+. /lib/functions/uci-defaults-new.sh
+
+board_config_update
+
+case "$( sunxi_board_name )" in
+"olinuxino-micro"*)
+ ucidef_set_interface_lan 'wlan0'
+ ;;
+"lamobo-r1")
+ ucidef_add_switch "switch0" \
+ "4:lan:1" "0:lan:2" "1:lan:3" "2:lan:4" "3:wan" "8@eth0"
+ ;;
+*)
+ ucidef_set_interface_lan 'eth0'
+ ;;
+esac
+
+board_config_flush
+
+exit 0
diff --git a/target/linux/sunxi/base-files/etc/uci-defaults/02_network b/target/linux/sunxi/base-files/etc/uci-defaults/02_network
deleted file mode 100644
index 372fed9e26..0000000000
--- a/target/linux/sunxi/base-files/etc/uci-defaults/02_network
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2013-2014 OpenWrt.org
-#
-
-[ -e /etc/config/network ] && exit 0
-
-touch /etc/config/network
-
-. /lib/sunxi.sh
-. /lib/functions/uci-defaults.sh
-
-ucidef_set_interface_loopback
-
-case "$( sunxi_board_name )" in
-"olinuxino-micro"*)
- ucidef_set_interface_lan 'wlan0'
- ;;
-"lamobo-r1")
- ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_vlan "switch0" "1" "4 0 1 2 8t"
- ucidef_add_switch_vlan "switch0" "2" "3 8t"
- ;;
-*)
- ucidef_set_interface_lan 'eth0'
- ;;
-esac
-
-uci commit network
-
-exit 0