From owner-p4-projects@FreeBSD.ORG  Thu Mar  9 20:19:09 2006
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 48CCD16A423; Thu,  9 Mar 2006 20:19:09 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 05FD016A422
	for <perforce@freebsd.org>; Thu,  9 Mar 2006 20:19:09 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9522243D60
	for <perforce@freebsd.org>; Thu,  9 Mar 2006 20:19:08 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k29KJ8xj022059
	for <perforce@freebsd.org>; Thu, 9 Mar 2006 20:19:08 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k29KJ8ps022056
	for perforce@freebsd.org; Thu, 9 Mar 2006 20:19:08 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 9 Mar 2006 20:19:08 GMT
Message-Id: <200603092019.k29KJ8ps022056@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93061 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, 09 Mar 2006 20:19:10 -0000

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

Change 93061 by imp@imp_Speedy on 2006/03/09 20:18:08

	NFS root, back off usb for the moment.

Affected files ...

.. //depot/projects/arm/src/sys/arm/conf/KB920X#23 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/conf/KB920X#23 (text+ko) ====

@@ -29,6 +29,7 @@
 include		"../at91/std.kb920x"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.
+hints		"KB920X.hints"		#Default places to look for devices.
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=arm9
@@ -45,9 +46,11 @@
 #options 	MD_ROOT			#MD is a potential root device
 #options	MD_ROOT_SIZE=4096	# 4MB ram disk
 #options 	ROOTDEVNAME=\"ufs:md0\"
-#options 	NFSCLIENT		#Network Filesystem Client
+options 	NFSCLIENT		#Network Filesystem Client
 #options 	NFSSERVER		#Network Filesystem Server
-#options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options		BOOTP_NFSROOT
+options		BOOTP
 #options 	MSDOSFS			#MSDOS Filesystem
 #options 	CD9660			#ISO 9660 Filesystem
 #options 	PROCFS			#Process filesystem (requires PSEUDOFS)
@@ -74,11 +77,12 @@
 device		lxtphy
 
 # USB support
-device		ohci		# OHCI PCI->USB interface
-device		usb		# USB Bus (required)
-device		umass		# Disks/Mass storage - Requires scbus and da
-device		scbus		# SCSI bus (required for SCSI)
-device		da		# Direct Access (disks)
+##device		ohci		# OHCI PCI->USB interface
+##device		usb		# USB Bus (required)
+##options		USB_DEBUG
+##device		umass		# Disks/Mass storage - Requires scbus and da
+##device		scbus		# SCSI bus (required for SCSI)
+##device		da		# Direct Access (disks)
 
 # Debugging for use in -current
 #options 	INVARIANTS		#Enable calls of extra sanity checking