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

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-02-12 21:00:57 +0100 (Mon, 12 Feb 2007)
New Revision: 970

Removed:
   trunk/src/target/u-boot/patches/shrink-initrd.patch
Modified:
   trunk/src/target/u-boot/patches/nand-dynamic_partitions.patch
   trunk/src/target/u-boot/patches/series
Log:
merge shrink-initrd.patch into nand-dynamic_partitions.patch


Modified: trunk/src/target/u-boot/patches/nand-dynamic_partitions.patch
===================================================================
--- trunk/src/target/u-boot/patches/nand-dynamic_partitions.patch	2007-02-12 19:57:55 UTC (rev 969)
+++ trunk/src/target/u-boot/patches/nand-dynamic_partitions.patch	2007-02-12 20:00:57 UTC (rev 970)
@@ -15,16 +15,23 @@
 
 Signed-off-by: Harald Welte <laforge at openmoko.org>
 
-Index: u-boot.git/drivers/nand/nand_bbt.c
+Index: u-boot/drivers/nand/nand_bbt.c
 ===================================================================
---- u-boot.git.orig/drivers/nand/nand_bbt.c	2007-02-07 16:48:48.000000000 +0100
-+++ u-boot.git/drivers/nand/nand_bbt.c	2007-02-08 01:00:19.000000000 +0100
-@@ -1051,4 +1051,54 @@
+--- u-boot.orig/drivers/nand/nand_bbt.c	2007-02-12 20:58:14.000000000 +0100
++++ u-boot/drivers/nand/nand_bbt.c	2007-02-12 20:59:20.000000000 +0100
+@@ -1051,4 +1051,61 @@
  	return 1;
  }
  
 +#define ARRAY_SIZE(x)           (sizeof(x) / sizeof((x)[0]))
-+static unsigned int part_size[] = { 0x30000, 0x8000, 0x200000, 0x200000, 0x39cc000 };
++
++
++/* NOTE: this is extremely device-dependent, so it shouldn't really be here.
++   The sum of all part_size[]s must equal to the NAND size, i.e., 0x4000000.
++   "initrd" is sized such that it can hold two uncompressed 16 bit 640*480
++   images: 640*480*2*2 = 1228800 < 1245184. */
++
++static unsigned int part_size[] = { 0x30000, 0x4000, 0x200000, 0x130000, 0x3c9c000 };
 +static char *part_names[] = { "u-boot", "u-boot_env", "kernel", "splash", "rootfs" };
 +
 +int nand_create_mtd_dynpart(struct mtd_info *mtd)
@@ -74,10 +81,10 @@
 +}
 +
  #endif
-Index: u-boot.git/include/configs/neo1973.h
+Index: u-boot/include/configs/neo1973.h
 ===================================================================
---- u-boot.git.orig/include/configs/neo1973.h	2007-02-07 16:48:48.000000000 +0100
-+++ u-boot.git/include/configs/neo1973.h	2007-02-08 01:00:12.000000000 +0100
+--- u-boot.orig/include/configs/neo1973.h	2007-02-12 20:58:15.000000000 +0100
++++ u-boot/include/configs/neo1973.h	2007-02-12 20:58:15.000000000 +0100
 @@ -103,7 +103,7 @@
  			CFG_CMD_ELF	 | \
  			CFG_CMD_MISC	 | \
@@ -112,10 +119,10 @@
 +#define MTPARTS_DEFAULT	"neo1973-nand:192k(u-boot),8k(u-boot_env),2M(kernel),2M(splash),-(jffs2)"
 +
  #endif	/* __CONFIG_H */
-Index: u-boot.git/common/cmd_jffs2.c
+Index: u-boot/common/cmd_jffs2.c
 ===================================================================
---- u-boot.git.orig/common/cmd_jffs2.c	2007-02-07 16:47:38.000000000 +0100
-+++ u-boot.git/common/cmd_jffs2.c	2007-02-07 16:48:48.000000000 +0100
+--- u-boot.orig/common/cmd_jffs2.c	2007-02-12 20:55:59.000000000 +0100
++++ u-boot/common/cmd_jffs2.c	2007-02-12 20:58:15.000000000 +0100
 @@ -2123,6 +2123,18 @@
  	printf ("Usage:\n%s\n", cmdtp->usage);
  	return 1;

Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series	2007-02-12 19:57:55 UTC (rev 969)
+++ trunk/src/target/u-boot/patches/series	2007-02-12 20:00:57 UTC (rev 970)
@@ -24,4 +24,3 @@
 uboot-mokoversion.patch
 uboot-strtoul.patch
 nand-badisbad.patch
-shrink-initrd.patch

Deleted: trunk/src/target/u-boot/patches/shrink-initrd.patch
===================================================================
--- trunk/src/target/u-boot/patches/shrink-initrd.patch	2007-02-12 19:57:55 UTC (rev 969)
+++ trunk/src/target/u-boot/patches/shrink-initrd.patch	2007-02-12 20:00:57 UTC (rev 970)
@@ -1,19 +0,0 @@
-Index: u-boot/drivers/nand/nand_bbt.c
-===================================================================
---- u-boot.orig/drivers/nand/nand_bbt.c
-+++ u-boot/drivers/nand/nand_bbt.c
-@@ -1054,7 +1054,13 @@ int nand_isbad_bbt (struct mtd_info *mtd
- }
- 
- #define ARRAY_SIZE(x)           (sizeof(x) / sizeof((x)[0]))
--static unsigned int part_size[] = { 0x30000, 0x4000, 0x200000, 0x400000, 0x39cc000 };
-+
-+/* NOTE: this is extremely device-dependent, so it shouldn't really be here.
-+   The sum of all part_size[]s must equal to the NAND size, i.e., 0x4000000.
-+   "initrd" is sized such that it can hold two uncompressed 16 bit 640*480
-+   images: 640*480*2*2 = 1228800 < 1245184. */
-+
-+static unsigned int part_size[] = { 0x30000, 0x4000, 0x200000, 0x130000, 0x3c9c000 };
- static char *part_names[] = { "u-boot", "u-boot env", "kernel", "initrd", "rootfs" };
- 
- int nand_create_mtd_dynpart(struct mtd_info *mtd)