From owner-svn-src-head@FreeBSD.ORG  Sat Jan  9 18:09:31 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 17FFD106568B;
	Sat,  9 Jan 2010 18:09:31 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 076A58FC16;
	Sat,  9 Jan 2010 18:09:31 +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 o09I9UrZ075791;
	Sat, 9 Jan 2010 18:09:30 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o09I9UrN075789;
	Sat, 9 Jan 2010 18:09:30 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201001091809.o09I9UrN075789@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 9 Jan 2010 18:09:30 +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: r201909 - head/sys/mips/conf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Jan 2010 18:09:31 -0000

Author: imp
Date: Sat Jan  9 18:09:30 2010
New Revision: 201909
URL: http://svn.freebsd.org/changeset/base/201909

Log:
  Merge from projects/mips to head by hand.
  
  Copy over the SWARM.hints file.

Added:
     - copied unchanged from r201908, projects/mips/sys/mips/conf/SWARM.hints
Directory Properties:
  head/sys/mips/conf/SWARM.hints   (props changed)

Copied: head/sys/mips/conf/SWARM.hints (from r201908, projects/mips/sys/mips/conf/SWARM.hints)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/mips/conf/SWARM.hints	Sat Jan  9 18:09:30 2010	(r201909, copy of r201908, projects/mips/sys/mips/conf/SWARM.hints)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+hint.zbbus.0.at="nexus0"
+hint.zbpci.0.at="zbbus0"
+hint.scd.0.at="zbbus0"
+
+#
+# SWARM IDE interface is on the generic bus at chip select 4.
+# The CS4 region is 64KB in size and starts at 0x100B0000.
+# The IDE interrupt is wired to GPIO4 (intsrc 36 to the interrupt mapper)
+#
+hint.ata.0.at="zbbus0"
+hint.ata.0.maddr=0x100B0000
+hint.ata.0.msize=0x10000
+hint.ata.0.irq=36
+#hint.ata.0.disabled=0
+#hint.ata.0.regoffset=0x1F0
+#hint.ata.0.regshift=5