svn commit: r335398 - in head/stand/i386: gptboot zfsboot

[Allan Jude]

Author: allanjude
Date: Wed Jun 20 00:14:54 2018
New Revision: 335398
URL: https://svnweb.freebsd.org/changeset/base/335398

Log:
  Revert r335276
  
  This was causing issues for people booting.
  I will likely bring this back as an optional feature, similar to
  boot0sio, like gptboot-serial or something.
  
  PR:		221526
  Reported by:	O. Hartmann <ohartmann at walstatt.org>, Thomas Laus <lausts at acm.org>

Modified:
  head/stand/i386/gptboot/gptboot.c
  head/stand/i386/zfsboot/zfsboot.c

Modified: head/stand/i386/gptboot/gptboot.c
==============================================================================
--- head/stand/i386/gptboot/gptboot.c	Wed Jun 20 00:13:09 2018	(r335397)
+++ head/stand/i386/gptboot/gptboot.c	Wed Jun 20 00:14:54 2018	(r335398)
@@ -285,16 +285,6 @@ main(void)
 	bootinfo.bi_memsizes_valid++;
 	bootinfo.bi_bios_dev = dsk.drive;
 
-	/*
-	 * Initialize the serial console early with a modern default of 115200.
-	 * Later, we'll read PATH_DOTCONFIG and reconfigure serial according
-	 * to the configuration provided.
-	 */
-	opts = OPT_SET(RBX_DUAL);
-	ioctrl = (IO_SERIAL|IO_KEYBOARD);
-	if (sio_init(115200) != 0)
-		ioctrl &= ~IO_SERIAL;
-
 #ifdef LOADER_GELI_SUPPORT
 	geli_init();
 #endif

Modified: head/stand/i386/zfsboot/zfsboot.c
==============================================================================
--- head/stand/i386/zfsboot/zfsboot.c	Wed Jun 20 00:13:09 2018	(r335397)
+++ head/stand/i386/zfsboot/zfsboot.c	Wed Jun 20 00:14:54 2018	(r335398)
@@ -693,16 +693,6 @@ main(void)
     }
     setheap(heap_next, heap_end);
 
-    /*
-     * Initialize the serial console early with a modern default of 115200.
-     * Later, we'll read PATH_DOTCONFIG and reconfigure serial according
-     * to the configuration provided.
-     */
-    opts = OPT_SET(RBX_DUAL);
-    ioctrl = (IO_SERIAL|IO_KEYBOARD);
-    if (sio_init(115200) != 0)
-	ioctrl &= ~IO_SERIAL;
-
     dsk = malloc(sizeof(struct dsk));
     dsk->drive = *(uint8_t *)PTOV(ARGS);
     dsk->type = dsk->drive & DRV_HARD ? TYPE_AD : TYPE_FD;