r1912 - trunk/src/target/u-boot/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-05-05 11:00:34 +0200 (Sat, 05 May 2007)
New Revision: 1912

Modified:
   trunk/src/target/u-boot/patches/uboot-s3c2440.patch
Log:
NAND boot (steppingstone) fixes for S3C244x:
* fix pointer increment typo
* fix bitshift typo
* check correct busy bit


Modified: trunk/src/target/u-boot/patches/uboot-s3c2440.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2440.patch	2007-05-05 04:15:34 UTC (rev 1911)
+++ trunk/src/target/u-boot/patches/uboot-s3c2440.patch	2007-05-05 09:00:34 UTC (rev 1912)
@@ -903,10 +903,10 @@
 +#define NFDATA		__REGb(NF_BASE + 0x10)
 +#define NFDATA16	__REGw(NF_BASE + 0x10)
 +#define NFSTAT		__REGb(NF_BASE + 0x20)
-+#define NFSTAT_BUSY	(1 << 2)
++#define NFSTAT_BUSY	1
 +#define nand_select()	(NFCONT &= ~(1 << 1))
 +#define nand_deselect()	(NFCONT |= (1 << 1))
-+#define nand_clear_RnB()	(NFSTAT |= NFSTAT_BUSY)
++#define nand_clear_RnB()	(NFSTAT |= (1 << 2))
 +#endif
  
 -#define BUSY 1
@@ -991,7 +991,7 @@
 +	NFADDR = (addr >> 17) & 0xff;
 +	NFADDR = (addr >> 25) & 0xff;
 +#elif (NAND_PAGE_SIZE == 2048)
-+	page_num = addr > 11; /* addr / 2048 */
++	page_num = addr >> 11; /* addr / 2048 */
 +	/* Write Address */
 +	NFADDR = 0;
 +	NFADDR = 0;
@@ -1012,7 +1012,7 @@
 +#elif defined(CONFIG_S3C2440)
 +	for (i = 0; i < NAND_PAGE_SIZE/2; i++) {
 +		*ptr16 = NFDATA16;
-+		*ptr16++;
++		ptr16++;
 +	}
 +#endif
 +