Merge remote-tracking branch 'upstream/master'

config/linux-udoo-default.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.14.59 Kernel Configuration
+# Linux/arm 3.14.63 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_MIGHT_HAVE_PCI=y
@@ -1861,6 +1861,7 @@ CONFIG_SENSORS_MAX17135=y
 # CONFIG_PMBUS is not set
 # CONFIG_SENSORS_SHT15 is not set
 # CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SI70XX is not set
 # CONFIG_SENSORS_SMM665 is not set
 # CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_EMC1403 is not set
@@ -2805,7 +2806,7 @@ CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_RCAR_PHY=m
 # CONFIG_USB_ULPI is not set
-# CONFIG_USB_GADGET is not set
+CONFIG_USB_GADGET=y
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_UNSAFE_RESUME=y

configuration.sh

@@ -529,7 +529,7 @@ PACKAGE_LIST="alsa-utils automake bash-completion bc bridge-utils build-essentia
 	module-init-tools nano ntp parted pkg-config pv rfkill rsync sudo curl dialog \
 	sysfsutils toilet u-boot-tools unattended-upgrades unzip usbutils vlan wireless-tools wget \
 	iptables libdigest-sha-perl libproc-processtable-perl w-scan libusb-dev ncurses-term \
-	console-setup console-data kbd console-common unicode-data openssh-server man-db"
+	console-setup console-data kbd console-common unicode-data openssh-server man-db libmtp-runtime"
 
 # Non-essential packages
 PACKAGE_LIST_ADDITIONAL="btrfs-tools bluez hddtemp i2c-tools iperf ir-keytable iotop iozone3 weather-util weather-util-data stress \

debootstrap.sh

@@ -256,6 +256,8 @@ fi
 # kill process inside
 KILLPROC=$(ps -uax | pgrep ntpd |        tail -1); if [ -n "$KILLPROC" ]; then kill -9 $KILLPROC; fi  
 KILLPROC=$(ps -uax | pgrep dbus-daemon | tail -1); if [ -n "$KILLPROC" ]; then kill -9 $KILLPROC; fi  
+KILLPROC=$(ps -uax | pgrep bluetoothd | tail -1); if [ -n "$KILLPROC" ]; then kill -9 $KILLPROC; fi  
+KILLPROC=$(ps -uax | pgrep acpid | tail -1); if [ -n "$KILLPROC" ]; then kill -9 $KILLPROC; fi  
 
 # same info outside the image
 cp $DEST/cache/sdcard/etc/armbian.txt $DEST/cache/

documentation/H3_mini_faq.md

@@ -1,8 +1,21 @@
-# Armbian H3 mini FAQ
+# Armbian H3 mini FAQ -- 5.05
 
 **OS images with legacy Kernel (3.4.110)**
 
-Armbian supports starting with release 5.04 all available H3 based Orange Pi boards (also [One](http://forum.armbian.com/index.php/topic/724-quick-review-of-orange-pi-one/) and Lite when available). Compared to the preliminary releases the following has been fixed/improved:
+Armbian started beginning with release 5.04 to support all available H3 based Orange Pi boards (including [One](http://forum.armbian.com/index.php/topic/724-quick-review-of-orange-pi-one/) and Lite when available).
+
+***Changes in 5.05 (not yet released!)***
+
+- Auto detection for the Orange Pi 2 does work now
+- Mali acceleration works for all users not only root
+- verbose boot logging on 1st boot and after crashes (you can toggle verbose logging using 'sudo armbianmonitor -b')
+- more WiFi dongles supported due to backported firmware loader patch
+- all 3 USB ports on Orange Pi One (Lite) available ([2 of them need soldering](http://forum.armbian.com/index.php/topic/755-tutorial-orange-pi-one-adding-usb-analog-audio-out-tv-out-mic-and-ir-receiver/))
+- I2S possible on all Orange Pis (compare with the [mini tutorial](http://forum.armbian.com/index.php/topic/759-tutorial-i2s-on-orange-pi-h3/) since you need to tweak script.bin)
+- default display resolution set to 720p60 to fix possible overscan issues on 1st boot
+- HW accelerated video decoding works for most formats
+
+***Changes in 5.04 compared to pre-releases***
 
 - HDMI/DVI works (bug in boot.cmd settings)
 - Reboot issues fixed (bug in fex settings)
@@ -19,10 +32,8 @@ Armbian supports starting with release 5.04 all available H3 based Orange Pi boa
 - Full HDMI colour-range adjustable/accessible through _h3disp_ utility
 - already useable as stable headless/server board
 
-***Known issues with 5.04***
+***Known issues with 5.05***
 
-- Auto detection for the Orange Pi 2 doesn't work properly. Please have a look [for a manual fix](http://forum.armbian.com/index.php/topic/617-wip-orange-pi-one-support-for-the-upcoming-orange-pi-one/?p=5718) or wait for 5.05 where this will be fixed
-- Mali acceleration currently only working for root user. Please apply [a fix](http://forum.armbian.com/index.php/topic/617-wip-orange-pi-one-support-for-the-upcoming-orange-pi-one/?p=5719) manually or wait for 5.05 to fix this
 - Booting from NAND on OPi Plus currently not supported
 
 ***Important to know***
@@ -31,7 +42,6 @@ Armbian supports starting with release 5.04 all available H3 based Orange Pi boa
 - our [User documentation](http://www.armbian.com/documentation/) (one exception currently: use _h3disp_ to adjust display settings)
 - our [Geek documentation](http://www.armbian.com/using-armbian-tools/) (in case you want to build your own images)
 - CPU frequency settings are 648-1200 MHz on OPi One/Lite and 480-1296 MHz on the other boards (cpufreq governor is _interactive_ therefore the board only increases CPU speed and consumption when needed)
-- These are still test images regarding everything beyond headless/server usage
 - In case you experience instabilities, think about installing [RPi-Monitor for H3](http://forum.armbian.com/index.php/topic/617-wip-orange-pi-one-support-for-the-upcoming-orange-pi-one/?p=5076) to get an idea whether you suffer from overheating
 
 ***Areas that need testing/feedback***
@@ -39,7 +49,6 @@ Armbian supports starting with release 5.04 all available H3 based Orange Pi boa
 - SPI
 - I2C
 - GPIO in general
-- GPU acceleration
 - Wi-Fi on OPi Plus, Plus 2 and 2
 - USB wireless dongles
 - user experience
@@ -53,7 +62,6 @@ Armbian supports starting with release 5.04 all available H3 based Orange Pi boa
 ***Known to NOT work (reliably) yet***
 
 - Camera support. We included [@lex' patches](http://www.orangepi.org/orangepibbsen/forum.php?mod=redirect&goto=findpost&ptid=443&pid=7263) but miss [phelum's basic patches](http://www.orangepi.org/orangepibbsen/forum.php?mod=redirect&goto=findpost&ptid=70&pid=2905). Fixes welcome
-- HW accelerated video decoding. Fixes welcome (anyone willing to port the stuff from the [H3 OpenELEC port](https://github.com/jernejsk/OpenELEC-OPi2)?)
 - live display resolution switching. Fixes welcome (anyone willing to port the stuff from the [H3 OpenELEC port](https://github.com/jernejsk/OpenELEC-OPi2)?)
 - onboard Wi-Fi (it works somehow but chip/driver are cheap and bad -- we can't do much to improve the situation)
 

makeboarddeb.sh

@@ -73,6 +73,9 @@ create_board_package (){
 
 	# add USB OTG port mode switcher
 	install -m 755 $SRC/lib/scripts/sunxi-musb 			$destination/usr/local/bin
+
+	# armbianmonitor (currently only to toggle boot verbosity and log upload)
+	install -m 755 $SRC/lib/scripts/armbianmonitor/armbianmonitor $destination/usr/local/bin
 	
 	# replace hostapd from latest self compiled & patched
 	mkdir -p $destination/usr/sbin/

scripts/armbianmonitor/armbianmonitor

@@ -83,8 +83,11 @@
 Main() {
 	export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 	
+	[ $# -eq 0 ] && (DisplayUsage ; exit 0)
+	
 	ParseOptions "$@"
 
+	exit 0
 	PreRequisits
 	
 	# check whether user runs rpimonitord on his own or we activated it
@@ -109,7 +112,7 @@ ParseOptions() {
 	case ${c} in
 		H)
 			# display full help test
-			export FullUsage=TRUE
+			# export FullUsage=TRUE
 			DisplayUsage
 			exit 0
 			;;
@@ -122,26 +125,29 @@ ParseOptions() {
 			# toggle boot verbosity
 			if [ -f /boot/.force-verbose ]; then
 				rm /boot/.force-verbose
-				echo -e "Verbose kernel messages have been disabled. Needs a reboot"
+				echo -e "Verbose kernel messages have been disabled. Please reboot for changes to take effect."
 			else
 				date "+%s" >/boot/.force-verbose
-				echo -e "Verbose kernel messages have been enabled. Needs a reboot"
+				chmod 666 /boot/.force-verbose
+				echo -e "Verbose kernel messages have been enabled. Please reboot for changes to take effect."
 			fi
 			exit 0
 			;;
 		m|M)
 			# monitoring mode
-			MonitorMode ${OPTARG}
+			# MonitorMode ${OPTARG}
 			exit 0
 			;;
 		u|U)
 			# Upload /var/log/armhwinfo.log to be of help in support forum.
 			# TODO: ping sprunge.us before to detect network/firewall problems
+			fping sprunge.us | grep -q alive || \
+				(echo "Network/firewall problem detected. Please fix this or upload /var/log/armhwinfo.log manually." >&2 ; exit 1)
 			which curl >/dev/null 2>&1 || apt-get -f -qq -y install curl
 			echo -e "/var/log/armhwinfo.log has been uploaded to \c"
-			(cat /var/log/armhwinfo.log ; echo -e "\n### dmesg now:\n$(dmesg)") \
+			(cat /var/log/armhwinfo.log ; echo -e "\n### dmesg now:\n$(dmesg | tail -n 1000)") \
 				| curl -F 'sprunge=<-' http://sprunge.us
-			echo -e "Please post the URL in the Armbian forum where you've been asked for"
+			echo -e "Please post the URL in the Armbian forum where you've been asked for."
 			exit 0
 			;;
 	esac
@@ -159,13 +165,15 @@ DisplayUsage() {
 			LGREEN='\033[1;32m'
 		fi
 	fi
-	echo -e "Usage: ${BOLD}${0##*/} [-h/-H] [-b] [-m] [-u]${NC}\n"
+	echo -e "Usage: ${BOLD}${0##*/} [-h] [-b] [-u]${NC}\n"
 	echo -e "############################################################################"
 	if [ ${FullUsage} ]; then
 		echo -e "\nDetailed Description:"
 		grep "^#" "$0" | grep -v "^#\!/bin/bash" | sed 's/^#//'
 	fi
-	echo -e "\n This is WiP now\n"
+	echo -e "\n Use ${BOLD}armbianmonitor${NC} to toggle boot verbosity or upload support data:\n"
+	echo -e " armbianmonitor ${BOLD}-b${NC} switches between verbose and normal boot"
+	echo -e " armbianmonitor ${BOLD}-u${NC} tries to upload armhwinfo.log for support purposes\n"
 	echo -e "############################################################################\n"
 } # DisplayUsage