From owner-p4-projects@FreeBSD.ORG  Thu May 10 01:13:26 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 023B316A404; Thu, 10 May 2007 01:13:26 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B523416A414
	for <perforce@freebsd.org>; Thu, 10 May 2007 01:13:25 +0000 (UTC)
	(envelope-from bms@incunabulum.net)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id A6A5513C483
	for <perforce@freebsd.org>; Thu, 10 May 2007 01:13:25 +0000 (UTC)
	(envelope-from bms@incunabulum.net)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4A1DPTS029571
	for <perforce@freebsd.org>; Thu, 10 May 2007 01:13:25 GMT
	(envelope-from bms@incunabulum.net)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4A1DPum029562
	for perforce@freebsd.org; Thu, 10 May 2007 01:13:25 GMT
	(envelope-from bms@incunabulum.net)
Date: Thu, 10 May 2007 01:13:25 GMT
Message-Id: <200705100113.l4A1DPum029562@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bms@incunabulum.net using -f
From: Bruce M Simpson <bms@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 119610 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 May 2007 01:13:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=119610

Change 119610 by bms@bms_anglepoise on 2007/05/10 01:13:00

	Make 'device pci' bring in the siba bridge for the SENTRY5 target

Affected files ...

.. //depot/projects/mips2/src/sys/mips/conf/SENTRY5#5 edit
.. //depot/projects/mips2/src/sys/mips/mips32/sentry5/files.sentry5#7 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/conf/SENTRY5#5 (text+ko) ====

@@ -1,6 +1,6 @@
 #
 # $FreeBSD$
-# $P4: //depot/projects/mips2/src/sys/mips/conf/SENTRY5#4 $
+# $P4: //depot/projects/mips2/src/sys/mips/conf/SENTRY5#5 $
 #
 # The Broadcom Sentry5 series of processors and boards is very commonly
 # used in COTS hardware including the Netgear WGT634U.
@@ -66,10 +66,10 @@
 options		INVARIANTS
 options		INVARIANT_SUPPORT
 
-device		siba
+device		siba			# Sonics SiliconBackplane
+device		pci			# siba_pcib
 
-# XXX notyet; need to be auto probed children of siba0.
-#device		pci
+# XXX notyet; need to be auto probed children of siba.
 #device		uart
 #device		uart_ns8250
 

==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/files.sentry5#7 (text+ko) ====

@@ -6,9 +6,13 @@
 # for USB 1.1 OHCI, Ethernet and IPSEC cores
 # which are believed to be devices we have drivers for
 # which just need to be tweaked for attachment to an SSB system bus.
-# TODO: Add pci host bridge support.
+
 mips/mips32/sentry5/siba.c			optional siba
 mips/mips32/sentry5/siba_cc.c			optional siba
+
+# PCI host bridge
+mips/mips32/sentry5/siba_pcib.c			optional pci
+
+# neither of these are actually need yet.
 mips/mips32/sentry5/siba_mips.c			optional siba
 mips/mips32/sentry5/siba_sdram.c		optional siba
-mips/mips32/sentry5/siba_pcib.c			optional siba