[src/trunk]: src/sys/arch/evbppc/conf Change default of GUR_BASE to 0xffe0000...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c41e1c12441a
branches:  trunk
changeset: 765928:c41e1c12441a
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jun 10 16:38:17 2011 +0000

description:
Change default of GUR_BASE to 0xffe00000 which is used on more recent machines.
Add options GUR_BASE=0xe0000000 to MPC8548CDS and RB800

diffstat:

 sys/arch/evbppc/conf/MPC8536DS   |  7 ++-----
 sys/arch/evbppc/conf/MPC8548CDS  |  5 +++--
 sys/arch/evbppc/conf/P2020DS     |  9 ++++-----
 sys/arch/evbppc/conf/P2020RDB    |  7 ++-----
 sys/arch/evbppc/conf/RB800       |  5 +++--
 sys/arch/evbppc/conf/std.mpc85xx |  5 +++--
 6 files changed, 17 insertions(+), 21 deletions(-)

diffs (163 lines):

diff -r 6108d294bdd3 -r c41e1c12441a sys/arch/evbppc/conf/MPC8536DS
--- a/sys/arch/evbppc/conf/MPC8536DS    Fri Jun 10 16:31:18 2011 +0000
+++ b/sys/arch/evbppc/conf/MPC8536DS    Fri Jun 10 16:38:17 2011 +0000
@@ -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
diff -r 6108d294bdd3 -r c41e1c12441a sys/arch/evbppc/conf/MPC8548CDS
--- a/sys/arch/evbppc/conf/MPC8548CDS   Fri Jun 10 16:31:18 2011 +0000
+++ b/sys/arch/evbppc/conf/MPC8548CDS   Fri Jun 10 16:38:17 2011 +0000
@@ -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
diff -r 6108d294bdd3 -r c41e1c12441a sys/arch/evbppc/conf/P2020DS
--- a/sys/arch/evbppc/conf/P2020DS      Fri Jun 10 16:31:18 2011 +0000
+++ b/sys/arch/evbppc/conf/P2020DS      Fri Jun 10 16:38:17 2011 +0000
@@ -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
diff -r 6108d294bdd3 -r c41e1c12441a sys/arch/evbppc/conf/P2020RDB
--- a/sys/arch/evbppc/conf/P2020RDB     Fri Jun 10 16:31:18 2011 +0000
+++ b/sys/arch/evbppc/conf/P2020RDB     Fri Jun 10 16:38:17 2011 +0000
@@ -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
diff -r 6108d294bdd3 -r c41e1c12441a sys/arch/evbppc/conf/RB800
--- a/sys/arch/evbppc/conf/RB800        Fri Jun 10 16:31:18 2011 +0000
+++ b/sys/arch/evbppc/conf/RB800        Fri Jun 10 16:38:17 2011 +0000
@@ -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
diff -r 6108d294bdd3 -r c41e1c12441a sys/arch/evbppc/conf/std.mpc85xx
--- a/sys/arch/evbppc/conf/std.mpc85xx  Fri Jun 10 16:31:18 2011 +0000
+++ b/sys/arch/evbppc/conf/std.mpc85xx  Fri Jun 10 16:38:17 2011 +0000
@@ -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"