svn commit: r266330 - in stable/10/sys: kern powerpc/conf

[Ian Lepore]

Author: ian
Date: Sat May 17 17:18:35 2014
New Revision: 266330
URL: http://svnweb.freebsd.org/changeset/base/266330

Log:
  MFC 261357, 261358, 261421:
  
    Enable SCHED_ULE for ppc book-e.
  
    Add driver for the ADT7460/ADT7467 fan controller found in
    later PowerBooks and iBooks.

Modified:
  stable/10/sys/kern/sched_ule.c
  stable/10/sys/powerpc/conf/GENERIC
  stable/10/sys/powerpc/conf/MPC85XX
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/sched_ule.c
==============================================================================
--- stable/10/sys/kern/sched_ule.c	Sat May 17 16:57:17 2014	(r266329)
+++ stable/10/sys/kern/sched_ule.c	Sat May 17 17:18:35 2014	(r266330)
@@ -77,10 +77,6 @@ dtrace_vtime_switch_func_t	dtrace_vtime_
 #include <machine/cpu.h>
 #include <machine/smp.h>
 
-#if defined(__powerpc__) && defined(BOOKE_E500)
-#error "This architecture is not currently compatible with ULE"
-#endif
-
 #define	KTR_ULE	0
 
 #define	TS_NAME_LEN (MAXCOMLEN + sizeof(" td ") + sizeof(__XSTRING(UINT_MAX)))

Modified: stable/10/sys/powerpc/conf/GENERIC
==============================================================================
--- stable/10/sys/powerpc/conf/GENERIC	Sat May 17 16:57:17 2014	(r266329)
+++ stable/10/sys/powerpc/conf/GENERIC	Sat May 17 17:18:35 2014	(r266330)
@@ -126,6 +126,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: stable/10/sys/powerpc/conf/MPC85XX
==============================================================================
--- stable/10/sys/powerpc/conf/MPC85XX	Sat May 17 16:57:17 2014	(r266329)
+++ stable/10/sys/powerpc/conf/MPC85XX	Sat May 17 17:18:35 2014	(r266330)
@@ -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