Fri Jun 10 16:38:17 2011 UTC ()
Change default of GUR_BASE to 0xffe00000 which is used on more recent machines.
Add options GUR_BASE=0xe0000000 to MPC8548CDS and RB800
(matt)
diff -r1.4 -r1.5 src/sys/arch/evbppc/conf/MPC8536DS
diff -r1.4 -r1.5 src/sys/arch/evbppc/conf/MPC8548CDS
diff -r1.3 -r1.4 src/sys/arch/evbppc/conf/P2020DS
diff -r1.3 -r1.4 src/sys/arch/evbppc/conf/P2020RDB
diff -r1.6 -r1.7 src/sys/arch/evbppc/conf/RB800
diff -r1.5 -r1.6 src/sys/arch/evbppc/conf/std.mpc85xx
--- src/sys/arch/evbppc/conf/MPC8536DS 2011/06/08 05:03:43 1.4
+++ src/sys/arch/evbppc/conf/MPC8536DS 2011/06/10 16:38:17 1.5
@@ -1,4 +1,4 @@
-# $NetBSD: MPC8536DS,v 1.4 2011/06/08 05:03:43 matt Exp $
+# $NetBSD: MPC8536DS,v 1.5 2011/06/10 16:38:17 matt Exp $
#
# MPC8536DS -- everything that's currently supported
#
@@ -7,7 +7,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "MPC8536DS-$Revision: 1.4 $"
+ident "MPC8536DS-$Revision: 1.5 $"
maxusers 32
@@ -16,9 +16,6 @@
#options UVMHIST
#options UVMHIST_PRINT
-
-no options GUR_BASE
-options GUR_BASE=0xffe00000
options MPC8536
options PIXIS
--- src/sys/arch/evbppc/conf/MPC8548CDS 2011/06/08 05:03:44 1.4
+++ src/sys/arch/evbppc/conf/MPC8548CDS 2011/06/10 16:38:17 1.5
@@ -1,4 +1,4 @@
-# $NetBSD: MPC8548CDS,v 1.4 2011/06/08 05:03:44 matt Exp $
+# $NetBSD: MPC8548CDS,v 1.5 2011/06/10 16:38:17 matt Exp $
#
# MPC8548CDS -- everything that's currently supported
#
@@ -7,7 +7,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "MPC8548CDS-$Revision: 1.4 $"
+ident "MPC8548CDS-$Revision: 1.5 $"
maxusers 32
@@ -19,6 +19,7 @@
options MPC8548
options CADMUS
+options GUR_BASE=0xe0000000
#options HZ=1000
#options INSECURE # disable kernel security levels
--- src/sys/arch/evbppc/conf/P2020DS 2011/06/08 05:03:44 1.3
+++ src/sys/arch/evbppc/conf/P2020DS 2011/06/10 16:38:17 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: P2020DS,v 1.3 2011/06/08 05:03:44 matt Exp $
+# $NetBSD: P2020DS,v 1.4 2011/06/10 16:38:17 matt Exp $
#
# P2020DS -- everything that's currently supported
#
@@ -8,16 +8,13 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "P2020DS-$Revision: 1.3 $"
+ident "P2020DS-$Revision: 1.4 $"
maxusers 32
#options UVMHIST
#options UVMHIST_PRINT
-no options GUR_BASE
-options GUR_BASE=0xffe00000
-
options P2020
options PIXIS
#options SYS_CLK=100000000
@@ -193,6 +190,8 @@
umass* at uhub? port ?
scsibus* at umass? channel ?
sd* at scsibus? target ? lun ?
+ugen* at uhub? port ?
+uhub* at uhub? port ?
#sdhc* at cpunode? # sdmmc
#sdmmc* at sdhc? # SD/MMC bus
--- src/sys/arch/evbppc/conf/P2020RDB 2011/06/08 05:03:44 1.3
+++ src/sys/arch/evbppc/conf/P2020RDB 2011/06/10 16:38:17 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: P2020RDB,v 1.3 2011/06/08 05:03:44 matt Exp $
+# $NetBSD: P2020RDB,v 1.4 2011/06/10 16:38:17 matt Exp $
#
# P2020RBD -- everything that's currently supported
#
@@ -7,7 +7,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "P2020RBD-$Revision: 1.3 $"
+ident "P2020RBD-$Revision: 1.4 $"
maxusers 32
@@ -16,9 +16,6 @@
#options UVMHIST
#options UVMHIST_PRINT
-
-no options GUR_BASE
-options GUR_BASE=0xffe00000
options P2020
options SYS_CLK=100000000
--- src/sys/arch/evbppc/conf/RB800 2011/06/08 05:03:44 1.6
+++ src/sys/arch/evbppc/conf/RB800 2011/06/10 16:38:17 1.7
@@ -1,4 +1,4 @@
-# $NetBSD: RB800,v 1.6 2011/06/08 05:03:44 matt Exp $
+# $NetBSD: RB800,v 1.7 2011/06/10 16:38:17 matt Exp $
#
# RB800 -- everything that's currently supported
#
@@ -7,7 +7,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "RB800-$Revision: 1.6 $"
+ident "RB800-$Revision: 1.7 $"
maxusers 32
@@ -16,6 +16,7 @@
options MPC8544
options PPC_HAVE_SPE
+options GUR_BASE=0xe0000000
#options INSECURE # disable kernel security levels
#options NTP # NTP phase/frequency locked loop
--- src/sys/arch/evbppc/conf/std.mpc85xx 2011/06/08 05:03:44 1.5
+++ src/sys/arch/evbppc/conf/std.mpc85xx 2011/06/10 16:38:17 1.6
@@ -1,4 +1,4 @@
-# $NetBSD: std.mpc85xx,v 1.5 2011/06/08 05:03:44 matt Exp $
+# $NetBSD: std.mpc85xx,v 1.6 2011/06/10 16:38:17 matt Exp $
#
# Standard/required options for NetBSD/mpc85xx.
@@ -20,7 +20,8 @@
options PPC_INTR_IMPL="<powerpc/booke/intr.h>"
options PPC_PCI_MACHDEP_IMPL="<powerpc/pci_machdep.h>"
options KERNBASE=0x20000
-options GUR_BASE=0xe0000000
+options GUR_BASE=0xffe00000
+#options USB_FRAG_DMA_WORKAROUND
include "arch/powerpc/conf/files.booke"
include "arch/evbppc/conf/files.mpc85xx"