From owner-svn-src-all@freebsd.org Tue Jul 31 19:13:51 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 28B13106260A; Tue, 31 Jul 2018 19:13:51 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D3A8878673; Tue, 31 Jul 2018 19:13:50 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B4A4517D0D; Tue, 31 Jul 2018 19:13:50 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6VJDo7h081288; Tue, 31 Jul 2018 19:13:50 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6VJDoo5081287; Tue, 31 Jul 2018 19:13:50 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201807311913.w6VJDoo5081287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Tue, 31 Jul 2018 19:13:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336999 - head/release/tools X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/release/tools X-SVN-Commit-Revision: 336999 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jul 2018 19:13:51 -0000 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