summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-12-03 23:07:20 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-12-03 23:07:20 +0000
commit7cf1ff8a751eaa3b389e491fd874faca755037ba (patch)
tree60573f6059d5917094abd9e24ae0bb16035e3ea4 /target/linux
parent57014a284f882d1d3ec8253ca5f0a7154a4a7b8e (diff)
downloadmaster-31e0f0ae-7cf1ff8a751eaa3b389e491fd874faca755037ba.tar.gz
master-31e0f0ae-7cf1ff8a751eaa3b389e491fd874faca755037ba.tar.bz2
master-31e0f0ae-7cf1ff8a751eaa3b389e491fd874faca755037ba.zip
imx6: switch from uci-defaults to board.d
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 47738
Diffstat (limited to 'target/linux')
-rwxr-xr-xtarget/linux/imx6/base-files/etc/board.d/00_model13
-rwxr-xr-x[-rw-r--r--]target/linux/imx6/base-files/etc/board.d/02_network (renamed from target/linux/imx6/base-files/etc/uci-defaults/02_network)12
2 files changed, 17 insertions, 8 deletions
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
index 0000000000..ec07709e0c
--- /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
index bf830632e0..d4aac5acc5 100644..100755
--- 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