From nobody Sun Nov 28 19:42:34 2021 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 A9EAB18AAB2E; Sun, 28 Nov 2021 19:42:35 +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 4J2JmC0gVGz3rjw; Sun, 28 Nov 2021 19:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EA03615042; Sun, 28 Nov 2021 19:42:34 +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 1ASJgYof068037; Sun, 28 Nov 2021 19:42:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ASJgYP3068036; Sun, 28 Nov 2021 19:42:34 GMT (envelope-from git) Date: Sun, 28 Nov 2021 19:42:34 GMT Message-Id: <202111281942.1ASJgYP3068036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 28dcccc12963 - main - x86 GENERIC/MINIMAL: group sc(4) devices together 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28dcccc1296398f10fcd69883b553161a7a83593 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638128555; 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=AhoafvfhTJvuH7VrUGGJHUrhQA0WCydApeEktq/42Tw=; b=jvCvr9rnxGMpTSwvN7EFDBw+OJYSyVOQlKKR0j3X/ezF8k4auMuGvmIkbEHJXIBO/QTZft wkMR9MsO52vs3quVP+YIhX6tVkwPVCs+D0jzWxu74Hc9Jule3gTZnSeIg/1Fw+KX2l963p nYn1J0WMJxba9NzbNTmsnt/gioFOZLWgkwHB08xi2aF5zEKerPPM2Vw7zbWVF36SX6yoVX 6QL6DmUL7a8a9CCTgABf/RI+xlDmGzms/uped2Ku6t+fSX3tQqG9fcULS2jGxCffJn1Cha E12YUfEfUOFM02XP5HF30yrNWgS+SprM9R0t5zlAjrNDq91ZX8drTEmMYbJmGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638128555; a=rsa-sha256; cv=none; b=gbCF1ieaks5T0omgHEYIXB9HlX85d4pS27GElt2ROJeUorMP12233LGsHVP5lmFqh9TSZ9 YqU5ilsWzWeHEgeGkfbtW5Moe7IIi2jOZ9QJc0zoDmnP7E3/XJ1yZcoF0jQOfuvyBmP0cV vJ5dgvzrpWZynDqB2mvNcNmUODXUYGhXPOEWD391iVzGDCUSDpysGAOb6p0BlswZ4GNB+4 bDSKFT6+MI7faTZfCVpA5qr0gv+caI8ySSEEo3OvV2KyLHzSZG3Z/yQJTaf3Ceed/+4fwm B81PuyME0+3vvQBvPHL1bHr8oh6qvZGkucLSHX2qRB19Ih+GwggH0AcH7Bxvgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=28dcccc1296398f10fcd69883b553161a7a83593 commit 28dcccc1296398f10fcd69883b553161a7a83593 Author: Ed Maste AuthorDate: 2021-11-28 19:11:56 +0000 Commit: Ed Maste CommitDate: 2021-11-28 19:38:41 +0000 x86 GENERIC/MINIMAL: group sc(4) devices together The vga and splash devices are part of the sc(4) system console. vt(4) uses the vt_vga driver instead, and has some limited splash support directly in vt_core.c. Leave the sc(4) options in GENERIC/MINIMAL (for now) but group them together under an sc(4) comment. Sponsored by: The FreeBSD Foundation --- sys/amd64/conf/GENERIC | 4 +--- sys/amd64/conf/MINIMAL | 4 +--- sys/i386/conf/GENERIC | 4 +--- sys/i386/conf/MINIMAL | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index edd7ae6419d2..4d679e89c92d 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -212,11 +212,9 @@ device psm # PS/2 mouse device kbdmux # keyboard multiplexer +# syscons is the legacy console driver, resembling an SCO console device vga # VGA video card driver - device splash # Splash screen and screen saver support - -# syscons is the legacy console driver, resembling an SCO console device sc options SC_PIXEL_MODE # add support for the raster text mode diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 5f99f85b996d..3c9dc8f4df5b 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -104,11 +104,9 @@ device psm # PS/2 mouse device kbdmux # keyboard multiplexer +# syscons is the legacy console driver, resembling an SCO console device vga # VGA video card driver - device splash # Splash screen and screen saver support - -# syscons is the legacy console driver, resembling an SCO console device sc options SC_PIXEL_MODE # add support for the raster text mode diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 26bdf4a53ed0..679fc8b706f8 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -181,11 +181,9 @@ device psm # PS/2 mouse device kbdmux # keyboard multiplexer +# syscons is the legacy console driver, resembling an SCO console device vga # VGA video card driver - device splash # Splash screen and screen saver support - -# syscons is the legacy console driver, resembling an SCO console device sc options SC_PIXEL_MODE # add support for the raster text mode diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index 1716f8018c36..d9d556048b76 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -115,11 +115,9 @@ device psm # PS/2 mouse device kbdmux # keyboard multiplexer +# syscons is the legacy console driver, resembling an SCO console device vga # VGA video card driver - device splash # Splash screen and screen saver support - -# syscons is the legacy console driver, resembling an SCO console device sc options SC_PIXEL_MODE # add support for the raster text mode