From owner-svn-src-all@FreeBSD.ORG  Mon Jun 30 16:18:38 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EBCF2E7E;
 Mon, 30 Jun 2014 16:18:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D8E0C2879;
 Mon, 30 Jun 2014 16:18:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5UGIcmJ079534;
 Mon, 30 Jun 2014 16:18:38 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5UGIcDr079532;
 Mon, 30 Jun 2014 16:18:38 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201406301618.s5UGIcDr079532@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 30 Jun 2014 16:18:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268045 - in head/sys: amd64/conf i386/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jun 2014 16:18:39 -0000

Author: emaste
Date: Mon Jun 30 16:18:38 2014
New Revision: 268045
URL: http://svnweb.freebsd.org/changeset/base/268045

Log:
  Add vt(4) to GENERIC and retire the separate VT config
  
  vt(4) and sc(4) can now coexist in the same kernel.  To choose the vt
  driver, set the loader tunable kern.vty=vt .

Deleted:
  head/sys/amd64/conf/VT
  head/sys/i386/conf/VT
Modified:
  head/sys/amd64/conf/GENERIC
  head/sys/i386/conf/GENERIC

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC	Mon Jun 30 16:16:35 2014	(r268044)
+++ head/sys/amd64/conf/GENERIC	Mon Jun 30 16:18:38 2014	(r268045)
@@ -184,6 +184,11 @@ device		splash			# Splash screen and scr
 device		sc
 options 	SC_PIXEL_MODE		# add support for the raster text mode
 
+# vt is the new video console driver
+device		vt
+device		vt_vga
+device		vt_efifb
+
 device		agp			# support several AGP chipsets
 
 # PCCARD (PCMCIA) support

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC	Mon Jun 30 16:16:35 2014	(r268044)
+++ head/sys/i386/conf/GENERIC	Mon Jun 30 16:18:38 2014	(r268045)
@@ -187,6 +187,10 @@ device		splash			# Splash screen and scr
 device		sc
 options 	SC_PIXEL_MODE		# add support for the raster text mode
 
+# vt is the new video console driver
+device		vt
+device		vt_vga
+
 device		agp			# support several AGP chipsets
 
 # Power management support (see NOTES for more options)