3 files changed, 3 insertions, 7 deletions
diff --git a/stand/efi/loader/arch/amd64/Makefile.inc b/stand/efi/loader/arch/amd64/Makefile.inc
index b6d824ce57e4..f64adf08ec13 100644
--- a/stand/efi/loader/arch/amd64/Makefile.inc
+++ b/stand/efi/loader/arch/amd64/Makefile.inc
@@ -11,5 +11,5 @@ SRCS+=	nullconsole.c \
 	comconsole.c \
 	spinconsole.c
 
-CFLAGS+=	-fPIC -DTERM_EMU
+CFLAGS+=	-fPIC
 LDFLAGS+=	-Wl,-znocombreloc
diff --git a/stand/efi/loader/arch/i386/Makefile.inc b/stand/efi/loader/arch/i386/Makefile.inc
index 079c73d336a9..fcdb6324b2f0 100644
--- a/stand/efi/loader/arch/i386/Makefile.inc
+++ b/stand/efi/loader/arch/i386/Makefile.inc
@@ -9,5 +9,5 @@ SRCS+=	nullconsole.c \
 	comconsole.c \
 	spinconsole.c
 
-CFLAGS+=	-fPIC -DTERM_EMU
+CFLAGS+=	-fPIC
 LDFLAGS+=	-Wl,-znocombreloc
diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c
index c8311daa4881..25b2e7789b72 100644
--- a/stand/efi/loader/main.c
+++ b/stand/efi/loader/main.c
@@ -1280,10 +1280,8 @@ command_mode(int argc, char *argv[])
 	unsigned int mode;
 	int i;
 	char *cp;
-	char rowenv[8];
 	EFI_STATUS status;
 	SIMPLE_TEXT_OUTPUT_INTERFACE *conout;
-	extern void HO(void);
 
 	conout = ST->ConOut;
 
@@ -1303,9 +1301,7 @@ command_mode(int argc, char *argv[])
 			printf("couldn't set mode %d\n", mode);
 			return (CMD_ERROR);
 		}
-		sprintf(rowenv, "%u", (unsigned)rows);
-		setenv("LINES", rowenv, 1);
-		HO();		/* set cursor */
+		(void) efi_cons_update_mode();
 		return (CMD_OK);
 	}