From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 4 Dec 2015 15:02:13 +0000 (+0000)
Subject: mcs814x: switch from uci-defaults to board.d
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ba8a44995fe321bfc57a61fdb2a82cabd7605e94;p=openwrt%2Fstaging%2Fnbd.git

mcs814x: switch from uci-defaults to board.d

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 47761
---

diff --git a/target/linux/mcs814x/base-files/etc/board.d/01_leds b/target/linux/mcs814x/base-files/etc/board.d/01_leds
new file mode 100755
index 0000000000..3b1de4ae9b
--- /dev/null
+++ b/target/linux/mcs814x/base-files/etc/board.d/01_leds
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# Copyright (C) 2012-2015 OpenWrt.org
+#
+
+. /lib/functions/uci-defaults-new.sh
+. /lib/mcs814x.sh
+
+board_config_update
+
+board=$(mcs814x_board_name)
+
+case "$board" in
+dlan-usb-extender)
+	ucidef_set_led_usbdev "usb" "USB" "dlan-usb-extender:green:usb" "2-1"
+	;;
+rbt-832)
+	ucidef_set_led_usbdev "usb1" "USB1" "rbt-832:red:usb0" "1-1"
+	ucidef_set_led_usbdev "usb2" "USB2" "rbt-832:red:usb1" "1-2"
+	ucidef_set_led_usbdev "usb3" "USB3" "rbt-832:red:usb2" "1-3"
+	ucidef_set_led_usbdev "usb4" "USB4" "rbt-832:red:usb3" "1-4"
+	ucidef_set_led_netdev "eth" "eth" "rbt-832:red:ethernet" "eth0"
+	;;
+esac
+
+board_config_flush
+
+exit 0
diff --git a/target/linux/mcs814x/base-files/etc/board.d/02_network b/target/linux/mcs814x/base-files/etc/board.d/02_network
new file mode 100755
index 0000000000..a447923f42
--- /dev/null
+++ b/target/linux/mcs814x/base-files/etc/board.d/02_network
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+
+. /lib/functions/uci-defaults-new.sh
+
+board_config_update
+ucidef_set_interface_lan "eth0"
+board_config_flush
+
+exit 0
diff --git a/target/linux/mcs814x/base-files/etc/config/network b/target/linux/mcs814x/base-files/etc/config/network
deleted file mode 100644
index cec7b2525c..0000000000
--- a/target/linux/mcs814x/base-files/etc/config/network
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2012 OpenWrt.org
-
-config interface loopback
-	option ifname	lo
-	option proto	static
-	option ipaddr	127.0.0.1
-	option netmask	255.0.0.0
-
-config interface lan
-	option ifname	eth0
-	option proto	static
-	option ipaddr	192.168.1.1
-	option netmask	255.255.255.0
-	option ip6assign 60
-
-config interface wan6
-	option ifname   eth0
-	option proto    dhcpv6
-
-config globals globals
-	option ula_prefix auto
diff --git a/target/linux/mcs814x/base-files/etc/uci-defaults/01_leds b/target/linux/mcs814x/base-files/etc/uci-defaults/01_leds
deleted file mode 100644
index 0c6972d8be..0000000000
--- a/target/linux/mcs814x/base-files/etc/uci-defaults/01_leds
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2012 OpenWrt.org
-#
-
-. /lib/functions/uci-defaults.sh
-. /lib/mcs814x.sh
-
-board=$(mcs814x_board_name)
-
-case "$board" in
-dlan-usb-extender)
-	ucidef_set_led_usbdev "usb" "USB" "dlan-usb-extender:green:usb" "2-1"
-	;;
-rbt-832)
-	ucidef_set_led_usbdev "usb1" "USB1" "rbt-832:red:usb0" "1-1"
-	ucidef_set_led_usbdev "usb2" "USB2" "rbt-832:red:usb1" "1-2"
-	ucidef_set_led_usbdev "usb3" "USB3" "rbt-832:red:usb2" "1-3"
-	ucidef_set_led_usbdev "usb4" "USB4" "rbt-832:red:usb3" "1-4"
-	ucidef_set_led_netdev "eth" "eth" "rbt-832:red:ethernet" "eth0"
-	;;
-esac
-
-ucidef_commit_leds
-
-exit 0