From a8c2a719fa6b5bcc5c3d796a7603c115a73d2c64 Mon Sep 17 00:00:00 2001
From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Sun, 5 Mar 2017 21:16:06 +0100
Subject: [PATCH] brcm2708: order boards and models alphabetically

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---
 .../base-files/etc/board.d/02_network         |  7 ++++---
 target/linux/brcm2708/base-files/etc/diag.sh  |  9 ++++----
 .../linux/brcm2708/base-files/lib/brcm2708.sh | 21 ++++++++++---------
 .../lib/preinit/05_set_preinit_iface_brcm2708 |  7 ++++---
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/target/linux/brcm2708/base-files/etc/board.d/02_network b/target/linux/brcm2708/base-files/etc/board.d/02_network
index 7642c06c49..21e86f4db3 100755
--- a/target/linux/brcm2708/base-files/etc/board.d/02_network
+++ b/target/linux/brcm2708/base-files/etc/board.d/02_network
@@ -1,5 +1,6 @@
 #!/bin/sh
 # Copyright (C) 2014-2016 OpenWrt.org
+# Copyright (C) 2017 LEDE project
 
 . /lib/functions/uci-defaults.sh
 . /lib/brcm2708.sh
@@ -11,10 +12,10 @@ board_config_update
 board=$(brcm2708_board_name)
 
 case "$board" in
-rpi-b |\
-rpi-b-plus |\
 rpi-2-b |\
-rpi-3-b)
+rpi-3-b |\
+rpi-b |\
+rpi-b-plus)
 	ucidef_set_interface_lan "eth0"
 	;;
 esac
diff --git a/target/linux/brcm2708/base-files/etc/diag.sh b/target/linux/brcm2708/base-files/etc/diag.sh
index ecc6242d73..010a623d1e 100644
--- a/target/linux/brcm2708/base-files/etc/diag.sh
+++ b/target/linux/brcm2708/base-files/etc/diag.sh
@@ -1,20 +1,21 @@
 #!/bin/sh
 # Copyright (C) 2015-2016 OpenWrt.org
+# Copyright (C) 2017 LEDE project
 
 . /lib/functions/leds.sh
 . /lib/brcm2708.sh
 
 set_state() {
 	case "$(brcm2708_board_name)" in
+	rpi-2-b |\
+	rpi-b-plus)
+		status_led="led1"
+		;;
 	rpi-b |\
 	rpi-cm |\
 	rpi-zero)
 		status_led="led0"
 		;;
-	rpi-b-plus |\
-	rpi-2-b)
-		status_led="led1"
-		;;
 	esac
 
 	case "$1" in
diff --git a/target/linux/brcm2708/base-files/lib/brcm2708.sh b/target/linux/brcm2708/base-files/lib/brcm2708.sh
index ab7a23da96..cebec644c0 100644
--- a/target/linux/brcm2708/base-files/lib/brcm2708.sh
+++ b/target/linux/brcm2708/base-files/lib/brcm2708.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 # Copyright (C) 2015-2016 OpenWrt.org
+# Copyright (C) 2017 LEDE project
 
 ifname=""
 
@@ -8,25 +9,25 @@ brcm2708_detect() {
 
 	model=$(cat /proc/device-tree/model)
 	case "$model" in
-	"Raspberry Pi Model B Rev"*)
-		board_name="rpi-b"
+	"Raspberry Pi 2 Model B Rev"*)
+		board_name="rpi-2-b"
+		;;
+	"Raspberry Pi 3 Model B Rev"*)
+		board_name="rpi-3-b"
+		;;
+	"Raspberry Pi Compute Module Rev"*)
+		board_name="rpi-cm"
 		;;
 	"Raspberry Pi Model B Plus Rev"* |\
 	"Raspberry Pi Model B+ Rev"*)
 		board_name="rpi-b-plus"
 		;;
-	"Raspberry Pi Compute Module Rev"*)
-		board_name="rpi-cm"
+	"Raspberry Pi Model B Rev"*)
+		board_name="rpi-b"
 		;;
 	"Raspberry Pi Zero Rev"*)
 		board_name="rpi-zero"
 		;;
-	"Raspberry Pi 2 Model B Rev"*)
-		board_name="rpi-2-b"
-		;;
-	"Raspberry Pi 3 Model B Rev"*)
-		board_name="rpi-3-b"
-		;;
 	*)
 		board_name="unknown"
 		;;
diff --git a/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708 b/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
index 578172e1da..4401c875e4 100644
--- a/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
+++ b/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
@@ -1,14 +1,15 @@
 #!/bin/sh
 # Copyright (C) 2015-2016 OpenWrt.org
+# Copyright (C) 2017 LEDE project
 
 . /lib/brcm2708.sh
 
 set_preinit_iface() {
 	case "$(brcm2708_board_name)" in
-	rpi-b |\
-	rpi-b-plus |\
 	rpi-2-b |\
-	rpi-3-b)
+	rpi-3-b |\
+	rpi-b |\
+	rpi-b-plus)
 		ifname=eth0
 		;;
 	esac
-- 
2.30.2