From owner-svn-src-all@FreeBSD.ORG Mon Sep 21 23:58:30 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D1251065672; Mon, 21 Sep 2009 23:58:30 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2129F8FC08; Mon, 21 Sep 2009 23:58:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8LNwUB2003689; Mon, 21 Sep 2009 23:58:30 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8LNwTF1003684; Mon, 21 Sep 2009 23:58:29 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <200909212358.n8LNwTF1003684@svn.freebsd.org> From: Xin LI Date: Mon, 21 Sep 2009 23:58:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197397 - in head/sys: amd64/conf conf i386/conf modules X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Sep 2009 23:58:30 -0000 Author: delphij Date: Mon Sep 21 23:58:29 2009 New Revision: 197397 URL: http://svn.freebsd.org/changeset/base/197397 Log: Build x86bios only for i386/amd64 for now. More work is required to make these functional on other architectures, and the current code breaks sparc64 and powerpc. Spotted by: tinderbox via des Modified: head/sys/amd64/conf/NOTES head/sys/conf/NOTES head/sys/i386/conf/NOTES head/sys/modules/Makefile Modified: head/sys/amd64/conf/NOTES ============================================================================== --- head/sys/amd64/conf/NOTES Mon Sep 21 23:20:18 2009 (r197396) +++ head/sys/amd64/conf/NOTES Mon Sep 21 23:58:29 2009 (r197397) @@ -160,6 +160,11 @@ options VESA # Turn on extra debugging checks and output for VESA support. options VESA_DEBUG +device dpms # DPMS suspend & resume via VESA BIOS + +# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa +options X86BIOS + # # Optional devices: # Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Mon Sep 21 23:20:18 2009 (r197396) +++ head/sys/conf/NOTES Mon Sep 21 23:58:29 2009 (r197397) @@ -2757,5 +2757,3 @@ options AAC_DEBUG # Debugging levels: options BROOKTREE_ALLOC_PAGES=(217*4+1) options MAXFILES=999 -# x86 real mode emulator -options X86BIOS Modified: head/sys/i386/conf/NOTES ============================================================================== --- head/sys/i386/conf/NOTES Mon Sep 21 23:20:18 2009 (r197396) +++ head/sys/i386/conf/NOTES Mon Sep 21 23:58:29 2009 (r197397) @@ -361,6 +361,9 @@ options VESA_DEBUG device dpms # DPMS suspend & resume via VESA BIOS +# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa +options X86BIOS + # # The Numeric Processing eXtension driver. This is non-optional. device npx Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Mon Sep 21 23:20:18 2009 (r197396) +++ head/sys/modules/Makefile Mon Sep 21 23:58:29 2009 (r197397) @@ -298,7 +298,7 @@ SUBDIR= ${_3dfx} \ wlan_xauth \ ${_wpi} \ ${_wpifw} \ - x86bios \ + ${_x86bios} \ ${_xe} \ xfs \ xl \ @@ -456,6 +456,7 @@ _padlock= padlock _s3= s3 _twa= twa _vesa= vesa +_x86bios= x86bios .elif ${MACHINE} == "pc98" _canbepm= canbepm _canbus= canbus @@ -539,6 +540,7 @@ _sppp= sppp _tmpfs= tmpfs _twa= twa _vesa= vesa +_x86bios= x86bios _wi= wi _wpi= wpi _wpifw= wpifw