4e41db871e
This fixes:
arch/arm/kernel/debug.S:147: Error: constant expression expected -- `ldrne r3,=(((UART1_BASE_ADDR)-AIPI_BASE_ADDR)+AIPI_BASE_ADDR_VIRT)'
arch/arm/kernel/debug.S:163: Error: constant expression expected -- `ldrne r3,=(((UART1_BASE_ADDR)-AIPI_BASE_ADDR)+AIPI_BASE_ADDR_VIRT)'
when compiling for mx2 with CONFIG_DEBUG_LL=y. A similar error exists
on mx3 and is fixed by this commit, too.
These were introduced by aae7019382.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
74 lines
1.9 KiB
ArmAsm
74 lines
1.9 KiB
ArmAsm
/* arch/arm/mach-imx/include/mach/debug-macro.S
|
|
*
|
|
* Debugging macro include header
|
|
*
|
|
* Copyright (C) 1994-1999 Russell King
|
|
* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
|
|
*
|
|
* 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.
|
|
*
|
|
*/
|
|
#define IMX_NEEDS_DEPRECATED_SYMBOLS
|
|
|
|
#ifdef CONFIG_ARCH_MX1
|
|
#include <mach/mx1.h>
|
|
#define UART_PADDR UART1_BASE_ADDR
|
|
#define UART_VADDR IO_ADDRESS(UART1_BASE_ADDR)
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_MX25
|
|
#ifdef UART_PADDR
|
|
#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
|
|
#endif
|
|
#include <mach/mx25.h>
|
|
#define UART_PADDR UART1_BASE_ADDR
|
|
#define UART_VADDR MX25_AIPS1_IO_ADDRESS(UART1_BASE_ADDR)
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_MX2
|
|
#ifdef UART_PADDR
|
|
#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
|
|
#endif
|
|
#include <mach/mx2x.h>
|
|
#define UART_PADDR UART1_BASE_ADDR
|
|
#define UART_VADDR AIPI_IO_ADDRESS(UART1_BASE_ADDR)
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_MX3
|
|
#ifdef UART_PADDR
|
|
#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
|
|
#endif
|
|
#include <mach/mx3x.h>
|
|
#define UART_PADDR UART1_BASE_ADDR
|
|
#define UART_VADDR AIPS1_IO_ADDRESS(UART1_BASE_ADDR)
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_MXC91231
|
|
#ifdef UART_PADDR
|
|
#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
|
|
#endif
|
|
#include <mach/mxc91231.h>
|
|
#define UART_PADDR MXC91231_UART2_BASE_ADDR
|
|
#define UART_VADDR MXC91231_AIPS1_IO_ADDRESS(MXC91231_UART2_BASE_ADDR)
|
|
#endif
|
|
.macro addruart,rx
|
|
mrc p15, 0, \rx, c1, c0
|
|
tst \rx, #1 @ MMU enabled?
|
|
ldreq \rx, =UART_PADDR @ physical
|
|
ldrne \rx, =UART_VADDR @ virtual
|
|
.endm
|
|
|
|
.macro senduart,rd,rx
|
|
str \rd, [\rx, #0x40] @ TXDATA
|
|
.endm
|
|
|
|
.macro waituart,rd,rx
|
|
.endm
|
|
|
|
.macro busyuart,rd,rx
|
|
1002: ldr \rd, [\rx, #0x98] @ SR2
|
|
tst \rd, #1 << 3 @ TXDC
|
|
beq 1002b @ wait until transmit done
|
|
.endm
|