aboutsummaryrefslogtreecommitdiff
path: root/release/tools
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2018-07-31 19:13:50 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2018-07-31 19:13:50 +0000
commita8d0ee755c89eb0986e45fbcc7d45cad437d8f9e (patch)
treeca100835b04295c24617bfc732269c6e82eda2a1 /release/tools
parent33bec6889a0957d1c06c36378157a46a95fcb004 (diff)
downloadsrc-a8d0ee755c89eb0986e45fbcc7d45cad437d8f9e.tar.gz
src-a8d0ee755c89eb0986e45fbcc7d45cad437d8f9e.zip
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
Notes
Notes: svn path=/head/; revision=336999
Diffstat (limited to 'release/tools')
-rw-r--r--release/tools/arm.subr14
1 files changed, 14 insertions, 0 deletions
diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 855f7b0d3d12..eddf5446e196 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -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