svn commit: r336999 - head/release/tools

[Emmanuel Vadot]

Author: manu
Date: Tue Jul 31 19:13:50 2018
New Revision: 336999
URL: https://svnweb.freebsd.org/changeset/base/336999

Log:
  release: arm: Enable multicons for arm64
  
  Since we have now EFI framebuffer enabled for ARM64 if we boot on a board
  with an screen, u-boot will set up a EFI GOP framebuffer and we won't boot
  using the serial console.
  Also on RPI3 the firmware always setup the framebuffer area resulting in u-boot
  always setup the EFI GOP and FreeBSD never using the serial console.
  
  Reviewed by:	gjb, lwshu (previous version)
  Differential Revision:	https://reviews.freebsd.org/D16472

Modified:
  head/release/tools/arm.subr

Modified: head/release/tools/arm.subr
==============================================================================
--- head/release/tools/arm.subr	Tue Jul 31 19:12:31 2018	(r336998)
+++ head/release/tools/arm.subr	Tue Jul 31 19:13:50 2018	(r336999)
@@ -124,7 +124,20 @@ arm_setup_usb_otg() {
 	echo 'hw.usb.template=3' \
 		>> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
 	echo 'umodem_load="YES"' \
+	     >> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
+}
+
+arm64_setup_multicons() {
+	if [ "${EMBEDDED_TARGET_ARCH}" != "aarch64" ]; then
+		return
+	fi
+
+	echo '# Multiple console (serial+efi gop) enabled.' \
 		>> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
+	echo 'boot_multicons="YES"' \
+	     >> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
+	echo 'boot_serial="YES"' \
+	     >> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
 }
 
 arm_install_base() {
@@ -138,6 +151,7 @@ arm_install_base() {
 
 	arm_create_user
 	arm_setup_usb_otg
+	arm64_setup_multicons
 
 	echo '# Custom /etc/fstab for FreeBSD embedded images' \
 		> ${CHROOTDIR}/${DESTDIR}/etc/fstab