提交 bd7b1702 编写于 作者: L Lucas Correia Villa Real 提交者: Russell King

[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
上级 b7ebcc10
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
* 12-Oct-2004 BJD Take account of debug uart configuration * 12-Oct-2004 BJD Take account of debug uart configuration
* 15-Nov-2004 BJD Fixed uart configuration * 15-Nov-2004 BJD Fixed uart configuration
* 22-Feb-2005 BJD Added watchdog to uncompress * 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 #ifndef __ASM_ARCH_UNCOMPRESS_H
...@@ -69,9 +70,12 @@ uart_rd(unsigned int reg) ...@@ -69,9 +70,12 @@ uart_rd(unsigned int reg)
static void static void
putc(char ch) 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; cpuid &= S3C2410_GSTATUS1_IDMASK;
#endif
if (ch == '\n') if (ch == '\n')
putc('\r'); /* expand newline to \r\n */ putc('\r'); /* expand newline to \r\n */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册