0ea1293009
Rather than checking the MMU status in every instance of addruart, do it once in kernel/debug.S, and change the existing addruart macros to return both physical and virtual addresses. The main debug code can then select the appropriate address to use. This will also allow us to retreive the address of a uart for the MMU state that we're not current in. Updated with fixes for OMAP from Jason Wang <jason77.wang@gmail.com> and Tony Lindgren <tony@atomide.com>, and fix for versatile express from Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>. Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Jason Wang <jason77.wang@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Tested-by: Kevin Hilman <khilman@deeprootsystems.com>
38 lines
1.2 KiB
ArmAsm
38 lines
1.2 KiB
ArmAsm
/* arch/arm/mach-s3c6400/include/mach/debug-macro.S
|
|
*
|
|
* Copyright 2008 Openmoko, Inc.
|
|
* Copyright 2008 Simtec Electronics
|
|
* http://armlinux.simtec.co.uk/
|
|
* Ben Dooks <ben@simtec.co.uk>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
/* pull in the relevant register and map files. */
|
|
|
|
#include <mach/map.h>
|
|
#include <plat/regs-serial.h>
|
|
|
|
/* note, for the boot process to work we have to keep the UART
|
|
* virtual address aligned to an 1MiB boundary for the L1
|
|
* mapping the head code makes. We keep the UART virtual address
|
|
* aligned and add in the offset when we load the value here.
|
|
*/
|
|
|
|
.macro addruart, rp, rv
|
|
ldr \rp, = S3C_PA_UART
|
|
ldr \rv, = (S3C_VA_UART + S3C_PA_UART & 0xfffff)
|
|
#if CONFIG_DEBUG_S3C_UART != 0
|
|
add \rp, \rp, #(0x400 * CONFIG_DEBUG_S3C_UART)
|
|
add \rv, \rv, #(0x400 * CONFIG_DEBUG_S3C_UART)
|
|
#endif
|
|
.endm
|
|
|
|
/* include the reset of the code which will do the work, we're only
|
|
* compiling for a single cpu processor type so the default of s3c2440
|
|
* will be fine with us.
|
|
*/
|
|
|
|
#include <plat/debug-macro.S>
|