From 6e5bc6eb1eff7939c8c57f84bb36f830c9a0a4eb Mon Sep 17 00:00:00 2001
From: Thomas Kaiser <github@kaiser-edv.de>
Date: Wed, 23 Nov 2016 11:59:43 +0100
Subject: [PATCH] Hopefully finalize support for NanoPi M1 Plus

---
 config/boards/nanopim1plus.conf | 2 +-
 scripts/armhwinfo               | 2 +-
 scripts/firstrun                | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/config/boards/nanopim1plus.conf b/config/boards/nanopim1plus.conf
index 9f0186951..76122960f 100644
--- a/config/boards/nanopim1plus.conf
+++ b/config/boards/nanopim1plus.conf
@@ -1,4 +1,4 @@
-# H3 quad core 1GB SoC WiFi/BT eMMC
+# H3 quad core 1GB SoC GbE/WiFi/BT eMMC
 BOARD_NAME="NanoPi M1 Plus"
 LINUXFAMILY=sun8i
 BOOTCONFIG=FriendlyARM_NanoPi_M1_Plus_defconfig
diff --git a/scripts/armhwinfo b/scripts/armhwinfo
index 67e9cf5c8..413f73a39 100644
--- a/scripts/armhwinfo
+++ b/scripts/armhwinfo
@@ -125,7 +125,7 @@ prepare_board() {
 			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
 			case ${BOARD_NAME} in
-				"Orange Pi+"|"Orange Pi+ 2"|"Orange Pi+ 2E"|"Banana Pi M2+")
+				"Orange Pi+"|"Orange Pi+ 2"|"Orange Pi+ 2E"|"Banana Pi M2+"|"NanoPi M1 Plus")
 					# Send GBit Ethernet IRQs to cpu3
 					echo 8 >/proc/irq/$(awk -F":" "/${GbE}/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
 					;;
diff --git a/scripts/firstrun b/scripts/firstrun
index e99e55ead..111a2bd5b 100644
--- a/scripts/firstrun
+++ b/scripts/firstrun
@@ -85,8 +85,9 @@ collect_information() {
 	# enable BT on cubietruck
 	[[ "$BOARD" == "cubietruck" ]] && update-rc.d brcm40183-patch defaults
 
-	# enable BT on Banana M2+ or NanoPi Air
-	[[ "$BOARD" == "bananapim2plus" || "$BOARD" == "nanopiair" ]] && update-rc.d ap6212-bluetooth defaults
+	# enable BT on Banana M2+, NanoPi Air or NanoPi M1 Plus
+	[[ "$BOARD" == "bananapim2plus" || "$BOARD" == "nanopiair" || "$BOARD" == "nanopim1plus" ]] \
+		&& update-rc.d ap6212-bluetooth defaults
 	
 	# enable BT on Solidrun boards
 	[[ "$BOARD" == "Cubox i2eX/i4" ]] && update-rc.d brcm4330-patch defaults && /etc/init.d/brcm4330-patch start
@@ -121,8 +122,8 @@ adjust_sunxi_settings() {
 		echo -e "\n### [firstrun] Use MAC address ${MACADDR} for Bluetooth from now" >>${Log})
 	
 	case ${BOARD_NAME} in
-		"NanoPi Air"|"Orange Pi Lite")
-			# change serial port for BT on NanoPi Air
+		"NanoPi Air"|"Orange Pi Lite"|"NanoPi M1 Plus")
+			# change serial port for BT on NanoPi Air and NanoPi M1 Plus
 			sed -i "s/^PORT=.*/PORT=ttyS3/" /etc/default/ap6212
 			# relink /etc/network/interfaces on OPi Lite and NanoPi Air
 			cd /etc/network/ && ln -sf interfaces.network-manager interfaces