From 493507f3c90f7bbd58e19c9196c6a58aabdd0278 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Mon, 29 Feb 2016 20:36:28 +0100
Subject: [PATCH] Banana PRO leds corrections, default choose PRO model, added
 to armhwinfo

---
 config/bananapipro.fex | 5 +----
 configuration.sh       | 2 +-
 scripts/armhwinfo      | 3 +++
 scripts/firstrun       | 9 +++++++++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/config/bananapipro.fex b/config/bananapipro.fex
index 3bf50f461b..275521be59 100644
--- a/config/bananapipro.fex
+++ b/config/bananapipro.fex
@@ -971,11 +971,8 @@ switch_used = 0
 leds_used = 1
 leds_num = 2
 leds_pin_1 = port:PH24<1><default><default><0>
-leds_pin_2 = port:PG02<1><default><default><0>
 leds_name_1 = "green:ph24:led1"
-leds_name_2 = "blue:pg02:led2"
-leds_trigger_1 = "heartbeat"
-leds_trigger_2 = "mmc0"
+leds_trigger_1 = "mmc0"
 
 [ir_para]
 ir_used = 1
diff --git a/configuration.sh b/configuration.sh
index 97380073d4..dc9531427c 100644
--- a/configuration.sh
+++ b/configuration.sh
@@ -179,7 +179,7 @@ case $BOARD in
 		#build 6
 		LINUXFAMILY="sun7i"
 		BOOTCONFIG="Bananapi_defconfig"
-		MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp ap6211"
+		MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp #ap6211"
 		MODULES_NEXT="brcmfmac bonding"
 		DESKTOP_TARGET="trusty,%"
 	;;
diff --git a/scripts/armhwinfo b/scripts/armhwinfo
index bd05db902b..5c8212470f 100644
--- a/scripts/armhwinfo
+++ b/scripts/armhwinfo
@@ -39,6 +39,7 @@ TERMINUS=$(lsusb | grep "1a40:0101")
 SWITCH=$(grep "BCM53125" "${TMPFILE}")
 INTERUPT=$(grep "eth0" /proc/interrupts)
 WIFI8189ES=$(lsmod | grep 8189es | grep -v "0 $" | grep -v "0$") # ignore when not loaded
+WIFIAP6211=$(lsmod | grep ap6211)
 
 for i in $( lsblk -idn -o NAME ); do
     read ROTATE </sys/block/$i/queue/rotational
@@ -81,6 +82,8 @@ if [ "$ARCH" = "armv7l" ]; then
                 ID="Lamobo R1"
             elif [ "$LEDS" != "" ]; then
                 ID="Lime 2"
+			elif [ "$WIFIAP6211" != "" ]; then
+                ID="Banana PRO"            
             else
                 ID="Banana"
             fi
diff --git a/scripts/firstrun b/scripts/firstrun
index 1c1b302595..d25e07bbb6 100644
--- a/scripts/firstrun
+++ b/scripts/firstrun
@@ -94,6 +94,11 @@ display_alert() {
 	fi
 }
 
+autodetect_a20() {
+sleep 3
+MACHINE="$(tail -n1 /run/machine.id)"
+}
+
 autodetect_h3() {
 	# This function adjusts script.bin, hostname and cpufreq settings based on 
 	# /run/machine.id so that two OS images (one built for Orange Pi Plus and one
@@ -179,6 +184,10 @@ main() {
 		autodetect_h3
 	fi
 
+	if [ "X${HARDWARE}" = "Xsun7i" ]; then
+                autodetect_a20
+	fi
+	
 	update-rc.d -f firstrun remove >/dev/null 2>&1
 	sed -i 's/allow-hotplug\ eth0/auto eth0/' /etc/network/interfaces.default
 } # main