Browse Source

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 <[email protected]>

SVN-Revision: 47597
Jo-Philipp Wich 10 years ago
parent
commit
fc64fd8712

+ 3 - 5
target/linux/mvebu/base-files/etc/board.d/01_leds → 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

+ 6 - 4
target/linux/mvebu/base-files/etc/board.d/02_network → 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