From owner-svn-src-head@freebsd.org Wed Mar 21 22:01:52 2018 Return-Path: Delivered-To: svn-src-head@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 1AF4EF6B402; Wed, 21 Mar 2018 22:01:52 +0000 (UTC) (envelope-from kevans@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 C2B436B1A9; Wed, 21 Mar 2018 22:01:51 +0000 (UTC) (envelope-from kevans@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 A3C56585; Wed, 21 Mar 2018 22:01:51 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2LM1pWp020206; Wed, 21 Mar 2018 22:01:51 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2LM1pvl020202; Wed, 21 Mar 2018 22:01:51 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803212201.w2LM1pvl020202@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 21 Mar 2018 22:01:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331326 - in head/stand: forth i386/loader X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head/stand: forth i386/loader X-SVN-Commit-Revision: 331326 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Mar 2018 22:01:52 -0000 Author: kevans Date: Wed Mar 21 22:01:51 2018 New Revision: 331326 URL: https://svnweb.freebsd.org/changeset/base/331326 Log: Forth version of EFI autoresizing r331321 delegated autoresizing to an efi-autoresizecons command that currently is expected to be done in forth/lua prior to drawing anything useful. Add the Forth version of the lua addition in r331321, hook efi.4th up to be installed. efiboot? was written by dteske@; anything outside of that may be blamed on me. Modified: head/stand/forth/Makefile head/stand/forth/efi.4th head/stand/forth/loader.rc head/stand/i386/loader/loader.rc Modified: head/stand/forth/Makefile ============================================================================== --- head/stand/forth/Makefile Wed Mar 21 21:15:43 2018 (r331325) +++ head/stand/forth/Makefile Wed Mar 21 22:01:51 2018 (r331326) @@ -18,6 +18,7 @@ FILES+= brand-fbsd.4th FILES+= check-password.4th FILES+= color.4th FILES+= delay.4th +FILES+= efi.4th FILES+= frames.4th FILES+= loader.4th FILES+= logo-beastie.4th Modified: head/stand/forth/efi.4th ============================================================================== --- head/stand/forth/efi.4th Wed Mar 21 21:15:43 2018 (r331325) +++ head/stand/forth/efi.4th Wed Mar 21 22:01:51 2018 (r331326) @@ -26,5 +26,16 @@ only forth definitions -\ Place holder for more functions +: efiboot? ( -- flag ) + s" efi-version" getenv -1 <> dup if + swap drop ( c-addr flag -- flag ) + then +; + +: maybe-efi-resizecons + efiboot? if + efi-autoresizecons + then +; + .( EFI boot environment) cr Modified: head/stand/forth/loader.rc ============================================================================== --- head/stand/forth/loader.rc Wed Mar 21 21:15:43 2018 (r331325) +++ head/stand/forth/loader.rc Wed Mar 21 22:01:51 2018 (r331326) @@ -6,11 +6,14 @@ \ \ Includes additional commands include /boot/loader.4th +include /boot/efi.4th try-include /boot/loader.rc.local \ Reads and processes loader.conf variables \ NOTE: Change to `initialize' if you enable the below boot menu start + +maybe-efi-resizecons \ Tests for password -- executes autoboot first if a password was defined check-password Modified: head/stand/i386/loader/loader.rc ============================================================================== --- head/stand/i386/loader/loader.rc Wed Mar 21 21:15:43 2018 (r331325) +++ head/stand/i386/loader/loader.rc Wed Mar 21 22:01:51 2018 (r331326) @@ -3,10 +3,13 @@ \ \ Includes additional commands include /boot/loader.4th +include /boot/efi.4th try-include /boot/loader.rc.local \ Reads and processes loader.conf variables initialize + +maybe-efi-resizecons \ Tests for password -- executes autoboot first if a password was defined check-password