ramips: update mtd patches to apply after changes from r43700

[openwrt/svn-archive/archive.git] / target / linux / ramips / patches-3.14 / 0100-mtd-split-remove-padding.patch

diff --git a/target/linux/ramips/patches-3.14/0100-mtd-split-remove-padding.patch b/target/linux/ramips/patches-3.14/0100-mtd-split-remove-padding.patch
index 4d1a4ce6fb2c88e05094e181667653ed83a5d988..be4522ce0991582015bc4a101e4c4cec4d49664e 100644 (file)
--- a/target/linux/ramips/patches-3.14/0100-mtd-split-remove-padding.patch
+++ b/target/linux/ramips/patches-3.14/0100-mtd-split-remove-padding.patch
@@ -1,13 +1,12 @@
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c

-@@ -808,10 +808,6 @@ static void split_uimage(struct mtd_info
+@@ -808,9 +808,6 @@ static void split_uimage(struct mtd_info

                return;
  
        len = be32_to_cpu(hdr.size) + 0x40;
 -      len = mtd_pad_erasesize(master, part->offset, len);
 -      if (len + master->erasesize > part->mtd.size)
 -              return;
                return;
  
        len = be32_to_cpu(hdr.size) + 0x40;
 -      len = mtd_pad_erasesize(master, part->offset, len);
 -      if (len + master->erasesize > part->mtd.size)
 -              return;

--
-       __mtd_add_partition(master, "rootfs", part->offset + len,
-                           part->mtd.size - len, false);
- }
+ 
+       if (config_enabled(CONFIG_MTD_SPLIT_UIMAGE_FW))
+               pr_err("Dedicated partitioner didn't split firmware partition, please fill a bug report!\n");