From 5df1e4f75936a44b6703bbff1f5a96c2bc1b684b Mon Sep 17 00:00:00 2001
From: Thomas Kaiser <github@kaiser-edv.de>
Date: Sun, 6 Mar 2016 10:25:41 +0100
Subject: [PATCH 1/2] armhwinfo: verbose USB logging only when verbose boot is
 enabled

---
 scripts/armhwinfo | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/armhwinfo b/scripts/armhwinfo
index 5ee6c841a3..16e8c58119 100644
--- a/scripts/armhwinfo
+++ b/scripts/armhwinfo
@@ -221,7 +221,8 @@ log_hardware_info() {
 	echo -e "\n### dmesg:\n" >>${Log}
 	cat "${TMPFILE}" >>${Log}
 	echo -e "\n### lsusb:" >>${Log}
-	lsusb -v 2>/dev/null >>${Log}
+	[ -f /boot/.verbose ] && USBVERBOSE="-v" || echo "" >>${Log}
+	lsusb ${USBVERBOSE} 2>/dev/null >>${Log}
 	echo -e "\n### lscpu:\n" >>${Log}
 	lscpu >>${Log}
 	echo -e "\n### cpuinfo:\n" >>${Log}

From 0043ca15b42184e15e6f1c6b3bf799321ad62792 Mon Sep 17 00:00:00 2001
From: Thomas Kaiser <github@kaiser-edv.de>
Date: Sun, 6 Mar 2016 10:48:13 +0100
Subject: [PATCH 2/2] armhwinfo: remove unnecessary code, improve user
 experience on sun8i

---
 scripts/armhwinfo | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/scripts/armhwinfo b/scripts/armhwinfo
index 16e8c58119..4c02334e97 100644
--- a/scripts/armhwinfo
+++ b/scripts/armhwinfo
@@ -121,19 +121,19 @@ detect_board() {
 	    fi
 		if [ $HARDWARE = "sun8i" ]; then
 			ID="Orange H3"
-			# 3 or 30 sec user feedback that the board is ready after 1st login with 3.4 kernel
+			# 10 or 120 sec user feedback that the board is ready after 1st login with 3.4 kernel
 			SwapState="$(grep swap /etc/fstab)"
 			if [ -f /sys/class/leds/green_led/trigger -a "X${SwapState}" != "X" ]; then
 				echo timer >/sys/class/leds/green_led/trigger
 				echo 200 >/sys/class/leds/green_led/delay_off
 				echo 200 >/sys/class/leds/green_led/delay_on
-				[ -f "/root/.not_logged_in_yet" ] && BlinkTime=30 || BlinkTime=3
+				[ -f "/root/.not_logged_in_yet" ] && BlinkTime=120 || BlinkTime=10
 				(sleep ${BlinkTime} && echo none >/sys/class/leds/green_led/trigger) &
 			fi
 	
 			# redistribute USB irqs to dedicated cores
 			echo 2 >/proc/irq/$(awk -F":" "/${USB1}/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
-			echo 4 >/proc/irq/$(awk -F":" "/${USB2}/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity 2>/dev/null # OPi One
+			echo 4 >/proc/irq/$(awk -F":" "/${USB2}/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
 			if [ "$TERMINUS" != "" ]; then
 				# Ethernet irqs on cpu3
 				echo 8 >/proc/irq/$(awk -F":" "/${GbE}/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
@@ -142,7 +142,7 @@ detect_board() {
 					if [ ${CORES} -eq 4 ]; then
 						ID="Orange Pi+ 2"
 					else
-						ID="Banana Pi M3"
+						ID="Unsupported Hardware" # Banana Pi M3
 					fi
 				fi
 				case ${SUN8IPHY} in
@@ -270,10 +270,6 @@ case $1 in
 		echo "$(date "+%s") $HARDWARE $ARCH $KERNELID $MACHINE $ID $VERSION" >/boot/.verbose
 		sync
 		;;
-	status)
-		# Anything special we need to improve systemd compatiblity?
-		:
-		;;
 	query)
 		# armbianmonitor mode -- only interested in hardware info
 		collect_informations >/dev/null