aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6
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
commit6c8d95ea6d63164c78021ccecb4206eaf3ffbf3e (patch)
treefe2a4bc6f83d63082e56ea9a0501470d4681e4e5 /target/linux/imx6
parentd6abb4c981bb981ab4fab632c80268dfdcc2ea76 (diff)
downloadmaster-187ad058-6c8d95ea6d63164c78021ccecb4206eaf3ffbf3e.tar.gz
master-187ad058-6c8d95ea6d63164c78021ccecb4206eaf3ffbf3e.tar.bz2
master-187ad058-6c8d95ea6d63164c78021ccecb4206eaf3ffbf3e.zip
imx6: switch from uci-defaults to board.d
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47738 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/imx6')
-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