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

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-09-05 19:41:40 +0200 (Wed, 05 Sep 2007)
New Revision: 2928

Modified:
   trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
   trunk/src/target/u-boot/patches/uboot-s3c2440.patch
Log:
remove commented-out old code from s3c24xx nand driver


Modified: trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch	2007-09-05 17:41:00 UTC (rev 2927)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch	2007-09-05 17:41:40 UTC (rev 2928)
@@ -20,7 +20,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/cpu/arm920t/s3c24x0/nand.c
-@@ -0,0 +1,225 @@
+@@ -0,0 +1,224 @@
 +/*
 + * (C) Copyright 2006 OpenMoko, Inc.
 + * Author: Harald Welte <laforge at openmoko.org>
@@ -209,7 +209,6 @@
 +	cfg |= S3C2410_NFCONF_TWRPH1(twrph1 - 1);
 +
 +	NFCONF = cfg;
-+	//NFCONF = 0xf842;
 +
 +	/* initialize nand_chip data structure */
 +	nand->IO_ADDR_R = nand->IO_ADDR_W = 0x4e00000c;

Modified: trunk/src/target/u-boot/patches/uboot-s3c2440.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2440.patch	2007-09-05 17:41:00 UTC (rev 2927)
+++ trunk/src/target/u-boot/patches/uboot-s3c2440.patch	2007-09-05 17:41:40 UTC (rev 2928)
@@ -1221,7 +1221,7 @@
  		break;
  	}
  	return;
-@@ -180,16 +218,21 @@
+@@ -180,15 +218,21 @@
  	/* initialize hardware */
  	twrph0 = 3; twrph1 = 0; tacls = 0;
  
@@ -1232,7 +1232,6 @@
  	cfg |= S3C2410_NFCONF_TWRPH1(twrph1 - 1);
  
  	NFCONF = cfg;
--	//NFCONF = 0xf842;
 +#elif defined(CONFIG_S3C2440)
 +	twrph0 = 7; twrph1 = 7; tacls = 7;
 +	NFCONF = (tacls<<12)|(twrph0<<8)|(twrph1<<4)|(0<<0);
@@ -1245,7 +1244,7 @@
  
  	/* read_buf and write_buf are default */
  	/* read_byte and write_byte are default */
-@@ -214,12 +257,23 @@
+@@ -213,12 +257,23 @@
  	nand->options = 0;
  #endif