Merge branch 'master' of https://github.com/igorpecovnik/lib

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

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,%"
 	;;

scripts/armhwinfo

@@ -41,6 +41,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
@@ -83,6 +84,8 @@ if [ "$ARCH" = "armv7l" ]; then
                 ID="Lamobo R1"
             elif [ "$LEDS" != "" ]; then
                 ID="Lime 2"
+			elif [ "$WIFIAP6211" != "" ]; then
+                ID="Banana PRO"            
             else
                 ID="Banana"
             fi

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 GbE H3 devices like
@@ -200,6 +205,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