Revert "ar71xx: migrate led and network setup to board detection framework"
authorJo-Philipp Wich <jow@openwrt.org>
Wed, 25 Nov 2015 11:53:59 +0000 (11:53 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Wed, 25 Nov 2015 11:53:59 +0000 (11:53 +0000)
The board detect code needs more fixes in order to work properly.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47641 3c298f89-4303-0410-b956-a3cf2f4a3e73

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

old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from target/linux/ar71xx/base-files/etc/board.d/01_leds
rename to target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index 244700f..816ca42
@@ -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
old mode 100755 (executable)
new mode 100644 (file)
similarity index 98%
rename from target/linux/ar71xx/base-files/etc/board.d/02_network
rename to target/linux/ar71xx/base-files/etc/uci-defaults/02_network
index 68e0caa..8807114
@@ -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