r653 - trunk/src/target/kernel/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-02-02 13:06:03 +0100 (Fri, 02 Feb 2007)
New Revision: 653

Modified:
   trunk/src/target/kernel/patches/s3c2410-bbt.patch
Log:
make S3C2410 BBT a Kconfig option.  This allows us to use >= -moko7 kernels without the new bbt-using u-boot configuration.


Modified: trunk/src/target/kernel/patches/s3c2410-bbt.patch
===================================================================
--- trunk/src/target/kernel/patches/s3c2410-bbt.patch	2007-02-02 03:56:28 UTC (rev 652)
+++ trunk/src/target/kernel/patches/s3c2410-bbt.patch	2007-02-02 12:06:03 UTC (rev 653)
@@ -1,13 +1,33 @@
 Index: linux-2.6.17.14-fic4.test/drivers/mtd/nand/s3c2410.c
 ===================================================================
---- linux-2.6.17.14-fic4.test.orig/drivers/mtd/nand/s3c2410.c	2007-01-14 01:27:27.000000000 +0100
-+++ linux-2.6.17.14-fic4.test/drivers/mtd/nand/s3c2410.c	2007-01-14 01:29:01.000000000 +0100
-@@ -524,7 +524,7 @@
+--- linux-2.6.17.14-fic4.test.orig/drivers/mtd/nand/s3c2410.c	2007-02-02 13:02:10.000000000 +0100
++++ linux-2.6.17.14-fic4.test/drivers/mtd/nand/s3c2410.c	2007-02-02 13:03:52.000000000 +0100
+@@ -524,7 +524,11 @@
  	chip->select_chip  = s3c2410_nand_select_chip;
  	chip->chip_delay   = 50;
  	chip->priv	   = nmtd;
--	chip->options	   = 0;
++#ifdef CONFIG_MTD_NAND_S3C2410_BBT
 +	chip->options	   = NAND_USE_FLASH_BBT;
++#else
+ 	chip->options	   = 0;
++#endif
  	chip->controller   = &info->controller;
  
  	if (info->is_s3c2440) {
+Index: linux-2.6.17.14-fic4.test/drivers/mtd/nand/Kconfig
+===================================================================
+--- linux-2.6.17.14-fic4.test.orig/drivers/mtd/nand/Kconfig	2007-02-02 13:03:56.000000000 +0100
++++ linux-2.6.17.14-fic4.test/drivers/mtd/nand/Kconfig	2007-02-02 13:04:47.000000000 +0100
+@@ -90,6 +90,12 @@
+ 	  No board specfic support is done by this driver, each board
+ 	  must advertise a platform_device for the driver to attach.
+ 
++config MTD_NAND_S3C2410_BBT
++	bool "S3C2410 NAND bad block table"
++	depends on MTD_NAND_S3C2410
++	help
++	  Enable bad block table support for S3C2410 NAND driver
++
+ config MTD_NAND_S3C2410_DEBUG
+ 	bool "S3C2410 NAND driver debug"
+ 	depends on MTD_NAND_S3C2410