diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2010-05-20 07:51:08 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 15:28:32 +0900 |
| commit | acc84707d3487735fc666fdeab76185d086428c0 (patch) | |
| tree | 2ad25308d04b36f1fc2d0d9413f3a4fa9179331e /arch/arm/mach-s5pc100/include/mach/debug-macro.S | |
| parent | 2af716ba77d26f3d291fe7c7f5a5108d4945c69f (diff) | |
ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework
This patch moves S5PC100 SoC support to plat-s5p framework. Most
periperal support code has been already moved from plat-s5pc1xx to
mach-s5pc100.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s5pc100/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-s5pc100/include/mach/debug-macro.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pc100/include/mach/debug-macro.S b/arch/arm/mach-s5pc100/include/mach/debug-macro.S index e181f5789482..70e02e91ee3c 100644 --- a/arch/arm/mach-s5pc100/include/mach/debug-macro.S +++ b/arch/arm/mach-s5pc100/include/mach/debug-macro.S @@ -22,12 +22,14 @@ * aligned and add in the offset when we load the value here. */ - .macro addruart, rx, tmp + .macro addruart, rx, rtmp mrc p15, 0, \rx, c1, c0 tst \rx, #1 ldreq \rx, = S3C_PA_UART - ldrne \rx, = (S3C_VA_UART + S3C_PA_UART & 0xfffff) + ldrne \rx, = S3C_VA_UART +#if CONFIG_DEBUG_S3C_UART != 0 add \rx, \rx, #(0x400 * CONFIG_DEBUG_S3C_UART) +#endif .endm /* include the reset of the code which will do the work, we're only |