From nobody Fri Apr 14 04:42:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyP2K5xVKz45NNN; Fri, 14 Apr 2023 04:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PyP2K1Nm9z3PXr; Fri, 14 Apr 2023 04:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681447369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h2t/9Ou7ujBOdqzWoSXt5VU3Uimj1v51e0ANYOP7ki0=; b=JN+VnQnP5k26oM4fS4mQgcowezGFg1kcAMuUMDeGcgSmyQN1wt06Y8xmNraYpH2UPjdZ93 d5tC+86Gsk41KQkT5owvC+Gl5jvjQ+RgPdhlW0zygvosPLtl0nkYmFKU1nT+wiLbLjmS+4 2SAolz2mjucuwwDj/W1rYk5YaALWTWUitHFWapNt/2g1GO4cZJ2wEMELuHDLHmX49e08J2 O3L6q97xjxFNOS2aohkCIbfWVgbRGPGDiO8FJ9x9Gh3yUUlWCxFzp6toOgLJoelFGmuzwu JQ8OfmOFS3vkn4srqUEaymJTLQybE97DKqFSXApke2OYlDd8ZuMJyvhS9B4tKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681447369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h2t/9Ou7ujBOdqzWoSXt5VU3Uimj1v51e0ANYOP7ki0=; b=h+fTGkufl2RW9wklL310moIpyG4q8Wnq1Ge3K5QDS7U/ukLgETAhguPOon/bQ81h8ftxJd FjjM6aHS4n8jg5sy8cUDNbHdMrBJyn4FaKcRVUF80pea26zSkUlH7VWdHlbdiP+KQIn1oJ 7XcU2usgFN7xTyAcfNNk9fKlgGALvxONAvOQNdfvvmmXu4ZrQQi9jC0fOmaJxU1ZqAWkFV ITNDOhVYn8qF4GpbYo//OpewrBIRy+pqj63+qqkdxOWDKZqulPpJG0aknNFNwcjeKke5oq +7cqWQXSrU8kYLNTDfATO2B2GMZFk3mu9DWWKjwxfITrMPwHnj7p3jIoJtE5Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681447369; a=rsa-sha256; cv=none; b=BWxf94JkhHDoaPSGRYW17VlYFacqndfRAIVED9+sNzjsd2TNvlNj4M5di0m+98ibyJ9EQk nutsaLVq03riWK9Fmvuhz+PuGVGWUAFHflDp1LyV+OLX62U2HW1dYe0Qg1JMsTwApupfza HdmKuZkGvZ3QAMITg1YFJO2Rat3SaSE0DyFiFdwkTu22RFaKicoW+U23fvw/sRspFRUl3I 9N2GYlwaSWZjk9ISV55KvMjzOOXVHxDzPtdpzOYavNsUUjYVLSbDVo54C5nGIhia+MpDja 3A9Tl8GK0rbvRaTI+up90gMC1jYfscJ8L5MHvRv/usqLxUVocH6/au3ueVv4rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PyP2K0T3dz19cZ; Fri, 14 Apr 2023 04:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33E4gml6069273; Fri, 14 Apr 2023 04:42:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33E4gmrp069272; Fri, 14 Apr 2023 04:42:48 GMT (envelope-from git) Date: Fri, 14 Apr 2023 04:42:48 GMT Message-Id: <202304140442.33E4gmrp069272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: ec671f498043 - main - loader: comconsole: don't unconditionally wipe out hw.uart.console List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec671f4980437008b0119c6367816083e15fa503 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ec671f4980437008b0119c6367816083e15fa503 commit ec671f4980437008b0119c6367816083e15fa503 Author: Kyle Evans AuthorDate: 2023-04-14 04:41:22 +0000 Commit: Kyle Evans CommitDate: 2023-04-14 04:42:03 +0000 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. --- stand/i386/libi386/comconsole.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c index 3fbb6a292c19..507cd0ec922f 100644 --- a/stand/i386/libi386/comconsole.c +++ b/stand/i386/libi386/comconsole.c @@ -338,12 +338,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.