aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-11-25 11:53:59 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-11-25 11:53:59 +0000
commit3fac6dde85cf00b5e4815438062d3710efb18105 (patch)
tree60f8abf616164f41e5418dbba3c643a4e32f40b4
parent7b4acdeff64505a5d1d65806c7d13247fb9bcc85 (diff)
downloadupstream-3fac6dde85cf00b5e4815438062d3710efb18105.tar.gz
upstream-3fac6dde85cf00b5e4815438062d3710efb18105.tar.bz2
upstream-3fac6dde85cf00b5e4815438062d3710efb18105.zip
Revert "ar71xx: migrate led and network setup to board detection framework"
The board detect code needs more fixes in order to work properly. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 47641
-rw-r--r--[-rwxr-xr-x]target/linux/ar71xx/base-files/etc/uci-defaults/01_leds (renamed from target/linux/ar71xx/base-files/etc/board.d/01_leds)8
-rw-r--r--[-rwxr-xr-x]target/linux/ar71xx/base-files/etc/uci-defaults/02_network (renamed from target/linux/ar71xx/base-files/etc/board.d/02_network)13
2 files changed, 10 insertions, 11 deletions
diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index 244700fd8c..816ca42d69 100755..100644
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -1,13 +1,11 @@
#!/bin/sh
#
-# Copyright (C) 2011-2015 OpenWrt.org
+# Copyright (C) 2011 OpenWrt.org
#
-. /lib/functions/uci-defaults-new.sh
+. /lib/functions/uci-defaults.sh
. /lib/ar71xx.sh
-board_config_update
-
board=$(ar71xx_board_name)
case "$board" in
@@ -669,6 +667,6 @@ zcn-1523h-5)
;;
esac
-board_config_flush
+ucidef_commit_leds
exit 0
diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
index 68e0caaa62..88071146a7 100755..100644
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -1,18 +1,19 @@
#!/bin/sh
#
-# Copyright (C) 2011-2015 OpenWrt.org
+# Copyright (C) 2011 OpenWrt.org
#
-. /lib/functions/uci-defaults-new.sh
-. /lib/ar71xx.sh
+[ -e /etc/config/network ] && exit 0
+
+touch /etc/config/network
-board_config_update
+. /lib/functions/uci-defaults.sh
+. /lib/ar71xx.sh
ucidef_set_interface_loopback
board=$(ar71xx_board_name)
-
case "$board" in
all0315n |\
all0258n |\
@@ -536,6 +537,6 @@ wndr3700)
;;
esac
-board_config_flush
+uci commit network
exit 0