Revert "mvebu: migrate led and network setup to board detection framework"
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 22 Nov 2015 20:52:10 +0000 (20:52 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 22 Nov 2015 20:52:10 +0000 (20:52 +0000)
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47597 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/mvebu/base-files/etc/uci-defaults/01_leds [moved from target/linux/mvebu/base-files/etc/board.d/01_leds with 89% similarity, mode: 0644]
target/linux/mvebu/base-files/etc/uci-defaults/02_network [moved from target/linux/mvebu/base-files/etc/board.d/02_network with 86% similarity, mode: 0644]

old mode 100755 (executable)
new mode 100644 (file)
similarity index 89%
rename from target/linux/mvebu/base-files/etc/board.d/01_leds
rename to target/linux/mvebu/base-files/etc/uci-defaults/01_leds
index eb245d8..612f949
@@ -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
old mode 100755 (executable)
new mode 100644 (file)
similarity index 86%
rename from target/linux/mvebu/base-files/etc/board.d/02_network
rename to target/linux/mvebu/base-files/etc/uci-defaults/02_network
index 803a4dc..d1da59f
@@ -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