Revert r332275, r332272, r332270

There's problems with them. The order of efi stuff isn't quite right,
and there's various problems. Revert until thos problems can be fixed.

Reviewed by: kevans@

stand/forth/efi.4th

@@ -26,5 +26,16 @@
 
 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
+;
+
 .( EFI boot environment) cr

stand/forth/loader.4th

@@ -46,9 +46,6 @@ include /boot/support.4th
 include /boot/color.4th
 include /boot/delay.4th
 include /boot/check-password.4th
-s" efi-version" getenv? [if]
-	include /boot/efi.4th
-[then]
 
 only forth definitions
 

stand/forth/loader.rc

@@ -6,12 +6,15 @@
 \
 \ 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
 

stand/i386/loader/loader.rc

@@ -3,11 +3,14 @@
 \
 \ 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