diff options
author | Lucas Correia Villa Real <lucasvr@org.rmk.(none)> | 2005-04-25 18:12:50 -0400 |
---|---|---|
committer | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-04-25 18:12:50 -0400 |
commit | bd7b170201149fd82bc3212cb570a7a7386463a4 (patch) | |
tree | 3266b071178016adaad3a1684a2fe2648d24b238 /include | |
parent | b7ebcc108a1754a1d044b49c0acf977a7e86ae71 (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')
-rw-r--r-- | include/asm-arm/arch-s3c2410/uncompress.h | 6 |
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 ad4252e27799..d7a4a8354fa9 100644 --- a/include/asm-arm/arch-s3c2410/uncompress.h +++ b/include/asm-arm/arch-s3c2410/uncompress.h | |||
@@ -16,6 +16,7 @@ | |||
16 | * 12-Oct-2004 BJD Take account of debug uart configuration | 16 | * 12-Oct-2004 BJD Take account of debug uart configuration |
17 | * 15-Nov-2004 BJD Fixed uart configuration | 17 | * 15-Nov-2004 BJD Fixed uart configuration |
18 | * 22-Feb-2005 BJD Added watchdog to uncompress | 18 | * 22-Feb-2005 BJD Added watchdog to uncompress |
19 | * 04-Apr-2005 LCVR Added support to S3C2400 (no cpuid at GSTATUS1) | ||
19 | */ | 20 | */ |
20 | 21 | ||
21 | #ifndef __ASM_ARCH_UNCOMPRESS_H | 22 | #ifndef __ASM_ARCH_UNCOMPRESS_H |
@@ -69,9 +70,12 @@ uart_rd(unsigned int reg) | |||
69 | static void | 70 | static void |
70 | putc(char ch) | 71 | putc(char ch) |
71 | { | 72 | { |
72 | int cpuid = *((volatile unsigned int *)S3C2410_GSTATUS1); | 73 | int cpuid = S3C2410_GSTATUS1_2410; |
73 | 74 | ||
75 | #ifndef CONFIG_CPU_S3C2400 | ||
76 | cpuid = *((volatile unsigned int *)S3C2410_GSTATUS1); | ||
74 | cpuid &= S3C2410_GSTATUS1_IDMASK; | 77 | cpuid &= S3C2410_GSTATUS1_IDMASK; |
78 | #endif | ||
75 | 79 | ||
76 | if (ch == '\n') | 80 | if (ch == '\n') |
77 | putc('\r'); /* expand newline to \r\n */ | 81 | putc('\r'); /* expand newline to \r\n */ |