aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-11-22 20:52:10 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-11-22 20:52:10 +0000
commitfc64fd8712ba1cdde56e537906859bb63dad36d4 (patch)
tree47f0dbc0a53a08bd123f0571c975abe1c8f780f8 /target
parent7fc4a4581b49f01de77e5183383de3d8d4d8338d (diff)
downloadupstream-fc64fd8712ba1cdde56e537906859bb63dad36d4.tar.gz
upstream-fc64fd8712ba1cdde56e537906859bb63dad36d4.tar.bz2
upstream-fc64fd8712ba1cdde56e537906859bb63dad36d4.zip
Revert "mvebu: migrate led and network setup to board detection framework"
Roll back the mvebu conversion to board detection code as we need to fix some strcutural issues first. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 47597
Diffstat (limited to 'target')
-rw-r--r--[-rwxr-xr-x]target/linux/mvebu/base-files/etc/uci-defaults/01_leds (renamed from target/linux/mvebu/base-files/etc/board.d/01_leds)8
-rw-r--r--[-rwxr-xr-x]target/linux/mvebu/base-files/etc/uci-defaults/02_network (renamed from target/linux/mvebu/base-files/etc/board.d/02_network)10
2 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/mvebu/base-files/etc/board.d/01_leds b/target/linux/mvebu/base-files/etc/uci-defaults/01_leds
index eb245d85ae..612f949da4 100755..100644
--- a/target/linux/mvebu/base-files/etc/board.d/01_leds
+++ b/target/linux/mvebu/base-files/etc/uci-defaults/01_leds
@@ -1,13 +1,11 @@
#!/bin/sh
#
-# Copyright (C) 2014-2015 OpenWrt.org
+# Copyright (C) 2014 OpenWrt.org
#
-. /lib/functions/uci-defaults-new.sh
+. /lib/functions/uci-defaults.sh
. /lib/mvebu.sh
-board_config_update
-
board=$(mvebu_board_name)
case "$board" in
@@ -34,6 +32,6 @@ armada-xp-linksys-mamba)
esac
-board_config_flush
+ucidef_commit_leds
exit 0
diff --git a/target/linux/mvebu/base-files/etc/board.d/02_network b/target/linux/mvebu/base-files/etc/uci-defaults/02_network
index 803a4dc768..d1da59fb48 100755..100644
--- a/target/linux/mvebu/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/base-files/etc/uci-defaults/02_network
@@ -3,10 +3,12 @@
# Copyright (C) 2014-2015 OpenWrt.org
#
-. /lib/functions/uci-defaults-new.sh
-. /lib/mvebu.sh
+[ -e /etc/config/network ] && exit 0
+
+touch /etc/config/network
-board_config_update
+. /lib/functions/uci-defaults.sh
+. /lib/mvebu.sh
ucidef_set_interface_loopback
@@ -39,6 +41,6 @@ armada-xp-gp)
;;
esac
-board_config_flush
+uci commit network
exit 0