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
cvs diff -r1.4 -r1.5 src/sys/arch/evbppc/conf/MPC8536DS (expand / switch to unified diff)

--- 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,35 +1,32 @@ @@ -1,35 +1,32 @@
1# $NetBSD: MPC8536DS,v 1.4 2011/06/08 05:03:43 matt Exp $ 1# $NetBSD: MPC8536DS,v 1.5 2011/06/10 16:38:17 matt Exp $
2# 2#
3# MPC8536DS -- everything that's currently supported 3# MPC8536DS -- everything that's currently supported
4# 4#
5 5
6include "arch/evbppc/conf/std.mpc85xx" 6include "arch/evbppc/conf/std.mpc85xx"
7 7
8options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9 9
10ident "MPC8536DS-$Revision: 1.4 $" 10ident "MPC8536DS-$Revision: 1.5 $"
11 11
12maxusers 32 12maxusers 32
13 13
14makeoptions NEED_BINARY="yes" 14makeoptions NEED_BINARY="yes"
15makeoptions NEED_UBOOTIMAGE="yes" 15makeoptions NEED_UBOOTIMAGE="yes"
16 16
17#options UVMHIST 17#options UVMHIST
18#options UVMHIST_PRINT 18#options UVMHIST_PRINT
19 19
20no options GUR_BASE 
21options GUR_BASE=0xffe00000 
22 
23options MPC8536 20options MPC8536
24options PIXIS 21options PIXIS
25#options HZ=1000 22#options HZ=1000
26 23
27#options INSECURE # disable kernel security levels 24#options INSECURE # disable kernel security levels
28#options NTP # NTP phase/frequency locked loop 25#options NTP # NTP phase/frequency locked loop
29options KTRACE # system call tracing via ktrace(1) 26options KTRACE # system call tracing via ktrace(1)
30 27
31options SYSVMSG # System V message queues 28options SYSVMSG # System V message queues
32options SYSVSEM # System V semaphores 29options SYSVSEM # System V semaphores
33options SYSVSHM # System V shared memory 30options SYSVSHM # System V shared memory
34 31
35options USERCONF # userconf(4) support 32options USERCONF # userconf(4) support
cvs diff -r1.4 -r1.5 src/sys/arch/evbppc/conf/MPC8548CDS (expand / switch to unified diff)

--- 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,34 +1,35 @@ @@ -1,34 +1,35 @@
1# $NetBSD: MPC8548CDS,v 1.4 2011/06/08 05:03:44 matt Exp $ 1# $NetBSD: MPC8548CDS,v 1.5 2011/06/10 16:38:17 matt Exp $
2# 2#
3# MPC8548CDS -- everything that's currently supported 3# MPC8548CDS -- everything that's currently supported
4# 4#
5 5
6include "arch/evbppc/conf/std.mpc85xx" 6include "arch/evbppc/conf/std.mpc85xx"
7 7
8options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9 9
10ident "MPC8548CDS-$Revision: 1.4 $" 10ident "MPC8548CDS-$Revision: 1.5 $"
11 11
12maxusers 32 12maxusers 32
13 13
14makeoptions NEED_BINARY="yes" 14makeoptions NEED_BINARY="yes"
15makeoptions NEED_UBOOTIMAGE="yes" 15makeoptions NEED_UBOOTIMAGE="yes"
16 16
17#options UVMHIST 17#options UVMHIST
18#options UVMHIST_PRINT 18#options UVMHIST_PRINT
19 19
20options MPC8548 20options MPC8548
21options CADMUS 21options CADMUS
 22options GUR_BASE=0xe0000000
22#options HZ=1000 23#options HZ=1000
23 24
24#options INSECURE # disable kernel security levels 25#options INSECURE # disable kernel security levels
25#options NTP # NTP phase/frequency locked loop 26#options NTP # NTP phase/frequency locked loop
26options KTRACE # system call tracing via ktrace(1) 27options KTRACE # system call tracing via ktrace(1)
27 28
28options SYSVMSG # System V message queues 29options SYSVMSG # System V message queues
29options SYSVSEM # System V semaphores 30options SYSVSEM # System V semaphores
30options SYSVSHM # System V shared memory 31options SYSVSHM # System V shared memory
31 32
32options USERCONF # userconf(4) support 33options USERCONF # userconf(4) support
33#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 34#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
34#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel 35#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
cvs diff -r1.3 -r1.4 src/sys/arch/evbppc/conf/P2020DS (expand / switch to unified diff)

--- 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,33 +1,30 @@ @@ -1,33 +1,30 @@
1# $NetBSD: P2020DS,v 1.3 2011/06/08 05:03:44 matt Exp $ 1# $NetBSD: P2020DS,v 1.4 2011/06/10 16:38:17 matt Exp $
2# 2#
3# P2020DS -- everything that's currently supported 3# P2020DS -- everything that's currently supported
4# 4#
5# 5#
6 6
7include "arch/evbppc/conf/std.mpc85xx" 7include "arch/evbppc/conf/std.mpc85xx"
8 8
9options INCLUDE_CONFIG_FILE # embed config file in kernel binary 9options INCLUDE_CONFIG_FILE # embed config file in kernel binary
10 10
11ident "P2020DS-$Revision: 1.3 $" 11ident "P2020DS-$Revision: 1.4 $"
12 12
13maxusers 32 13maxusers 32
14 14
15#options UVMHIST 15#options UVMHIST
16#options UVMHIST_PRINT 16#options UVMHIST_PRINT
17 17
18no options GUR_BASE 
19options GUR_BASE=0xffe00000 
20 
21options P2020 18options P2020
22options PIXIS 19options PIXIS
23#options SYS_CLK=100000000 20#options SYS_CLK=100000000
24#options HZ=1000 21#options HZ=1000
25 22
26makeoptions NEED_BINARY="yes" 23makeoptions NEED_BINARY="yes"
27makeoptions NEED_UBOOTIMAGE="yes" 24makeoptions NEED_UBOOTIMAGE="yes"
28 25
29#options INSECURE # disable kernel security levels 26#options INSECURE # disable kernel security levels
30#options NTP # NTP phase/frequency locked loop 27#options NTP # NTP phase/frequency locked loop
31options KTRACE # system call tracing via ktrace(1) 28options KTRACE # system call tracing via ktrace(1)
32 29
33options SYSVMSG # System V message queues 30options SYSVMSG # System V message queues
@@ -183,26 +180,28 @@ pci* at ppb? @@ -183,26 +180,28 @@ pci* at ppb?
183 180
184#ohci1 at pci1 dev 0 function 2 181#ohci1 at pci1 dev 0 function 2
185#ehci1 at pci1 dev 0 function 3 182#ehci1 at pci1 dev 0 function 3
186#ohci* at pci? dev ? function ? 183#ohci* at pci? dev ? function ?
187#ehci* at pci? dev ? function ? 184#ehci* at pci? dev ? function ?
188#uhci* at pci? dev ? function ? 185#uhci* at pci? dev ? function ?
189usb* at ehci? 186usb* at ehci?
190#usb* at ohci? 187#usb* at ohci?
191#usb* at uhci? 188#usb* at uhci?
192uhub* at usb? 189uhub* at usb?
193umass* at uhub? port ? 190umass* at uhub? port ?
194scsibus* at umass? channel ? 191scsibus* at umass? channel ?
195sd* at scsibus? target ? lun ? 192sd* at scsibus? target ? lun ?
 193ugen* at uhub? port ?
 194uhub* at uhub? port ?
196 195
197#sdhc* at cpunode? # sdmmc 196#sdhc* at cpunode? # sdmmc
198#sdmmc* at sdhc? # SD/MMC bus 197#sdmmc* at sdhc? # SD/MMC bus
199#ld* at sdmmc? 198#ld* at sdmmc?
200 199
201ahcisata* at pci? dev ? function ? 200ahcisata* at pci? dev ? function ?
202atabus0 at ahcisata? channel 0 201atabus0 at ahcisata? channel 0
203atabus1 at ahcisata? channel 1 202atabus1 at ahcisata? channel 1
204atabus2 at ahcisata? channel 2 203atabus2 at ahcisata? channel 2
205atabus3 at ahcisata? channel 3 204atabus3 at ahcisata? channel 3
206atabus* at ahcisata? channel ? 205atabus* at ahcisata? channel ?
207aceride* at pci? dev ? function ? 206aceride* at pci? dev ? function ?
208atabus* at aceride? channel ? 207atabus* at aceride? channel ?
cvs diff -r1.3 -r1.4 src/sys/arch/evbppc/conf/P2020RDB (expand / switch to unified diff)

--- 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,35 +1,32 @@ @@ -1,35 +1,32 @@
1# $NetBSD: P2020RDB,v 1.3 2011/06/08 05:03:44 matt Exp $ 1# $NetBSD: P2020RDB,v 1.4 2011/06/10 16:38:17 matt Exp $
2# 2#
3# P2020RBD -- everything that's currently supported 3# P2020RBD -- everything that's currently supported
4# 4#
5 5
6include "arch/evbppc/conf/std.mpc85xx" 6include "arch/evbppc/conf/std.mpc85xx"
7 7
8options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9 9
10ident "P2020RBD-$Revision: 1.3 $" 10ident "P2020RBD-$Revision: 1.4 $"
11 11
12maxusers 32 12maxusers 32
13 13
14makeoptions NEED_BINARY="yes" 14makeoptions NEED_BINARY="yes"
15makeoptions NEED_UBOOTIMAGE="yes" 15makeoptions NEED_UBOOTIMAGE="yes"
16 16
17#options UVMHIST 17#options UVMHIST
18#options UVMHIST_PRINT 18#options UVMHIST_PRINT
19 19
20no options GUR_BASE 
21options GUR_BASE=0xffe00000 
22 
23options P2020 20options P2020
24options SYS_CLK=100000000 21options SYS_CLK=100000000
25#options HZ=1000 22#options HZ=1000
26 23
27#options INSECURE # disable kernel security levels 24#options INSECURE # disable kernel security levels
28#options NTP # NTP phase/frequency locked loop 25#options NTP # NTP phase/frequency locked loop
29options KTRACE # system call tracing via ktrace(1) 26options KTRACE # system call tracing via ktrace(1)
30 27
31options SYSVMSG # System V message queues 28options SYSVMSG # System V message queues
32options SYSVSEM # System V semaphores 29options SYSVSEM # System V semaphores
33options SYSVSHM # System V shared memory 30options SYSVSHM # System V shared memory
34 31
35options USERCONF # userconf(4) support 32options USERCONF # userconf(4) support
cvs diff -r1.6 -r1.7 src/sys/arch/evbppc/conf/RB800 (expand / switch to unified diff)

--- 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,31 +1,32 @@ @@ -1,31 +1,32 @@
1# $NetBSD: RB800,v 1.6 2011/06/08 05:03:44 matt Exp $ 1# $NetBSD: RB800,v 1.7 2011/06/10 16:38:17 matt Exp $
2# 2#
3# RB800 -- everything that's currently supported 3# RB800 -- everything that's currently supported
4# 4#
5 5
6include "arch/evbppc/conf/std.mpc85xx" 6include "arch/evbppc/conf/std.mpc85xx"
7 7
8options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9 9
10ident "RB800-$Revision: 1.6 $" 10ident "RB800-$Revision: 1.7 $"
11 11
12maxusers 32 12maxusers 32
13 13
14#options UVMHIST 14#options UVMHIST
15#options UVMHIST_PRINT 15#options UVMHIST_PRINT
16 16
17options MPC8544 17options MPC8544
18options PPC_HAVE_SPE 18options PPC_HAVE_SPE
 19options GUR_BASE=0xe0000000
19 20
20#options INSECURE # disable kernel security levels 21#options INSECURE # disable kernel security levels
21#options NTP # NTP phase/frequency locked loop 22#options NTP # NTP phase/frequency locked loop
22options KTRACE # system call tracing via ktrace(1) 23options KTRACE # system call tracing via ktrace(1)
23 24
24options SYSVMSG # System V message queues 25options SYSVMSG # System V message queues
25options SYSVSEM # System V semaphores 26options SYSVSEM # System V semaphores
26options SYSVSHM # System V shared memory 27options SYSVSHM # System V shared memory
27 28
28options USERCONF # userconf(4) support 29options USERCONF # userconf(4) support
29#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 30#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
30#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel 31#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
31 32
cvs diff -r1.5 -r1.6 src/sys/arch/evbppc/conf/std.mpc85xx (expand / switch to unified diff)

--- 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,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: std.mpc85xx,v 1.5 2011/06/08 05:03:44 matt Exp $ 1# $NetBSD: std.mpc85xx,v 1.6 2011/06/10 16:38:17 matt Exp $
2# 2#
3# Standard/required options for NetBSD/mpc85xx. 3# Standard/required options for NetBSD/mpc85xx.
4 4
5machine evbppc powerpc 5machine evbppc powerpc
6include "conf/std" # MI standard options 6include "conf/std" # MI standard options
7 7
8# standard ("mandatory") kernel options. 8# standard ("mandatory") kernel options.
9options PPC_BOOKE # Freescale e500 family 9options PPC_BOOKE # Freescale e500 family
10options EVBPPC_HAS_MBR # Use MBR format (needed for SDCARD booting) 10options EVBPPC_HAS_MBR # Use MBR format (needed for SDCARD booting)
11 11
12# Executable support: 12# Executable support:
13options EXEC_ELF32 # (native) ELF32 binary support 13options EXEC_ELF32 # (native) ELF32 binary support
14options EXEC_SCRIPT # shell script support 14options EXEC_SCRIPT # shell script support
15 15
16makeoptions TEXTADDR=0x20000 16makeoptions TEXTADDR=0x20000
17makeoptions BOARDTYPE="mpc85xx" 17makeoptions BOARDTYPE="mpc85xx"
18makeoptions PPCDIR="booke" 18makeoptions PPCDIR="booke"
19 19
20options PPC_INTR_IMPL="<powerpc/booke/intr.h>" 20options PPC_INTR_IMPL="<powerpc/booke/intr.h>"
21options PPC_PCI_MACHDEP_IMPL="<powerpc/pci_machdep.h>" 21options PPC_PCI_MACHDEP_IMPL="<powerpc/pci_machdep.h>"
22options KERNBASE=0x20000 22options KERNBASE=0x20000
23options GUR_BASE=0xe0000000 23options GUR_BASE=0xffe00000
 24#options USB_FRAG_DMA_WORKAROUND
24 25
25include "arch/powerpc/conf/files.booke" 26include "arch/powerpc/conf/files.booke"
26include "arch/evbppc/conf/files.mpc85xx" 27include "arch/evbppc/conf/files.mpc85xx"