diff options
| author | Stefan Agner <stefan@agner.ch> | 2015-05-19 18:03:50 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-20 17:09:51 -0400 |
| commit | 7505f0428fdedca11be9647cb411628ec7cb9a1a (patch) | |
| tree | f2ca809fb47c5cc349521fd787fce8f696a19d17 | |
| parent | 1b0c50973378ac5d0440aaa28d3cb5fda27989dd (diff) | |
ARM: unify MMU/!MMU addruart calls
Remove the needless differences between MMU/!MMU addruart calls.
This allows to use the same addruart macro on SoC level. Useful
for SoC consisting of multiple CPUs with and without MMU such as
Freescale Vybrid.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/include/debug/efm32.S | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/debug.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/debug/efm32.S b/arch/arm/include/debug/efm32.S index 2265a199280c..660fa1e4b77b 100644 --- a/arch/arm/include/debug/efm32.S +++ b/arch/arm/include/debug/efm32.S | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | #define UARTn_TXDATA 0x0034 | 17 | #define UARTn_TXDATA 0x0034 |
| 18 | 18 | ||
| 19 | .macro addruart, rx, tmp | 19 | .macro addruart, rx, tmp, tmp2 |
| 20 | ldr \rx, =(CONFIG_DEBUG_UART_PHYS) | 20 | ldr \rx, =(CONFIG_DEBUG_UART_PHYS) |
| 21 | 21 | ||
| 22 | /* | 22 | /* |
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index 78c91b5f97d4..ea9646cc2a0e 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | 35 | ||
| 36 | #else /* !CONFIG_MMU */ | 36 | #else /* !CONFIG_MMU */ |
| 37 | .macro addruart_current, rx, tmp1, tmp2 | 37 | .macro addruart_current, rx, tmp1, tmp2 |
| 38 | addruart \rx, \tmp1 | 38 | addruart \rx, \tmp1, \tmp2 |
| 39 | .endm | 39 | .endm |
| 40 | 40 | ||
| 41 | #endif /* CONFIG_MMU */ | 41 | #endif /* CONFIG_MMU */ |
