jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-30 04:22:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

loader: comconsole: don't unconditionally wipe out hw.uart.console

Browse Source 
It may be the case that we need to set hw.uart.console manually in some
scenarios that comconsole can't necessarily support.  Avoid clobbering
hw.uart.console unless we've actually selected comconsole so that one
could at least get kernel console output..

Discussed with:	imp
Sponsored by:	Zenith Electronics LLC
Sponsored by:	Klara, Inc.

(cherry picked from commit ec671f4980)
(cherry picked from commit 362677cae8)

Approved by:	so
Security:	FreeBSD-EN-23:06.loader
This commit is contained in:
Kyle Evans 2023-04-13 23:41:22 -05:00 committed by Gordon Tetlow
parent 525ecfdad5
commit 525ac1948a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
stand/i386/libi386/comconsole.c
View File

@ -324,12 +324,13 @@ comc_setup(int speed, int port)
char intbuf[64];
int tries;
unsetenv("hw.uart.console");
comc_curspeed = speed;
comc_port = port;
if ((comconsole.c_flags & (C_ACTIVEIN | C_ACTIVEOUT)) == 0)
return;
unsetenv("hw.uart.console");
#define COMC_TEST 0xbb
/*
* Write byte to scratch register and read it out.