r3733 - branches/src/target/kernel/2.6.24.x/patches

laforge at sita.openmoko.org laforge at sita.openmoko.org
Tue Dec 25 23:32:03 CET 2007


Author: laforge
Date: 2007-12-25 23:32:02 +0100 (Tue, 25 Dec 2007)
New Revision: 3733

Modified:
   branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
   branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
   branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch
   branches/src/target/kernel/2.6.24.x/patches/s3c2410-bbt.patch
Log:
remove CONFIG_MTD_NAND_S3C2410_BBT and turn it into a platform_data flag as
requested by Ben Dooks.


Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch	2007-12-25 14:39:12 UTC (rev 3732)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch	2007-12-25 22:32:02 UTC (rev 3733)
@@ -34,7 +34,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -0,0 +1,657 @@
+@@ -0,0 +1,658 @@
 +/*
 + * linux/arch/arm/mach-s3c2410/mach-gta01.c
 + *
@@ -405,6 +405,7 @@
 +	[0] = {
 +		.name		= "neo1973-nand",
 +		.nr_chips	= 1,
++		.flags		= S3C2410_NAND_BBT,
 +	},
 +};
 +

Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch	2007-12-25 14:39:12 UTC (rev 3732)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch	2007-12-25 22:32:02 UTC (rev 3733)
@@ -2,7 +2,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,709 @@
+@@ -0,0 +1,710 @@
 +/*
 + * linux/arch/arm/mach-s3c2440/mach-gta02.c
 + *
@@ -356,6 +356,7 @@
 +	[0] = {
 +		.name		= "neo1973-nand",
 +		.nr_chips	= 1,
++		.flags		= S3C2410_NAND_BBT,
 +	},
 +};
 +

Modified: branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch	2007-12-25 14:39:12 UTC (rev 3732)
+++ branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch	2007-12-25 22:32:02 UTC (rev 3733)
@@ -29,7 +29,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6/arch/arm/mach-s3c2440/mach-hxd8.c
-@@ -0,0 +1,378 @@
+@@ -0,0 +1,381 @@
 +/* linux/arch/arm/mach-s3c2440/mach-hxd8.c
 + *
 + * S3C2440 Machine Support for the FIC HXD8
@@ -165,14 +165,17 @@
 +	[0] = {
 +		.name		= "hxd8-nand",
 +		.nr_chips	= 1,
++		.flags		= S3C2410_NAND_BBT,
 +	},
 +	[1] = {
 +		.name		= "hxd8-nand-1",
 +		.nr_chips	= 1,
++		.flags		= S3C2410_NAND_BBT,
 +	},
 +	[2] = {
 +		.name		= "hxd8-nand-2",
 +		.nr_chips	= 1,
++		.flags		= S3C2410_NAND_BBT,
 +	},
 +};
 +

Modified: branches/src/target/kernel/2.6.24.x/patches/s3c2410-bbt.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3c2410-bbt.patch	2007-12-25 14:39:12 UTC (rev 3732)
+++ branches/src/target/kernel/2.6.24.x/patches/s3c2410-bbt.patch	2007-12-25 22:32:02 UTC (rev 3733)
@@ -5,36 +5,39 @@
 
 Signed-off-by: Harald Welte <laforge at openmoko.org>
 
-Index: linux-2.6.17.14-fic4.test/drivers/mtd/nand/s3c2410.c
+Index: linux-2.6/drivers/mtd/nand/s3c2410.c
 ===================================================================
---- 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 @@
+--- linux-2.6.orig/drivers/mtd/nand/s3c2410.c
++++ linux-2.6/drivers/mtd/nand/s3c2410.c
+@@ -612,9 +612,13 @@
  	chip->select_chip  = s3c2410_nand_select_chip;
  	chip->chip_delay   = 50;
  	chip->priv	   = nmtd;
-+#ifdef CONFIG_MTD_NAND_S3C2410_BBT
-+	chip->options	   = NAND_USE_FLASH_BBT;
-+#else
- 	chip->options	   = 0;
-+#endif
+-	chip->options	   = 0;
  	chip->controller   = &info->controller;
  
- 	if (info->is_s3c2440) {
-Index: linux-2.6.17.14-fic4.test/drivers/mtd/nand/Kconfig
++	if (set->flags & S3C2410_NAND_BBT)
++		chip->options	   = NAND_USE_FLASH_BBT;
++	else
++		chip->options	   = 0;
++
+ 	switch (info->cpu_type) {
+ 	case TYPE_S3C2410:
+ 		chip->IO_ADDR_W = regs + S3C2410_NFDATA;
+Index: linux-2.6/include/asm-arm/plat-s3c/nand.h
 ===================================================================
---- 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.
+--- linux-2.6.orig/include/asm-arm/plat-s3c/nand.h
++++ linux-2.6/include/asm-arm/plat-s3c/nand.h
+@@ -21,9 +21,12 @@
+  * partitions	 = mtd partition list
+ */
  
-+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
++#define S3C2410_NAND_BBT	0x0001
 +
- config MTD_NAND_S3C2410_DEBUG
- 	bool "S3C2410 NAND driver debug"
- 	depends on MTD_NAND_S3C2410
+ struct s3c2410_nand_set {
+ 	int			nr_chips;
+ 	int			nr_partitions;
++	unsigned int		flags;
+ 	char			*name;
+ 	int			*nr_map;
+ 	struct mtd_partition	*partitions;





More information about the commitlog mailing list