svn commit: r332270 - head/stand/forth

[Toomas Soome]

Author: tsoome
Date: Sun Apr  8 11:39:27 2018
New Revision: 332270
URL: https://svnweb.freebsd.org/changeset/base/332270

Log:
  loader: include efi.4th only if we do have uefi
  
  Also simplify efi.4th.

Modified:
  head/stand/forth/efi.4th
  head/stand/forth/loader.4th
  head/stand/forth/loader.rc

Modified: head/stand/forth/efi.4th
==============================================================================
--- head/stand/forth/efi.4th	Sun Apr  8 11:37:00 2018	(r332269)
+++ head/stand/forth/efi.4th	Sun Apr  8 11:39:27 2018	(r332270)
@@ -26,16 +26,5 @@
 
 only forth definitions
 
-: efiboot? ( -- flag )
-	s" efi-version" getenv -1 <> dup if
-		swap drop ( c-addr flag -- flag )
-	then
-;
-
-: maybe-efi-resizecons
-	efiboot? if
-		s" efi-autoresizecons" evaluate
-	then
-;
-
+s" efi-autoresizecons" evaluate
 .( EFI boot environment) cr

Modified: head/stand/forth/loader.4th
==============================================================================
--- head/stand/forth/loader.4th	Sun Apr  8 11:37:00 2018	(r332269)
+++ head/stand/forth/loader.4th	Sun Apr  8 11:39:27 2018	(r332270)
@@ -46,6 +46,9 @@ include /boot/support.4th
 include /boot/color.4th
 include /boot/delay.4th
 include /boot/check-password.4th
+s" efi-version" getenv? [if]
+	include /boot/forth/efi.4th
+[then]
 
 only forth definitions
 

Modified: head/stand/forth/loader.rc
==============================================================================
--- head/stand/forth/loader.rc	Sun Apr  8 11:37:00 2018	(r332269)
+++ head/stand/forth/loader.rc	Sun Apr  8 11:39:27 2018	(r332270)
@@ -6,14 +6,11 @@
 \
 \ 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