aboutsummaryrefslogtreecommitdiff
path: root/include/asm-arm
diff options
context:
space:
mode:
authorLucas Correia Villa Real <lucasvr@org.rmk.(none)>2005-04-25 23:12:50 +0100
committerRussell King <rmk@dyn-67.arm.linux.org.uk>2005-04-25 23:12:50 +0100
commitbd7b170201149fd82bc3212cb570a7a7386463a4 (patch)
tree3266b071178016adaad3a1684a2fe2648d24b238 /include/asm-arm
parentb7ebcc108a1754a1d044b49c0acf977a7e86ae71 (diff)
[PATCH] ARM: 2644/1: Adds S3C2400 support to uncompress.h
Patch from Lucas Correia Villa Real The S3C2400 doesn't have a cpuid information stored anywhere. This patch adds support to the S3C2400 at include/asm-arm/arch-s3c2400/uncompress.h by initializing the cpuid variable to the S3C2410, as they share the same routine. The GSTATUS1 pin is then used only if not compiling for the S3C2400. Signed-off-by: Lucas Correia Villa Real Signed-off-by: Ben Dooks Signed-off-by: Russell King
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/arch-s3c2410/uncompress.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-arm/arch-s3c2410/uncompress.h b/include/asm-arm/arch-s3c2410/uncompress.h
index ad4252e2779..d7a4a8354fa 100644
--- a/include/asm-arm/arch-s3c2410/uncompress.h
+++ b/include/asm-arm/arch-s3c2410/uncompress.h
@@ -16,6 +16,7 @@
* 12-Oct-2004 BJD Take account of debug uart configuration
* 15-Nov-2004 BJD Fixed uart configuration
* 22-Feb-2005 BJD Added watchdog to uncompress
+ * 04-Apr-2005 LCVR Added support to S3C2400 (no cpuid at GSTATUS1)
*/
#ifndef __ASM_ARCH_UNCOMPRESS_H
@@ -69,9 +70,12 @@ uart_rd(unsigned int reg)
static void
putc(char ch)
{
- int cpuid = *((volatile unsigned int *)S3C2410_GSTATUS1);
+ int cpuid = S3C2410_GSTATUS1_2410;
+#ifndef CONFIG_CPU_S3C2400
+ cpuid = *((volatile unsigned int *)S3C2410_GSTATUS1);
cpuid &= S3C2410_GSTATUS1_IDMASK;
+#endif
if (ch == '\n')
putc('\r'); /* expand newline to \r\n */