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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -120,27 +120,27 @@ @@ -120,27 +120,27 @@
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