imx6: switch from uci-defaults to board.d

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

diff --git a/target/linux/imx6/base-files/etc/board.d/00_model b/target/linux/imx6/base-files/etc/board.d/00_model
new file mode 100755 (executable)
index 0000000..ec07709
--- /dev/null
+++ b/target/linux/imx6/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/imx6/base-files/etc/uci-defaults/02_network b/target/linux/imx6/base-files/etc/board.d/02_network
old mode 100644 (file)
new mode 100755 (executable)
similarity index 60%
rename from target/linux/imx6/base-files/etc/uci-defaults/02_network
rename to target/linux/imx6/base-files/etc/board.d/02_network
index bf83063..d4aac5a
--- a/target/linux/imx6/base-files/etc/uci-defaults/02_network
+++ b/target/linux/imx6/base-files/etc/board.d/02_network
@@ -1,18 +1,14 @@
 #!/bin/sh
 #
-# Copyright (C) 2013 OpenWrt.org
+# Copyright (C) 2013-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/imx6.sh
 
 board=$(imx6_board_name)
 
-ucidef_set_interface_loopback
+board_config_update
 
 case "$board" in
 *gw51xx |\
@@ -29,6 +25,6 @@ case "$board" in
        ;;
 esac
 
-uci commit network
+board_config_flush
 
 exit 0