diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2023-04-14 04:41:22 +0000 |
|---|---|---|
| committer | Gordon Tetlow <gordon@FreeBSD.org> | 2023-06-21 05:05:51 +0000 |
| commit | 5d2bbb9db2d2c61629dcaee17cb269593e75d267 (patch) | |
| tree | 0be63f726dbd60fa938c9428f2c72d2ac0c1c964 | |
| parent | 0e577c42f61c808a379d82119d1cae8f2046d2bf (diff) | |
loader: comconsole: don't unconditionally wipe out hw.uart.console
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 ec671f4980437008b0119c6367816083e15fa503)
(cherry picked from commit 362677cae8e9ac4c6f7ff4d74a4378ea11d47797)
Approved by: so
Security: FreeBSD-EN-23:06.loader
| -rw-r--r-- | stand/i386/libi386/comconsole.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c index ed1f1aa08ed7..6d48e876fa37 100644 --- a/stand/i386/libi386/comconsole.c +++ b/stand/i386/libi386/comconsole.c @@ -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. |