Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 123827
b: refs/heads/master
c: f0c9eb4
h: refs/heads/master
i:
  123825: 25abe44
  123823: 5248f17
v: v3
  • Loading branch information
Ben Dooks committed Dec 15, 2008
1 parent f92d695 commit e54c095
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f1cb9eba5b0ae36b2065b27cff1a5330f5a08da4
refs/heads/master: f0c9eb4ec2d3c9f4ddd74b75da6dfc137e0f6b0d
28 changes: 28 additions & 0 deletions trunk/arch/arm/mach-s3c24a0/include/mach/debug-macro.S
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* arch/arm/mach-s3c2410/include/mach/debug-macro.S
*
* 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>

.macro addruart, rx
mrc p15, 0, \rx, c1, c0
tst \rx, #1
ldreq \rx, = S3C24XX_PA_UART
ldrne \rx, = S3C24XX_VA_UART
#if CONFIG_DEBUG_S3C_UART != 0
add \rx, \rx, #(S3C2410_UART1_OFF * 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>
2 changes: 1 addition & 1 deletion trunk/arch/arm/plat-s3c/include/plat/debug-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
.endm

#ifndef fifo_level
#define fifo_level fifo_level_s3c2410
#define fifo_level fifo_level_s3c2440
#endif

.macro fifo_full_s3c2440 rd, rx
Expand Down

0 comments on commit e54c095

Please sign in to comment.