[oe-commits] org.oe.dev linux-turbostation: Update flash partitioning

[nail commit]

linux-turbostation: Update flash partitioning

Author: nail at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 24edc2fd8d4089226a6cf317e1ad63ecabeea97a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=24edc2fd8d4089226a6cf317e1ad63ecabeea97a
Files:
1
packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c
packages/linux/linux-turbostation_2.6.20.1.bb
Diffs:

#
# mt diff -r906d58269912b71d4b883f2167935ffe376e85e8 -r24edc2fd8d4089226a6cf317e1ad63ecabeea97a
#
# 
# 
# patch "packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c"
#  from [ad8248f7a6daea06643bd6be3568e49e8ae6fff9]
#    to [e02e9b5c7ce26327a3cebf6b04a9b8d0a97337e2]
# 
# patch "packages/linux/linux-turbostation_2.6.20.1.bb"
#  from [a3bef7adab56988f3ba7682dc4166e83db639084]
#    to [6cd56876334f8f32fe4145b21039f561ed8d7882]
# 
============================================================
--- packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c	ad8248f7a6daea06643bd6be3568e49e8ae6fff9
+++ packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c	e02e9b5c7ce26327a3cebf6b04a9b8d0a97337e2
@@ -1,47 +1,37 @@
-Index: linux-2.6.20.1/drivers/mtd/maps/physmap.c
+Index: linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c
 ===================================================================
---- linux-2.6.20.1.orig/drivers/mtd/maps/physmap.c	2007-02-20 07:34:32.000000000 +0100
-+++ linux-2.6.20.1/drivers/mtd/maps/physmap.c	2007-02-26 02:05:28.000000000 +0100
-@@ -134,13 +134,53 @@
+--- linux-2.6.21-rc2-git3.orig/drivers/mtd/maps/physmap.c	2007-03-06 01:06:56.000000000 +0100
++++ linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c	2007-03-06 01:12:35.000000000 +0100
+@@ -134,13 +134,43 @@
  	}
  	info->mtd->owner = THIS_MODULE;
  
 +static struct mtd_partition TS101_partitions[] = {
 +	{
-+	  .name = "U-Boot",
++	  .name = "u-boot",
 +	  .offset = 0x00F00000,
 +	  .size = 0x00040000,
 +	  .mask_flags = MTD_WRITEABLE,  /* force read-only */
 +	},
 +	{
-+	  .name = "Kernel",             /* default kernel image */
++	  .name = "kernel",             /* default kernel image */
 +	  .offset = 0x00000000,
-+	  .size = 0x00200000,
++	  .size = 0x00280000,
 +	},
 +	{
-+	  .name = "RootFS1",
-+	  .offset = 0x00200000,
-+	  .size = 0x00900000,
++	  .name = "rootfs",
++	  .offset = 0x00280000,
++	  .size = 0x00C80000,
 +	},
 +	{
-+	  .name = "RootFS2",
-+	  .offset = 0x00b00000,
-+	  .size = 0x00300000,
++	  .name = "empty",
++	  .offset = 0x00F40000,
++	  .size = 0x000A0000,
 +	},
 +	{
-+	  .name = "Vendor",
-+	  .offset = 0x00E00000,
-+	  .size = 0x00100000,
-+	},
-+	{
-+	  .name = "U-Boot Config",
-+	  .offset = 0x00F40000,
++	  .name = "u-boot env",
++	  .offset = 0x00FE0000,
 +	  .size = 0x00020000,
-+	},
-+	{
-+	  .name = "NAS Config",
-+	  .offset = 0x00F60000,
-+	  .size = 0x000A0000,
 +	}
 +};
 +
@@ -53,7 +43,7 @@ Index: linux-2.6.20.1/drivers/mtd/maps/p
  		return 0;
  	}
 -
-+	physmap_set_partitions(TS101_partitions, 7);
++	physmap_set_partitions(TS101_partitions, 5);
  	if (physmap_data->nr_parts) {
  		printk(KERN_NOTICE "Using physmap partition information\n");
  		add_mtd_partitions(info->mtd, physmap_data->parts,
============================================================
--- packages/linux/linux-turbostation_2.6.20.1.bb	a3bef7adab56988f3ba7682dc4166e83db639084
+++ packages/linux/linux-turbostation_2.6.20.1.bb	6cd56876334f8f32fe4145b21039f561ed8d7882
@@ -1,8 +1,8 @@ DEPENDS = "uboot-utils"
 DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform"
 SECTION = "kernel"
 LICENSE = "GPL"
 DEPENDS = "uboot-utils"
-PR = "r3"
+PR = "r4"
 
 # notes on iom def kernel:
 #