Use disable-bt overlay with raspberry pi so the pl011 will be used as

console uart instead of the 'mini uart' a quirky 8250 alike which
lacks flow control and break detection.  By default the pl011 is used
for bluetooth.  The pins the console is on do not change.

When com(4) takes over the console with the mini uart on rpi3 I see
noise before output resumes and can't interact with the console after it
has booted.  With pluart(4) as console everything is fine.

3 files changed, 15 insertions, 4 deletions

diff --git a/distrib/arm64/ramdisk/Makefile b/distrib/arm64/ramdisk/Makefile
index d608893d55a..a3be237cb3c 100644
--- a/distrib/arm64/ramdisk/Makefile
+++ b/distrib/arm64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2019/10/31 00:37:25 jsg Exp $
+#	$OpenBSD: Makefile,v 1.18 2019/11/17 06:03:39 jsg Exp $
 
 FS=		miniroot${OSrev}.fs
 FSSIZE=		67584
@@ -36,6 +36,9 @@ PIFILES=\
 	bcm2710-rpi-3-b-plus.dtb \
 	bcm2710-rpi-cm3.dtb
 
+PIDTBO=\
+	disable-bt.dtbo
+
 all: ${FS}
 
 ${FS}: bsd.rd
@@ -49,11 +52,15 @@ ${FS}: bsd.rd
 .for FILE in ${PIFILES}
 	cp ${PRPI}/${FILE} ${MOUNT_POINT}/
 .endfor
+	mkdir -p ${MOUNT_POINT}/overlays
+.for FILE in ${PIDTBO}
+	cp ${PRPI}/overlays/${FILE} ${MOUNT_POINT}/overlays/
+.endfor
 	cp ${PUBOOT}/rpi_3/u-boot.bin ${MOUNT_POINT}/
 	mkdir -p ${MOUNT_POINT}/efi/boot
 	cp /usr/mdec/BOOTAA64.EFI ${MOUNT_POINT}/efi/boot/bootaa64.efi
 	echo bootaa64.efi > ${MOUNT_POINT}/efi/boot/startup.nsh
-	echo 'arm_64bit=1\nenable_uart=1\nkernel=u-boot.bin' > ${MOUNT_POINT}/config.txt
+	echo 'arm_64bit=1\nenable_uart=1\ndtoverlay=disable-bt\nkernel=u-boot.bin' > ${MOUNT_POINT}/config.txt
 	dd if=${PUBOOT}/pine64_plus/u-boot-sunxi-with-spl.bin \
 	    of=/dev/r`cat vnd`c bs=1024 seek=8 conv=sync
 	umount ${MOUNT_POINT}
diff --git a/distrib/arm64/ramdisk/install.md b/distrib/arm64/ramdisk/install.md
index 1a8fc6201d7..fe97db3b9e7 100644
--- a/distrib/arm64/ramdisk/install.md
+++ b/distrib/arm64/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.13 2019/10/03 10:26:38 jsg Exp $
+#	$OpenBSD: install.md,v 1.14 2019/11/17 06:03:39 jsg Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -60,9 +60,12 @@ md_installboot() {
 	rpi)
 		cp $_mdec/{bootcode.bin,start.elf,fixup.dat,*.dtb} /mnt/mnt/
 		cp $_mdec/u-boot.bin /mnt/mnt/
+		mkdir -p /mnt/mnt/overlays
+		cp $_mdec/disable-bt.dtbo /mnt/mnt/overlays
 		cat > /mnt/mnt/config.txt<<-__EOT
 			arm_64bit=1
 			enable_uart=1
+			dtoverlay=disable-bt
 			kernel=u-boot.bin
 		__EOT
 		;;
diff --git a/distrib/arm64/ramdisk/list b/distrib/arm64/ramdisk/list
index f41c13ffa4f..6e7a37085a9 100644
--- a/distrib/arm64/ramdisk/list
+++ b/distrib/arm64/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.11 2019/06/07 14:39:56 deraadt Exp $
+#	$OpenBSD: list,v 1.12 2019/11/17 06:03:39 jsg Exp $
 
 SRCDIRS distrib/special
 
@@ -97,6 +97,7 @@ COPY	/usr/local/share/raspberrypi-firmware/boot/bcm2710-rpi-cm3.dtb usr/mdec/rpi
 COPY	/usr/local/share/raspberrypi-firmware/boot/bootcode.bin usr/mdec/rpi/bootcode.bin
 COPY	/usr/local/share/raspberrypi-firmware/boot/start.elf usr/mdec/rpi/start.elf
 COPY	/usr/local/share/raspberrypi-firmware/boot/fixup.dat usr/mdec/rpi/fixup.dat
+COPY	/usr/local/share/raspberrypi-firmware/boot/overlays/disable-bt.dtbo usr/mdec/rpi/disable-bt.dtbo
 COPY	/usr/local/share/u-boot/rpi_3/u-boot.bin usr/mdec/rpi/u-boot.bin
 
 COPY	/usr/local/share/u-boot/pine64_plus/u-boot-sunxi-with-spl.bin usr/mdec/pine64/u-boot-sunxi-with-spl.bin