[x86] change default kernel to 2.6.32.8, remove block2mtd patch until it is fixed

[openwrt.git] / target / linux / orion / patches / 100-openwrt_partition_map.patch

diff --git a/target/linux/orion/patches/100-openwrt_partition_map.patch b/target/linux/orion/patches/100-openwrt_partition_map.patch
index d95e2ec..bef4a54 100644 (file)
--- a/target/linux/orion/patches/100-openwrt_partition_map.patch
+++ b/target/linux/orion/patches/100-openwrt_partition_map.patch
@@ -1,25 +1,32 @@
 --- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
 +++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
 --- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
 +++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c

-@@ -56,19 +56,11 @@ static struct mtd_partition wrt350n_v2_n
+@@ -58,11 +58,11 @@ static struct mtd_partition wrt350n_v2_nor_flash_partitions

        {
                .name           = "kernel",
                .offset         = 0x00000000,
 -              .size           = 0x00760000,
        {
                .name           = "kernel",
                .offset         = 0x00000000,
 -              .size           = 0x00760000,

-+              .size           = 0x00100000,
++              .size           = 0x00100000,   // change to kernel mtd size here (1/3)

        }, {
                .name           = "rootfs",
 -              .offset         = 0x001a0000,
        }, {
                .name           = "rootfs",
 -              .offset         = 0x001a0000,

++              .offset         = 0x00100000,   // change to kernel mtd size here (2/3)

 -              .size           = 0x005c0000,
 -              .size           = 0x005c0000,

--      }, {
--              .name           = "lang",
--              .offset         = 0x00760000,
--              .size           = 0x00040000,
--      }, {
--              .name           = "nvram",
--              .offset         = 0x007a0000,
--              .size           = 0x00020000,
-+              .offset         = 0x00100000,
-+              .size           = 0x006c0000,
++              .size           = 0x00650000,   // adopt to kernel mtd size here (3/3) = 0x00750000 - <kernel mtd size>

        }, {
        }, {

+               .name           = "lang",
+               .offset         = 0x00760000,
+@@ -75,6 +79,14 @@ static struct mtd_partition wrt350n_v2_nor_flash_partitions

                .name           = "u-boot",
                .offset         = 0x007c0000,
                .name           = "u-boot",
                .offset         = 0x007c0000,

+               .size           = 0x00040000,
++      }, {
++              .name           = "eRcOmM_do_not_touch",
++              .offset         = 0x00750000,
++              .size           = 0x00010000,   // erasesize
++      }, {
++              .name           = "image",      // for sysupgrade
++              .offset         = 0x00000000,
++              .size           = 0x00750000,
+       },
+ };
+