--- linux-2.6.15.4/include/asm-arm/arch-s3c2410/uncompress.h 2006-02-10 08:22:48.000000000 +0100 +++ golinux/include/asm-arm/arch-s3c2410/uncompress.h 2006-02-28 13:19:36.000000000 +0100 @@ -17,6 +17,7 @@ * 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) + * 28-Feb-2006 KM Added support for S3C2412/13 (cpuid moved to different addr) */ #ifndef __ASM_ARCH_UNCOMPRESS_H @@ -75,6 +76,14 @@ #ifndef CONFIG_CPU_S3C2400 cpuid = *((volatile unsigned int *)S3C2410_GSTATUS1); cpuid &= S3C2410_GSTATUS1_IDMASK; + +#ifdef CONFIG_CPU_S3C2412 + if (cpuid!=S3C2410_GSTATUS1_2440 && cpuid!=S3C2410_GSTATUS1_2410) { + cpuid = *((volatile unsigned int *)S3C2412_GSTATUS1); + cpuid &= S3C2410_GSTATUS1_IDMASK; + } +#endif + #endif if (ch == '\n')