From owner-svn-src-head@FreeBSD.ORG  Sat Feb  1 20:56:51 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4B433F1D;
 Sat,  1 Feb 2014 20:56:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 374361DDF;
 Sat,  1 Feb 2014 20:56:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s11Kupp2063899;
 Sat, 1 Feb 2014 20:56:51 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s11Kuod4063897;
 Sat, 1 Feb 2014 20:56:50 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201402012056.s11Kuod4063897@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 1 Feb 2014 20:56:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261358 - head/sys/powerpc/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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, 01 Feb 2014 20:56:51 -0000

Author: nwhitehorn
Date: Sat Feb  1 20:56:50 2014
New Revision: 261358
URL: http://svnweb.freebsd.org/changeset/base/261358

Log:
  Switch default Book-E scheduler to ULE, which works now, and enable
  CAPABILITIES stuff required to make ssh work.
  
  Hopefully, Book-E can eventually be added to GENERIC, which would avoid
  this kind of issue with bitrot. That will require figuring out how to link
  Book-E and AIM kernels at the same address, however...

Modified:
  head/sys/powerpc/conf/GENERIC
  head/sys/powerpc/conf/MPC85XX

Modified: head/sys/powerpc/conf/GENERIC
==============================================================================
--- head/sys/powerpc/conf/GENERIC	Sat Feb  1 20:46:35 2014	(r261357)
+++ head/sys/powerpc/conf/GENERIC	Sat Feb  1 20:56:50 2014	(r261358)
@@ -133,6 +133,11 @@ device		scc
 device		uart
 device		uart_z8530
 
+# FireWire support
+device		firewire	# FireWire bus code
+device		sbp		# SCSI over FireWire (Requires scbus and da)
+device		fwe		# Ethernet over FireWire (non-standard!)
+
 # PCI Ethernet NICs that use the common MII bus controller code.
 device		miibus		# MII bus support
 device		bge		# Broadcom BCM570xx Gigabit Ethernet

Modified: head/sys/powerpc/conf/MPC85XX
==============================================================================
--- head/sys/powerpc/conf/MPC85XX	Sat Feb  1 20:46:35 2014	(r261357)
+++ head/sys/powerpc/conf/MPC85XX	Sat Feb  1 20:56:50 2014	(r261358)
@@ -48,7 +48,9 @@ options 	NFSCL
 options 	NFSLOCKD
 options 	PROCFS
 options 	PSEUDOFS
-options 	SCHED_4BSD
+options 	SCHED_ULE
+options		CAPABILITIES
+options		CAPABILITY_MODE
 options		SMP
 options 	SYSVMSG
 options 	SYSVSEM
@@ -64,6 +66,7 @@ device		cryptodev
 device		da
 device		ds1553
 device		em
+device		alc
 device		ether
 device		fxp
 device		iic