svn commit: r261358 - head/sys/powerpc/conf

[Nathan Whitehorn]

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