Mon Jun 17 04:38:14 2013 UTC ()
On the 4430/5430, console is in peripheral space, not core.


(matt)
diff -r1.11 -r1.12 src/sys/arch/evbarm/beagle/beagle.h
cvs diff -r1.11 -r1.12 src/sys/arch/evbarm/beagle/Attic/beagle.h (switch to unified diff)

--- src/sys/arch/evbarm/beagle/Attic/beagle.h 2013/06/16 16:48:23 1.11
+++ src/sys/arch/evbarm/beagle/Attic/beagle.h 2013/06/17 04:38:14 1.12
@@ -1,150 +1,150 @@ @@ -1,150 +1,150 @@
1/* $NetBSD: beagle.h,v 1.11 2013/06/16 16:48:23 matt Exp $ */ 1/* $NetBSD: beagle.h,v 1.12 2013/06/17 04:38:14 matt Exp $ */
2/* 2/*
3 * Copyright (c) 2007 Microsoft 3 * Copyright (c) 2007 Microsoft
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 3. All advertising materials mentioning features or use of this software 14 * 3. All advertising materials mentioning features or use of this software
15 * must display the following acknowledgement: 15 * must display the following acknowledgement:
16 * This product includes software developed by Microsoft 16 * This product includes software developed by Microsoft
17 * 17 *
18 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 18 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
19 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 19 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
20 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 20 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21 * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTERS BE LIABLE FOR ANY DIRECT, 21 * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTERS BE LIABLE FOR ANY DIRECT,
22 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 22 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
23 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 23 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE. 28 * SUCH DAMAGE.
29 */ 29 */
30 30
31#ifndef _EVBARM_BEAGLE_BEAGLE_H 31#ifndef _EVBARM_BEAGLE_BEAGLE_H
32#define _EVBARM_BEAGLE_BEAGLE_H 32#define _EVBARM_BEAGLE_BEAGLE_H
33 33
34#include <arm/omap/omap2_reg.h> 34#include <arm/omap/omap2_reg.h>
35 35
36/* 36/*
37 * Memory will mapped 1:1 VA:PA starting at 0x80000000 37 * Memory will mapped 1:1 VA:PA starting at 0x80000000
38 * Kernel VM space: 512MB at KERNEL_VM_BASE 38 * Kernel VM space: 512MB at KERNEL_VM_BASE
39 */ 39 */
40#define KERNEL_VM_BASE 0xc0000000 40#define KERNEL_VM_BASE 0xc0000000
41#define KERNEL_VM_SIZE 0x20000000 41#define KERNEL_VM_SIZE 0x20000000
42 42
43#ifdef OMAP_3430 43#ifdef OMAP_3430
44#define OMAP_L4_CORE_BASE OMAP3430_L4_CORE_BASE 44#define OMAP_L4_CORE_BASE OMAP3430_L4_CORE_BASE
45#define OMAP_L4_CORE_SIZE OMAP3430_L4_CORE_SIZE 45#define OMAP_L4_CORE_SIZE OMAP3430_L4_CORE_SIZE
46#define OMAP_L4_PERIPHERAL_BASE OMAP3430_L4_PERIPHERAL_BASE 46#define OMAP_L4_PERIPHERAL_BASE OMAP3430_L4_PERIPHERAL_BASE
47#define OMAP_L4_PERIPHERAL_SIZE OMAP3430_L4_PERIPHERAL_SIZE 47#define OMAP_L4_PERIPHERAL_SIZE OMAP3430_L4_PERIPHERAL_SIZE
48#define OMAP_L4_WAKEUP_BASE OMAP3430_L4_WAKEUP_BASE 48#define OMAP_L4_WAKEUP_BASE OMAP3430_L4_WAKEUP_BASE
49#define OMAP_L4_WAKEUP_SIZE OMAP3430_L4_WAKEUP_SIZE 49#define OMAP_L4_WAKEUP_SIZE OMAP3430_L4_WAKEUP_SIZE
50#define OMAP_SDRC_BASE OMAP3530_SDRC_BASE 50#define OMAP_SDRC_BASE OMAP3530_SDRC_BASE
51#define OMAP_SDRC_SIZE OMAP3530_SDRC_SIZE 51#define OMAP_SDRC_SIZE OMAP3530_SDRC_SIZE
52#endif 52#endif
53 53
54#ifdef OMAP_3530 54#ifdef OMAP_3530
55#define OMAP_L4_CORE_BASE OMAP3530_L4_CORE_BASE 55#define OMAP_L4_CORE_BASE OMAP3530_L4_CORE_BASE
56#define OMAP_L4_CORE_SIZE OMAP3530_L4_CORE_SIZE 56#define OMAP_L4_CORE_SIZE OMAP3530_L4_CORE_SIZE
57#define OMAP_L4_PERIPHERAL_BASE OMAP3530_L4_PERIPHERAL_BASE 57#define OMAP_L4_PERIPHERAL_BASE OMAP3530_L4_PERIPHERAL_BASE
58#define OMAP_L4_PERIPHERAL_SIZE OMAP3530_L4_PERIPHERAL_SIZE 58#define OMAP_L4_PERIPHERAL_SIZE OMAP3530_L4_PERIPHERAL_SIZE
59#define OMAP_L4_WAKEUP_BASE OMAP3530_L4_WAKEUP_BASE 59#define OMAP_L4_WAKEUP_BASE OMAP3530_L4_WAKEUP_BASE
60#define OMAP_L4_WAKEUP_SIZE OMAP3530_L4_WAKEUP_SIZE 60#define OMAP_L4_WAKEUP_SIZE OMAP3530_L4_WAKEUP_SIZE
61#define OMAP_SDRC_BASE OMAP3530_SDRC_BASE 61#define OMAP_SDRC_BASE OMAP3530_SDRC_BASE
62#define OMAP_SDRC_SIZE OMAP3530_SDRC_SIZE 62#define OMAP_SDRC_SIZE OMAP3530_SDRC_SIZE
63#endif 63#endif
64 64
65#ifdef OMAP_4430 65#ifdef OMAP_4430
66#define OMAP_L4_CORE_BASE OMAP4430_L4_CORE_BASE 66#define OMAP_L4_CORE_BASE OMAP4430_L4_CORE_BASE
67#define OMAP_L4_CORE_SIZE OMAP4430_L4_CORE_SIZE 67#define OMAP_L4_CORE_SIZE OMAP4430_L4_CORE_SIZE
68#define OMAP_L4_PERIPHERAL_BASE OMAP4430_L4_PERIPHERAL_BASE 68#define OMAP_L4_PERIPHERAL_BASE OMAP4430_L4_PERIPHERAL_BASE
69#define OMAP_L4_PERIPHERAL_SIZE OMAP4430_L4_PERIPHERAL_SIZE 69#define OMAP_L4_PERIPHERAL_SIZE OMAP4430_L4_PERIPHERAL_SIZE
70#define OMAP_L4_WAKEUP_BASE OMAP4430_L4_WAKEUP_BASE 70#define OMAP_L4_WAKEUP_BASE OMAP4430_L4_WAKEUP_BASE
71#define OMAP_L4_WAKEUP_SIZE OMAP4430_L4_WAKEUP_SIZE 71#define OMAP_L4_WAKEUP_SIZE OMAP4430_L4_WAKEUP_SIZE
72#define OMAP_L4_ABE_BASE OMAP4430_L4_ABE_BASE 72#define OMAP_L4_ABE_BASE OMAP4430_L4_ABE_BASE
73#define OMAP_L4_ABE_SIZE OMAP4430_L4_ABE_SIZE 73#define OMAP_L4_ABE_SIZE OMAP4430_L4_ABE_SIZE
74#define OMAP_EMIF1_BASE OMAP4430_EMIF1_BASE 74#define OMAP_EMIF1_BASE OMAP4430_EMIF1_BASE
75#define OMAP_EMIF1_SIZE OMAP4430_EMIF1_SIZE 75#define OMAP_EMIF1_SIZE OMAP4430_EMIF1_SIZE
76#define OMAP_EMIF2_BASE OMAP4430_EMIF2_BASE 76#define OMAP_EMIF2_BASE OMAP4430_EMIF2_BASE
77#define OMAP_EMIF2_SIZE OMAP4430_EMIF2_SIZE 77#define OMAP_EMIF2_SIZE OMAP4430_EMIF2_SIZE
78#endif 78#endif
79 79
80#ifdef OMAP_5430 80#ifdef OMAP_5430
81#define OMAP_L4_CORE_BASE OMAP5430_L4_CORE_BASE 81#define OMAP_L4_CORE_BASE OMAP5430_L4_CORE_BASE
82#define OMAP_L4_CORE_SIZE OMAP5430_L4_CORE_SIZE 82#define OMAP_L4_CORE_SIZE OMAP5430_L4_CORE_SIZE
83#define OMAP_L4_PERIPHERAL_BASE OMAP5430_L4_PERIPHERAL_BASE 83#define OMAP_L4_PERIPHERAL_BASE OMAP5430_L4_PERIPHERAL_BASE
84#define OMAP_L4_PERIPHERAL_SIZE OMAP5430_L4_PERIPHERAL_SIZE 84#define OMAP_L4_PERIPHERAL_SIZE OMAP5430_L4_PERIPHERAL_SIZE
85#define OMAP_L4_WAKEUP_BASE OMAP5430_L4_WAKEUP_BASE 85#define OMAP_L4_WAKEUP_BASE OMAP5430_L4_WAKEUP_BASE
86#define OMAP_L4_WAKEUP_SIZE OMAP5430_L4_WAKEUP_SIZE 86#define OMAP_L4_WAKEUP_SIZE OMAP5430_L4_WAKEUP_SIZE
87#define OMAP_L4_ABE_BASE OMAP5430_L4_ABE_BASE 87#define OMAP_L4_ABE_BASE OMAP5430_L4_ABE_BASE
88#define OMAP_L4_ABE_SIZE OMAP5430_L4_ABE_SIZE 88#define OMAP_L4_ABE_SIZE OMAP5430_L4_ABE_SIZE
89#define OMAP_EMIF1_BASE OMAP5430_EMIF1_BASE 89#define OMAP_EMIF1_BASE OMAP5430_EMIF1_BASE
90#define OMAP_EMIF1_SIZE OMAP5430_EMIF1_SIZE 90#define OMAP_EMIF1_SIZE OMAP5430_EMIF1_SIZE
91#define OMAP_EMIF2_BASE OMAP5430_EMIF2_BASE 91#define OMAP_EMIF2_BASE OMAP5430_EMIF2_BASE
92#define OMAP_EMIF2_SIZE OMAP5430_EMIF2_SIZE 92#define OMAP_EMIF2_SIZE OMAP5430_EMIF2_SIZE
93#endif 93#endif
94 94
95#ifdef TI_AM335X 95#ifdef TI_AM335X
96#define OMAP_L4_CORE_BASE TI_AM335X_L4_WAKEUP_BASE 96#define OMAP_L4_CORE_BASE TI_AM335X_L4_WAKEUP_BASE
97#define OMAP_L4_CORE_SIZE TI_AM335X_L4_WAKEUP_SIZE 97#define OMAP_L4_CORE_SIZE TI_AM335X_L4_WAKEUP_SIZE
98#define OMAP_L4_PERIPHERAL_BASE TI_AM335X_L4_PERIPHERAL_BASE 98#define OMAP_L4_PERIPHERAL_BASE TI_AM335X_L4_PERIPHERAL_BASE
99#define OMAP_L4_PERIPHERAL_SIZE TI_AM335X_L4_PERIPHERAL_SIZE 99#define OMAP_L4_PERIPHERAL_SIZE TI_AM335X_L4_PERIPHERAL_SIZE
100#define OMAP_L4_FAST_BASE TI_AM335X_L4_FAST_BASE 100#define OMAP_L4_FAST_BASE TI_AM335X_L4_FAST_BASE
101#define OMAP_L4_FAST_SIZE TI_AM335X_L4_FAST_SIZE 101#define OMAP_L4_FAST_SIZE TI_AM335X_L4_FAST_SIZE
102#define OMAP_EMIF1_BASE TI_AM335X_EMIF1_BASE 102#define OMAP_EMIF1_BASE TI_AM335X_EMIF1_BASE
103#define OMAP_EMIF1_SIZE TI_AM335X_EMIF1_SIZE 103#define OMAP_EMIF1_SIZE TI_AM335X_EMIF1_SIZE
104#endif 104#endif
105 105
106#ifdef TI_DM37XX 106#ifdef TI_DM37XX
107#define OMAP_L4_CORE_BASE TI_DM37XX_L4_CORE_BASE 107#define OMAP_L4_CORE_BASE TI_DM37XX_L4_CORE_BASE
108#define OMAP_L4_CORE_SIZE TI_DM37XX_L4_CORE_SIZE 108#define OMAP_L4_CORE_SIZE TI_DM37XX_L4_CORE_SIZE
109#define OMAP_L4_PERIPHERAL_BASE TI_DM37XX_L4_PERIPHERAL_BASE 109#define OMAP_L4_PERIPHERAL_BASE TI_DM37XX_L4_PERIPHERAL_BASE
110#define OMAP_L4_PERIPHERAL_SIZE TI_DM37XX_L4_PERIPHERAL_SIZE 110#define OMAP_L4_PERIPHERAL_SIZE TI_DM37XX_L4_PERIPHERAL_SIZE
111#define OMAP_L4_WAKEUP_BASE TI_DM37XX_L4_WAKEUP_BASE 111#define OMAP_L4_WAKEUP_BASE TI_DM37XX_L4_WAKEUP_BASE
112#define OMAP_L4_WAKEUP_SIZE TI_DM37XX_L4_WAKEUP_SIZE 112#define OMAP_L4_WAKEUP_SIZE TI_DM37XX_L4_WAKEUP_SIZE
113#endif 113#endif
114 114
115/* 115/*
116 * We devmap IO starting at KERNEL_VM_BASE + KERNEL_VM_SIZE 116 * We devmap IO starting at KERNEL_VM_BASE + KERNEL_VM_SIZE
117 */ 117 */
118#define OMAP_KERNEL_IO_VBASE (KERNEL_VM_BASE + KERNEL_VM_SIZE) 118#define OMAP_KERNEL_IO_VBASE (KERNEL_VM_BASE + KERNEL_VM_SIZE)
119#if defined(OMAP_3430) || defined(OMAP_3530) 119#if defined(OMAP_3430) || defined(OMAP_3530)
120#define OMAP_L4_CORE_VBASE OMAP_KERNEL_IO_VBASE 120#define OMAP_L4_CORE_VBASE OMAP_KERNEL_IO_VBASE
121#define OMAP_L4_PERIPHERAL_VBASE (OMAP_L4_CORE_VBASE + OMAP_L4_CORE_SIZE) 121#define OMAP_L4_PERIPHERAL_VBASE (OMAP_L4_CORE_VBASE + OMAP_L4_CORE_SIZE)
122#define OMAP_L4_WAKEUP_VBASE (OMAP_L4_PERIPHERAL_VBASE + OMAP_L4_PERIPHERAL_SIZE) 122#define OMAP_L4_WAKEUP_VBASE (OMAP_L4_PERIPHERAL_VBASE + OMAP_L4_PERIPHERAL_SIZE)
123#define OMAP_SDRC_VBASE (OMAP_L4_WAKEUP_VBASE + OMAP_L4_WAKEUP_SIZE) 123#define OMAP_SDRC_VBASE (OMAP_L4_WAKEUP_VBASE + OMAP_L4_WAKEUP_SIZE)
124#define OMAP_KERNEL_IO_VEND (OMAP_SDRC_VBASE + OMAP_SDRC_SIZE) 124#define OMAP_KERNEL_IO_VEND (OMAP_SDRC_VBASE + OMAP_SDRC_SIZE)
125#define CONSADDR_VA ((CONSADDR - OMAP_L4_PERIPHERAL_BASE) + OMAP_L4_PERIPHERAL_VBASE) 125#define CONSADDR_VA ((CONSADDR - OMAP_L4_PERIPHERAL_BASE) + OMAP_L4_PERIPHERAL_VBASE)
126#elif defined(OMAP_4430) || defined(OMAP_5430) 126#elif defined(OMAP_4430) || defined(OMAP_5430)
127#define OMAP_L4_CORE_VBASE OMAP_KERNEL_IO_VBASE 127#define OMAP_L4_CORE_VBASE OMAP_KERNEL_IO_VBASE
128#define OMAP_L4_PERIPHERAL_VBASE (OMAP_L4_CORE_VBASE + OMAP_L4_CORE_SIZE) 128#define OMAP_L4_PERIPHERAL_VBASE (OMAP_L4_CORE_VBASE + OMAP_L4_CORE_SIZE)
129#define OMAP_L4_ABE_VBASE (OMAP_L4_PERIPHERAL_VBASE + OMAP_L4_PERIPHERAL_SIZE) 129#define OMAP_L4_ABE_VBASE (OMAP_L4_PERIPHERAL_VBASE + OMAP_L4_PERIPHERAL_SIZE)
130#define OMAP_EMIF1_VBASE (OMAP_L4_ABE_VBASE + OMAP_L4_ABE_SIZE) 130#define OMAP_EMIF1_VBASE (OMAP_L4_ABE_VBASE + OMAP_L4_ABE_SIZE)
131#define OMAP_EMIF2_VBASE (OMAP_EMIF1_VBASE + OMAP_EMIF1_SIZE) 131#define OMAP_EMIF2_VBASE (OMAP_EMIF1_VBASE + OMAP_EMIF1_SIZE)
132#define OMAP_KERNEL_IO_VEND (OMAP_EMIF2_VBASE + OMAP_EMIF2_SIZE) 132#define OMAP_KERNEL_IO_VEND (OMAP_EMIF2_VBASE + OMAP_EMIF2_SIZE)
133#define CONSADDR_VA ((CONSADDR - OMAP_L4_CORE_BASE) + OMAP_L4_CORE_VBASE) 133#define CONSADDR_VA ((CONSADDR - OMAP_L4_PERIPHERAL_BASE) + OMAP_L4_PERIPHERAL_VBASE)
134#elif defined(TI_AM335X) 134#elif defined(TI_AM335X)
135#define OMAP_L4_PERIPHERAL_VBASE OMAP_KERNEL_IO_VBASE 135#define OMAP_L4_PERIPHERAL_VBASE OMAP_KERNEL_IO_VBASE
136#define OMAP_L4_FAST_VBASE (OMAP_L4_PERIPHERAL_VBASE + OMAP_L4_PERIPHERAL_SIZE) 136#define OMAP_L4_FAST_VBASE (OMAP_L4_PERIPHERAL_VBASE + OMAP_L4_PERIPHERAL_SIZE)
137#define OMAP_EMIF1_VBASE (OMAP_L4_FAST_VBASE + OMAP_L4_FAST_SIZE) 137#define OMAP_EMIF1_VBASE (OMAP_L4_FAST_VBASE + OMAP_L4_FAST_SIZE)
138#define OMAP_L4_CORE_VBASE (OMAP_EMIF1_VBASE + OMAP_EMIF1_SIZE) 138#define OMAP_L4_CORE_VBASE (OMAP_EMIF1_VBASE + OMAP_EMIF1_SIZE)
139#define OMAP_KERNEL_IO_VEND (OMAP_L4_CORE_VBASE + OMAP_L4_CORE_SIZE) 139#define OMAP_KERNEL_IO_VEND (OMAP_L4_CORE_VBASE + OMAP_L4_CORE_SIZE)
140#define CONSADDR_VA ((CONSADDR - OMAP_L4_CORE_BASE) + OMAP_L4_CORE_VBASE) 140#define CONSADDR_VA ((CONSADDR - OMAP_L4_CORE_BASE) + OMAP_L4_CORE_VBASE)
141#elif defined(TI_DM37XX) 141#elif defined(TI_DM37XX)
142#define OMAP_L4_CORE_VBASE OMAP_KERNEL_IO_VBASE 142#define OMAP_L4_CORE_VBASE OMAP_KERNEL_IO_VBASE
143#define OMAP_L4_PERIPHERAL_VBASE (OMAP_L4_CORE_VBASE + OMAP_L4_CORE_SIZE) 143#define OMAP_L4_PERIPHERAL_VBASE (OMAP_L4_CORE_VBASE + OMAP_L4_CORE_SIZE)
144#define OMAP_KERNEL_IO_VEND (OMAP_L4_PERIPHERAL_VBASE + OMAP_L4_PERIPHERAL_SIZE) 144#define OMAP_KERNEL_IO_VEND (OMAP_L4_PERIPHERAL_VBASE + OMAP_L4_PERIPHERAL_SIZE)
145#define CONSADDR_VA ((CONSADDR - OMAP_L4_PERIPHERAL_BASE) + OMAP_L4_PERIPHERAL_VBASE) 145#define CONSADDR_VA ((CONSADDR - OMAP_L4_PERIPHERAL_BASE) + OMAP_L4_PERIPHERAL_VBASE)
146#else 146#else
147#error unknown OMAP variant 147#error unknown OMAP variant
148#endif 148#endif
149 149
150#endif /* _EVBARM_BEAGLE_BEAGLE_H */ 150#endif /* _EVBARM_BEAGLE_BEAGLE_H */