Module Name: src
Committed By: matt
Date: Fri Jun 10 16:38:17 UTC 2011
Modified Files:
src/sys/arch/evbppc/conf: MPC8536DS MPC8548CDS P2020DS P2020RDB RB800
std.mpc85xx
Log Message:
Change default of GUR_BASE to 0xffe00000 which is used on more recent machines.
Add options GUR_BASE=0xe0000000 to MPC8548CDS and RB800
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/conf/MPC8536DS \
src/sys/arch/evbppc/conf/MPC8548CDS
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/conf/P2020DS \
src/sys/arch/evbppc/conf/P2020RDB
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/conf/RB800
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/conf/std.mpc85xx
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/MPC8536DS
diff -u src/sys/arch/evbppc/conf/MPC8536DS:1.4 src/sys/arch/evbppc/conf/MPC8536DS:1.5
--- src/sys/arch/evbppc/conf/MPC8536DS:1.4 Wed Jun 8 05:03:43 2011
+++ src/sys/arch/evbppc/conf/MPC8536DS Fri Jun 10 16:38:17 2011
@@ -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
@@ -17,9 +17,6 @@
#options UVMHIST
#options UVMHIST_PRINT
-no options GUR_BASE
-options GUR_BASE=0xffe00000
-
options MPC8536
options PIXIS
#options HZ=1000
Index: src/sys/arch/evbppc/conf/MPC8548CDS
diff -u src/sys/arch/evbppc/conf/MPC8548CDS:1.4 src/sys/arch/evbppc/conf/MPC8548CDS:1.5
--- src/sys/arch/evbppc/conf/MPC8548CDS:1.4 Wed Jun 8 05:03:44 2011
+++ src/sys/arch/evbppc/conf/MPC8548CDS Fri Jun 10 16:38:17 2011
@@ -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
Index: src/sys/arch/evbppc/conf/P2020DS
diff -u src/sys/arch/evbppc/conf/P2020DS:1.3 src/sys/arch/evbppc/conf/P2020DS:1.4
--- src/sys/arch/evbppc/conf/P2020DS:1.3 Wed Jun 8 05:03:44 2011
+++ src/sys/arch/evbppc/conf/P2020DS Fri Jun 10 16:38:17 2011
@@ -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
Index: src/sys/arch/evbppc/conf/P2020RDB
diff -u src/sys/arch/evbppc/conf/P2020RDB:1.3 src/sys/arch/evbppc/conf/P2020RDB:1.4
--- src/sys/arch/evbppc/conf/P2020RDB:1.3 Wed Jun 8 05:03:44 2011
+++ src/sys/arch/evbppc/conf/P2020RDB Fri Jun 10 16:38:17 2011
@@ -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
@@ -17,9 +17,6 @@
#options UVMHIST
#options UVMHIST_PRINT
-no options GUR_BASE
-options GUR_BASE=0xffe00000
-
options P2020
options SYS_CLK=100000000
#options HZ=1000
Index: src/sys/arch/evbppc/conf/RB800
diff -u src/sys/arch/evbppc/conf/RB800:1.6 src/sys/arch/evbppc/conf/RB800:1.7
--- src/sys/arch/evbppc/conf/RB800:1.6 Wed Jun 8 05:03:44 2011
+++ src/sys/arch/evbppc/conf/RB800 Fri Jun 10 16:38:17 2011
@@ -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
Index: src/sys/arch/evbppc/conf/std.mpc85xx
diff -u src/sys/arch/evbppc/conf/std.mpc85xx:1.5 src/sys/arch/evbppc/conf/std.mpc85xx:1.6
--- src/sys/arch/evbppc/conf/std.mpc85xx:1.5 Wed Jun 8 05:03:44 2011
+++ src/sys/arch/evbppc/conf/std.mpc85xx Fri Jun 10 16:38:17 2011
@@ -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"
