ramips: update mtd patches to apply after changes from r43700

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 43709
This commit is contained in:
Rafał Miłecki 2014-12-15 09:10:43 +00:00
parent b5b4bdc066
commit fbea00b031
2 changed files with 8 additions and 10 deletions

View File

@ -1,13 +1,12 @@
--- 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;
-
__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");

View File

@ -13,7 +13,7 @@
} hdr;
size_t len;
@@ -807,7 +810,11 @@ static void split_uimage(struct mtd_info
@@ -807,7 +810,10 @@ static void split_uimage(struct mtd_info
if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC))
return;
@ -22,7 +22,6 @@
+ len = be32_to_cpu(hdr.kern_size);
+ else
+ len = be32_to_cpu(hdr.size) + 0x40;
+
__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");