From owner-svn-src-stable@FreeBSD.ORG Sat Sep 19 01:49:37 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47E09106566C; Sat, 19 Sep 2009 01:49:37 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 341DC8FC1E; Sat, 19 Sep 2009 01:49:37 +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 n8J1nbeY006369; Sat, 19 Sep 2009 01:49:37 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8J1nbLQ006367; Sat, 19 Sep 2009 01:49:37 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909190149.n8J1nbLQ006367@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 19 Sep 2009 01:49:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197321 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/ciss dev/xen/xenpci powerpc/conf X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Sep 2009 01:49:37 -0000 Author: nwhitehorn Date: Sat Sep 19 01:49:36 2009 New Revision: 197321 URL: http://svn.freebsd.org/changeset/base/197321 Log: MFC r197080 Add a few SCSI controllers to GENERIC that can be found in Powermacs. This allows installation onto SCSI disks as shipped, for example, as an option with the Powermac G3. PR: powerpc/138543 Reviewed by: grehan Approved by: re (kib) Obtained from: sparc64 Modified: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/ciss/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/powerpc/conf/GENERIC Modified: stable/8/sys/powerpc/conf/GENERIC ============================================================================== --- stable/8/sys/powerpc/conf/GENERIC Sat Sep 19 01:48:12 2009 (r197320) +++ stable/8/sys/powerpc/conf/GENERIC Sat Sep 19 01:49:36 2009 (r197321) @@ -83,6 +83,16 @@ device atapicd # ATAPI CDROM drives #device atapifd # ATAPI floppy drives #device atapist # ATAPI tape drives +# SCSI Controllers +device ahc # AHA2940 and onboard AIC7xxx devices +options AHC_ALLOW_MEMIO # Attempt to use memory mapped I/O +options AHC_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~128k to driver. +device isp # Qlogic family +device ispfw # Firmware module for Qlogic host adapters +device mpt # LSI-Logic MPT-Fusion +device sym # NCR/Symbios/LSI Logic 53C8XX/53C1010/53C1510D + # SCSI peripherals device scbus # SCSI bus (required for SCSI) device da # Direct Access (disks) @@ -119,6 +129,7 @@ device md # Memory "disks" device ofwd # Open Firmware disks device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying/(translation) +device firmware # firmware assist module # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this!