Skip to content

Commit

Permalink
[PATCH] ARM: 2644/1: Adds S3C2400 support to uncompress.h
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Lucas Correia Villa Real authored and Russell King committed Apr 25, 2005
1 parent b7ebcc1 commit bd7b170
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion include/asm-arm/arch-s3c2410/uncompress.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit bd7b170

Please sign in to comment.