From 65c1f8735b66013de7c45864f86851b80c5d1cf2 Mon Sep 17 00:00:00 2001
From: ThomasKaiser <github@kaiser-edv.de>
Date: Wed, 11 Oct 2017 13:46:03 +0200
Subject: [PATCH] Prepare new boards arrival, cosmetic fixes

---
 packages/bsp/common/etc/init.d/armhwinfo |  4 ++--
 packages/bsp/common/etc/init.d/firstrun  | 27 +++++++++++-------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/packages/bsp/common/etc/init.d/armhwinfo b/packages/bsp/common/etc/init.d/armhwinfo
index b8895f1749..1404a5a0e2 100755
--- a/packages/bsp/common/etc/init.d/armhwinfo
+++ b/packages/bsp/common/etc/init.d/armhwinfo
@@ -110,7 +110,7 @@ prepare_board() {
 			echo 3 >/proc/irq/$(awk -F":" "/eth0/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity_list
 			echo 7 >/sys/class/net/eth0/queues/rx-0/rps_cpus
 			;;
-		odroidc2|meson64) # S905: both kernels: send eth0 to cpu3, mmc/usb2 to cpu2 and usb1 to cpu1
+		odroidc2|meson64) # S905/S905X/S912: both kernels: send eth0 to cpu3, mmc/usb2 to cpu2 and usb1 to cpu1
 			# Basics: http://forum.odroid.com/viewtopic.php?f=115&t=8121#p65777
 			for i in $(awk -F':' '/sd_emmc|usb2/{print $1}' </proc/interrupts | sed 's/\ //g'); do
 				echo 1 >/proc/irq/$i/smp_affinity_list
@@ -378,7 +378,7 @@ case $1 in
 		prepare_temp_monitoring &
 
 		# display message, log hardware id to file, write log
-		echo -e "[\e[0;32m ok \x1B[0m] Starting ARM hardware info: $ID (${VERSION})"
+		echo -e "[\e[0;32m ok \x1B[0m] Starting ARM hardware info: ${BOARD_NAME} (${VERSION})"
 		echo $BOARD_NAME >/var/run/machine.id # we should leave this, maybe users depend on it
 		if [ $? -ne 0 ]; then
 			# most probably readonly fs. We'll try to warn the user.
diff --git a/packages/bsp/common/etc/init.d/firstrun b/packages/bsp/common/etc/init.d/firstrun
index b337791e49..dfc7cb0918 100755
--- a/packages/bsp/common/etc/init.d/firstrun
+++ b/packages/bsp/common/etc/init.d/firstrun
@@ -183,7 +183,7 @@ case "$1" in
 		cubietruck)
 			systemctl enable brcm40183-patch && service brcm40183-patch start
 			;;
-		bananapim2plus|nanopiair|nanopim1plus|orangepizeroplus2*)
+		bananapim2plus|nanopiair|nanopim1plus|orangepizeroplus2*|orangepiwin|nanopineoplus2|nanopik2)
 			update-rc.d ap6212-bluetooth defaults
 			;;
 		cubox-i)
@@ -228,7 +228,7 @@ case "$1" in
 				echo -e "\n### [firstrun] Use MAC address ${MACADDR} for Bluetooth from now" >>${Log})
 
 			case $BOARD_NAME in
-				"NanoPi Air"|"NanoPi M1 Plus")
+				"NanoPi Air"|"NanoPi M1 Plus"|"Nanopi Neo Plus 2")
 					# change serial port for BT on FriendlyELEC H3 boards
 					sed -i "s/^PORT=.*/PORT=ttyS3/" /etc/default/ap6212
 					;;
@@ -236,8 +236,8 @@ case "$1" in
 					# relink /etc/network/interfaces on Wi-Fi only boards
 					cd /etc/network/ && ln -sf interfaces.network-manager interfaces
 					;;
-				"Orange Pi Zero")
-					# set OPi Zero WiFi address permanently based on a random address using Allwinner's MAC prefix
+				"Orange Pi Zero"|"NanoPi Duo")
+					# set XR819 WiFi address permanently based on a random address using Allwinner's MAC prefix
 					MACADDR=$(printf 'DC:44:6D:%02X:%02X:%02X\n' $[RANDOM%256] $[RANDOM%256] $[RANDOM%256])
 			                echo "options xradio_wlan macaddr=${MACADDR}" >/etc/modprobe.d/xradio_wlan.conf
 			                echo -e "\n### [firstrun] Use MAC address ${MACADDR} for Wi-Fi from now" >>${Log}
@@ -254,18 +254,15 @@ case "$1" in
 			MACADDR=$(printf 'da:42:ea:%02X:%02X:%02X\n' $[RANDOM%256] $[RANDOM%256] $[RANDOM%256])
 			sed -i "s/^\#[^ tab]\+hwaddress ether/\thwaddress ether $MACADDR/" /etc/network/interfaces
 			;;
-
-                mvebu64)
+		mvebu64)
 			# configure/enable/start systemd-networkd
-                        rm /etc/resolv.conf
-                        systemctl start systemd-networkd.service
-                        systemctl start systemd-resolved.service
-                        systemctl enable systemd-networkd.service
-                        systemctl enable systemd-resolved.service
-                        ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
-                        systemctl restart systemd-networkd
-                        ;;
-
+			systemctl start systemd-networkd.service
+			systemctl start systemd-resolved.service
+			systemctl enable systemd-networkd.service
+			systemctl enable systemd-resolved.service
+			ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
+			systemctl restart systemd-networkd
+			;;
 	esac
 
 	systemctl disable firstrun