d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r335276

Browse Source 
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@walstatt.org>, Thomas Laus <lausts@acm.org>
This commit is contained in:
Allan Jude 2018-06-20 00:14:54 +00:00
parent a3552326dc
commit ec82884e87
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stand/i386/gptboot/gptboot.c
View File

@ -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

10
stand/i386/zfsboot/zfsboot.c
View File

@ -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;