Fri Feb 21 22:31:58 2014 UTC ()
Rearrange KERNEL_BASE_PHYS


(matt)
diff -r1.16 -r1.17 src/sys/arch/evbarm/conf/BCM5301X
diff -r1.1 -r1.2 src/sys/arch/evbarm/conf/BCM56340
diff -r1.13 -r1.14 src/sys/arch/evbarm/conf/std.bcm53xx
cvs diff -r1.16 -r1.17 src/sys/arch/evbarm/conf/BCM5301X (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/BCM5301X 2013/10/28 22:35:07 1.16
+++ src/sys/arch/evbarm/conf/BCM5301X 2014/02/21 22:31:58 1.17
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# 1#
2# $NetBSD: BCM5301X,v 1.16 2013/10/28 22:35:07 matt Exp $ 2# $NetBSD: BCM5301X,v 1.17 2014/02/21 22:31:58 matt Exp $
3# 3#
4# BCM5301X -- Broadcom BCM5301X Eval Board Kernel 4# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
5# 5#
6 6
7include "arch/evbarm/conf/std.bcm53xx" 7include "arch/evbarm/conf/std.bcm53xx"
8 8
9# estimated number of users 9# estimated number of users
10 10
11maxusers 32 11maxusers 32
12 12
13# Standard system options 13# Standard system options
14 14
15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
@@ -18,26 +18,27 @@ options RTC_OFFSET=0 # hardware clock i @@ -18,26 +18,27 @@ options RTC_OFFSET=0 # hardware clock i
18# CPU options 18# CPU options
19 19
20#makeoptions DEFCOPTS="-O0" 20#makeoptions DEFCOPTS="-O0"
21options UVMHIST 21options UVMHIST
22#options UVMHIST_PRINT,A9WDT_PERIOD_DEFAULT=30 22#options UVMHIST_PRINT,A9WDT_PERIOD_DEFAULT=30
23options BCM53XX_CONSOLE_EARLY 23options BCM53XX_CONSOLE_EARLY
24options BCMETH_COUNTERS 24options BCMETH_COUNTERS
25#options MULTIPROCESSOR 25#options MULTIPROCESSOR
26options CPU_CORTEXA9 26options CPU_CORTEXA9
27#options MEMSIZE=256 27#options MEMSIZE=256
28options BCM5301X 28options BCM5301X
29options PMAPCOUNTERS 29options PMAPCOUNTERS
30options BUSDMA_COUNTERS 30options BUSDMA_COUNTERS
 31makeoptions KERNEL_BASE_PHYS="0x80100000"
31 32
32# Architecture options 33# Architecture options
33 34
34# File systems 35# File systems
35 36
36file-system FFS # UFS 37file-system FFS # UFS
37#file-system LFS # log-structured file system 38#file-system LFS # log-structured file system
38file-system MFS # memory file system 39file-system MFS # memory file system
39file-system NFS # Network file system 40file-system NFS # Network file system
40#file-system ADOSFS # AmigaDOS-compatible file system 41#file-system ADOSFS # AmigaDOS-compatible file system
41#file-system EXT2FS # second extended file system (linux) 42#file-system EXT2FS # second extended file system (linux)
42file-system CD9660 # ISO 9660 + Rock Ridge file system 43file-system CD9660 # ISO 9660 + Rock Ridge file system
43file-system MSDOSFS # MS-DOS file system 44file-system MSDOSFS # MS-DOS file system
cvs diff -r1.1 -r1.2 src/sys/arch/evbarm/conf/BCM56340 (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/BCM56340 2013/10/28 22:35:07 1.1
+++ src/sys/arch/evbarm/conf/BCM56340 2014/02/21 22:31:58 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# 1#
2# $NetBSD: BCM56340,v 1.1 2013/10/28 22:35:07 matt Exp $ 2# $NetBSD: BCM56340,v 1.2 2014/02/21 22:31:58 matt Exp $
3# 3#
4# BCM5301X -- Broadcom BCM5301X Eval Board Kernel 4# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
5# 5#
6 6
7include "arch/evbarm/conf/std.bcm53xx" 7include "arch/evbarm/conf/std.bcm53xx"
8 8
9# estimated number of users 9# estimated number of users
10 10
11maxusers 32 11maxusers 32
12 12
13# Standard system options 13# Standard system options
14 14
15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
@@ -18,26 +18,27 @@ options RTC_OFFSET=0 # hardware clock i @@ -18,26 +18,27 @@ options RTC_OFFSET=0 # hardware clock i
18# CPU options 18# CPU options
19 19
20#makeoptions DEFCOPTS="-O0" 20#makeoptions DEFCOPTS="-O0"
21options UVMHIST 21options UVMHIST
22#options UVMHIST_PRINT,A9WDT_PERIOD_DEFAULT=30 22#options UVMHIST_PRINT,A9WDT_PERIOD_DEFAULT=30
23options BCM53XX_CONSOLE_EARLY 23options BCM53XX_CONSOLE_EARLY
24options BCMETH_COUNTERS 24options BCMETH_COUNTERS
25#options MULTIPROCESSOR 25#options MULTIPROCESSOR
26options CPU_CORTEXA9 26options CPU_CORTEXA9
27#options MEMSIZE=256 27#options MEMSIZE=256
28options BCM563XX 28options BCM563XX
29options PMAPCOUNTERS 29options PMAPCOUNTERS
30options BUSDMA_COUNTERS 30options BUSDMA_COUNTERS
 31makeoptions KERNEL_BASE_PHYS="0x60100000"
31 32
32# Architecture options 33# Architecture options
33 34
34# File systems 35# File systems
35 36
36file-system FFS # UFS 37file-system FFS # UFS
37#file-system LFS # log-structured file system 38#file-system LFS # log-structured file system
38file-system MFS # memory file system 39file-system MFS # memory file system
39file-system NFS # Network file system 40file-system NFS # Network file system
40#file-system ADOSFS # AmigaDOS-compatible file system 41#file-system ADOSFS # AmigaDOS-compatible file system
41#file-system EXT2FS # second extended file system (linux) 42#file-system EXT2FS # second extended file system (linux)
42file-system CD9660 # ISO 9660 + Rock Ridge file system 43file-system CD9660 # ISO 9660 + Rock Ridge file system
43file-system MSDOSFS # MS-DOS file system 44file-system MSDOSFS # MS-DOS file system
@@ -141,27 +142,27 @@ options RNDVERBOSE # Verbose rnd messag @@ -141,27 +142,27 @@ options RNDVERBOSE # Verbose rnd messag
141options DIAGNOSTIC # internally consistency checks 142options DIAGNOSTIC # internally consistency checks
142options DEBUG 143options DEBUG
143#options LOCKDEBUG # Enable lock debugging 144#options LOCKDEBUG # Enable lock debugging
144#options PMAP_DEBUG # Enable pmap_debug_level code 145#options PMAP_DEBUG # Enable pmap_debug_level code
145#options IPKDB # remote kernel debugging 146#options IPKDB # remote kernel debugging
146options VERBOSE_INIT_ARM # verbose bootstraping messages 147options VERBOSE_INIT_ARM # verbose bootstraping messages
147options DDB # in-kernel debugger 148options DDB # in-kernel debugger
148options DDB_ONPANIC=1 149options DDB_ONPANIC=1
149options DDB_HISTORY_SIZE=100 # Enable history editing in DDB 150options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
150options DDB_COMMANDONENTER="show event" 151options DDB_COMMANDONENTER="show event"
151options DB_MAX_LINE=INT_MAX 152options DB_MAX_LINE=INT_MAX
152#options KGDB 153#options KGDB
153makeoptions DEBUG="-g" # compile full symbol table 154makeoptions DEBUG="-g" # compile full symbol table
154options SYMTAB_SPACE=575000 155options SYMTAB_SPACE=590000
155 156
156## USB Debugging options 157## USB Debugging options
157options USB_DEBUG 158options USB_DEBUG
158options EHCI_DEBUG 159options EHCI_DEBUG
159options OHCI_DEBUG 160options OHCI_DEBUG
160options UHUB_DEBUG 161options UHUB_DEBUG
161 162
162 163
163# Valid options for BOOT_ARGS: 164# Valid options for BOOT_ARGS:
164# single Boot to single user only 165# single Boot to single user only
165# kdb Give control to kernel debugger 166# kdb Give control to kernel debugger
166# ask Ask for file name to reboot from 167# ask Ask for file name to reboot from
167# pmapdebug=<n> If PMAP_DEBUG, set pmap_debug_level to <n> 168# pmapdebug=<n> If PMAP_DEBUG, set pmap_debug_level to <n>
cvs diff -r1.13 -r1.14 src/sys/arch/evbarm/conf/std.bcm53xx (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/std.bcm53xx 2013/11/01 18:41:06 1.13
+++ src/sys/arch/evbarm/conf/std.bcm53xx 2014/02/21 22:31:58 1.14
@@ -1,35 +1,33 @@ @@ -1,35 +1,33 @@
1# $NetBSD: std.bcm53xx,v 1.13 2013/11/01 18:41:06 skrll Exp $ 1# $NetBSD: std.bcm53xx,v 1.14 2014/02/21 22:31:58 matt Exp $
2# 2#
3# standard NetBSD/evbarm for BCM5301X options 3# standard NetBSD/evbarm for BCM5301X options
4 4
5machine evbarm arm 5machine evbarm arm
6include "arch/evbarm/conf/std.evbarm" 6include "arch/evbarm/conf/std.evbarm"
7 7
8# Pull in BCM53xx config definitions. 8# Pull in BCM53xx config definitions.
9include "arch/evbarm/conf/files.bcm53xx" 9include "arch/evbarm/conf/files.bcm53xx"
10 10
11options SOSEND_NO_LOAN 11options SOSEND_NO_LOAN
12options COM_TOLERANCE=40 12options COM_TOLERANCE=40
13options FPU_VFP 13options FPU_VFP
14options CORTEX_PMC 14options CORTEX_PMC
15options _ARM32_NEED_BUS_DMA_BOUNCE 15options _ARM32_NEED_BUS_DMA_BOUNCE
16options PMAP_NEED_ALLOC_POOLPAGE 16options PMAP_NEED_ALLOC_POOLPAGE
17options __HAVE_MM_MD_DIRECT_MAPPED_PHYS 17options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
18options __HAVE_MM_MD_CACHE_ALIASING 18options __HAVE_MM_MD_CACHE_ALIASING
19options __HAVE_FAST_SOFTINTS # should be in types.h 19options __HAVE_FAST_SOFTINTS # should be in types.h
20options __HAVE_CPU_UAREA_ALLOC_IDLELWP 20options __HAVE_CPU_UAREA_ALLOC_IDLELWP
21options __HAVE_CPU_COUNTER 21options __HAVE_CPU_COUNTER
22options __HAVE_ATOMIC64_OPS 
23options __HAVE_PCI_CONF_HOOK 22options __HAVE_PCI_CONF_HOOK
24options TPIDRPRW_IS_CURCPU 23options TPIDRPRW_IS_CURCPU
25options KERNEL_BASE_EXT=0x80000000 24options KERNEL_BASE_EXT=0x80000000
26options EVBARM_BOARDTYPE="bcm53xx" 25options EVBARM_BOARDTYPE="bcm53xx"
27 26
28makeoptions BOARDTYPE="bcm53xx" 27makeoptions BOARDTYPE="bcm53xx"
29makeoptions KERNEL_BASE_PHYS="0x60100000" 
30makeoptions KERNEL_BASE_VIRT="0x80100000" 28makeoptions KERNEL_BASE_VIRT="0x80100000"
31makeoptions LOADADDRESS="0x00100000" 29makeoptions LOADADDRESS="0x00100000"
32makeoptions BOARDMKFRAG="${THISARM}/conf/mk.bcm53xx" 30makeoptions BOARDMKFRAG="${THISARM}/conf/mk.bcm53xx"
33 31
34options ARM_INTR_IMPL="<arch/arm/broadcom/bcm53xx_intr.h>" 32options ARM_INTR_IMPL="<arch/arm/broadcom/bcm53xx_intr.h>"
35options ARM_GENERIC_TODR 33options ARM_GENERIC_TODR