r1931 - trunk/src/target/kernel/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-05-09 10:43:38 +0200 (Wed, 09 May 2007)
New Revision: 1931

Modified:
   trunk/src/target/kernel/patches/hxd8-core.patch
Log:
* HXD8: remove static nand partition table, u-boot generates mtdparts commandline
* HXD8: fix machine type 


Modified: trunk/src/target/kernel/patches/hxd8-core.patch
===================================================================
--- trunk/src/target/kernel/patches/hxd8-core.patch	2007-05-09 07:41:42 UTC (rev 1930)
+++ trunk/src/target/kernel/patches/hxd8-core.patch	2007-05-09 08:43:38 UTC (rev 1931)
@@ -29,7 +29,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.21-moko/arch/arm/mach-s3c2440/mach-hxd8.c
-@@ -0,0 +1,430 @@
+@@ -0,0 +1,393 @@
 +/* linux/arch/arm/mach-s3c2440/mach-hxd8.c
 + *
 + * S3C2440 Machine Support for the FIC HXD8
@@ -161,47 +161,10 @@
 +	}
 +};
 +
-+/* NAND partitions.  Once we use dynpart, this goes away */
-+static struct mtd_partition hxd8_default_nand_part[] = {
-+	[0] = {
-+		.name	= "U-Boot",
-+		.size	= 0x100000,
-+		.offset	= 0,
-+	},
-+	[1] = {
-+		.name	= "kernel",
-+		.offset = 0x100000,
-+		.size	= SZ_2M,
-+	},
-+	[2] = {
-+		.name	= "update",
-+		.offset = 0x300000,
-+		.size	= SZ_2M,
-+	},
-+	[3] = {
-+		.name	= "splash",
-+		.offset	= 0x500000,
-+		.size	= SZ_1M,
-+	},
-+	[4] = {
-+		.name	= "jffs2",
-+		.offset = 0x600000,
-+		.size	= SZ_2M * 10,
-+	},
-+	[5] = {
-+		.name	= "temp",
-+		.offset	= 0x1a00000,
-+		.size	= 0x30000000,
-+	},
-+};
-+
 +static struct s3c2410_nand_set hxd8_nand_sets[] = {
 +	[0] = {
 +		.name		= "hxd8-nand",
 +		.nr_chips	= 1,
-+		/* FIXME: the static partition table should be removed soon */
-+		.nr_partitions	= ARRAY_SIZE(hxd8_default_nand_part),
-+		.partitions	= hxd8_default_nand_part,
 +	},
 +};
 +
@@ -449,7 +412,7 @@
 +	s3c2410_pm_init();
 +}
 +
-+MACHINE_START(S3C2440, "HXD8")
++MACHINE_START(HXD8, "HXD8")
 +	/* Maintainer: Harald Welte <laforge at openmoko.org> */
 +	.phys_io	= S3C2410_PA_UART,
 +	.io_pg_offst	= (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,