summaryrefslogtreecommitdiffstats
path: root/sys/powerpc/conf
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2014-02-01 20:56:50 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2014-02-01 20:56:50 +0000
commit336383e796fb53dd2e812fe72ff6e12721816bb9 (patch)
treec1ce10af90a5e66d469fd9b3dbba855480e5cd03 /sys/powerpc/conf
parenta7d50b7d03a0a5c65371751af0846be9d4d24ea7 (diff)
downloadFreeBSD-src-336383e796fb53dd2e812fe72ff6e12721816bb9.zip
FreeBSD-src-336383e796fb53dd2e812fe72ff6e12721816bb9.tar.gz
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...
Diffstat (limited to 'sys/powerpc/conf')
-rw-r--r--sys/powerpc/conf/GENERIC5
-rw-r--r--sys/powerpc/conf/MPC85XX5
2 files changed, 9 insertions, 1 deletions
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 318c654..61690fc 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -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
diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX
index e222ddb..d296484 100644
--- a/sys/powerpc/conf/MPC85XX
+++ b/sys/powerpc/conf/MPC85XX
@@ -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
OpenPOWER on IntegriCloud