From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 3 Dec 2015 23:07:20 +0000 (+0000)
Subject: imx6: switch from uci-defaults to board.d
X-Git-Tag: reboot~1323
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7cf1ff8a751eaa3b389e491fd874faca755037ba;p=openwrt%2Fstaging%2Fblogic.git

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
index 000000000000..ec07709e0cb7
--- /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/board.d/02_network b/target/linux/imx6/base-files/etc/board.d/02_network
new file mode 100755
index 000000000000..d4aac5acc56e
--- /dev/null
+++ b/target/linux/imx6/base-files/etc/board.d/02_network
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# Copyright (C) 2013-2015 OpenWrt.org
+#
+
+. /lib/functions/uci-defaults-new.sh
+. /lib/imx6.sh
+
+board=$(imx6_board_name)
+
+board_config_update
+
+case "$board" in
+*gw51xx |\
+*gw52xx)
+	ucidef_set_interface_lan 'eth0'
+	;;
+*gw53xx |\
+*gw54xx |\
+*gw552x)
+	ucidef_set_interfaces_lan_wan 'eth0' 'eth1'
+	;;
+*wandboard)
+	ucidef_set_interface_wan 'eth0'
+	;;
+esac
+
+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/uci-defaults/02_network
deleted file mode 100644
index bf830632e071..000000000000
--- a/target/linux/imx6/base-files/etc/uci-defaults/02_network
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2013 OpenWrt.org
-#
-
-[ -e /etc/config/network ] && exit 0
-
-touch /etc/config/network
-
-. /lib/functions/uci-defaults.sh
-. /lib/imx6.sh
-
-board=$(imx6_board_name)
-
-ucidef_set_interface_loopback
-
-case "$board" in
-*gw51xx |\
-*gw52xx)
-	ucidef_set_interface_lan 'eth0'
-	;;
-*gw53xx |\
-*gw54xx |\
-*gw552x)
-	ucidef_set_interfaces_lan_wan 'eth0' 'eth1'
-	;;
-*wandboard)
-	ucidef_set_interface_wan 'eth0'
-	;;
-esac
-
-uci commit network
-
-exit 0