From e20b68924968014662e901f6cba64fa0f8199e74 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 20 Nov 2015 23:59:31 +0000
Subject: [PATCH] mvebu: migrate led and network setup to board detection
 framework

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 47541
---
 .../base-files/etc/{uci-defaults => board.d}/01_leds   |  8 +++++---
 .../etc/{uci-defaults => board.d}/02_network           | 10 ++++------
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename target/linux/mvebu/base-files/etc/{uci-defaults => board.d}/01_leds (89%)
 mode change 100644 => 100755
 rename target/linux/mvebu/base-files/etc/{uci-defaults => board.d}/02_network (86%)
 mode change 100644 => 100755

diff --git a/target/linux/mvebu/base-files/etc/uci-defaults/01_leds b/target/linux/mvebu/base-files/etc/board.d/01_leds
old mode 100644
new mode 100755
similarity index 89%
rename from target/linux/mvebu/base-files/etc/uci-defaults/01_leds
rename to target/linux/mvebu/base-files/etc/board.d/01_leds
index 612f949da4c..eb245d85ae9
--- a/target/linux/mvebu/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/mvebu/base-files/etc/board.d/01_leds
@@ -1,11 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
 #
 
-. /lib/functions/uci-defaults.sh
+. /lib/functions/uci-defaults-new.sh
 . /lib/mvebu.sh
 
+board_config_update
+
 board=$(mvebu_board_name)
 
 case "$board" in
@@ -32,6 +34,6 @@ armada-xp-linksys-mamba)
 
 esac
 
-ucidef_commit_leds
+board_config_flush
 
 exit 0
diff --git a/target/linux/mvebu/base-files/etc/uci-defaults/02_network b/target/linux/mvebu/base-files/etc/board.d/02_network
old mode 100644
new mode 100755
similarity index 86%
rename from target/linux/mvebu/base-files/etc/uci-defaults/02_network
rename to target/linux/mvebu/base-files/etc/board.d/02_network
index d1da59fb487..803a4dc768c
--- a/target/linux/mvebu/base-files/etc/uci-defaults/02_network
+++ b/target/linux/mvebu/base-files/etc/board.d/02_network
@@ -3,13 +3,11 @@
 # Copyright (C) 2014-2015 OpenWrt.org
 #
 
-[ -e /etc/config/network ] && exit 0
-
-touch /etc/config/network
-
-. /lib/functions/uci-defaults.sh
+. /lib/functions/uci-defaults-new.sh
 . /lib/mvebu.sh
 
+board_config_update
+
 ucidef_set_interface_loopback
 
 board=$(mvebu_board_name)
@@ -41,6 +39,6 @@ armada-xp-gp)
 	;;
 esac
 
-uci commit network
+board_config_flush
 
 exit 0
-- 
2.30.2