From cd9d0ee0d0b56e5bec8d7bc594bdbd6180632b28 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Sun, 22 Nov 2015 08:04:37 +0000
Subject: brcm2708: add device detection and use it for network, leds and
 preinit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

SVN-Revision: 47572
---
 .../brcm2708/base-files/etc/board.d/02_network     | 25 ++++++++++++++++++++++
 target/linux/brcm2708/base-files/etc/diag.sh       | 12 ++++++++++-
 .../base-files/etc/uci-defaults/02_network         | 15 -------------
 3 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100755 target/linux/brcm2708/base-files/etc/board.d/02_network
 delete mode 100644 target/linux/brcm2708/base-files/etc/uci-defaults/02_network

(limited to 'target/linux/brcm2708/base-files/etc')

diff --git a/target/linux/brcm2708/base-files/etc/board.d/02_network b/target/linux/brcm2708/base-files/etc/board.d/02_network
new file mode 100755
index 0000000000..e85eb11f88
--- /dev/null
+++ b/target/linux/brcm2708/base-files/etc/board.d/02_network
@@ -0,0 +1,25 @@
+#!/bin/sh
+# Copyright (C) 2014-2015 OpenWrt.org
+
+. /lib/functions/uci-defaults-new.sh
+. /lib/brcm2708.sh
+. /lib/functions.sh
+. /lib/functions/system.sh
+
+board_config_update
+
+ucidef_set_interface_loopback
+
+board=$(brcm2708_board_name)
+
+case "$board" in
+rpi-b |\
+rpi-b-plus |\
+rpi-2-b)
+	ucidef_set_interface_lan "eth0"
+	;;
+esac
+
+board_config_flush
+
+exit 0
diff --git a/target/linux/brcm2708/base-files/etc/diag.sh b/target/linux/brcm2708/base-files/etc/diag.sh
index 55e68b1a00..3a8dc86112 100644
--- a/target/linux/brcm2708/base-files/etc/diag.sh
+++ b/target/linux/brcm2708/base-files/etc/diag.sh
@@ -4,9 +4,19 @@
 #
 
 . /lib/functions/leds.sh
+. /lib/brcm2708.sh
 
 set_state() {
-	status_led="led0"
+	case "$(brcm2708_board_name)" in
+	rpi-b |\
+	rpi-cm)
+		status_led="led0"
+		;;
+	rpi-b-plus |\
+	rpi-2-b)
+		status_led="led1"
+		;;
+	esac
 
 	case "$1" in
 	preinit)
diff --git a/target/linux/brcm2708/base-files/etc/uci-defaults/02_network b/target/linux/brcm2708/base-files/etc/uci-defaults/02_network
deleted file mode 100644
index e7e35c5226..0000000000
--- a/target/linux/brcm2708/base-files/etc/uci-defaults/02_network
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2014 OpenWrt.org
-
-[ -e /etc/config/network ] && exit 0
-
-touch /etc/config/network
-
-. /lib/functions/uci-defaults.sh
-
-ucidef_set_interface_loopback
-ucidef_set_interface_lan "eth0"
-
-uci commit network
-
-exit 0
-- 
cgit v1.2.3