ramips: update mtd patches to apply after changes from r43700
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43709 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
3a743d2632
commit
ce4d73fca1
|
@ -1,13 +1,12 @@
|
||||||
--- a/drivers/mtd/mtdpart.c
|
--- a/drivers/mtd/mtdpart.c
|
||||||
+++ b/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;
|
return;
|
||||||
|
|
||||||
len = be32_to_cpu(hdr.size) + 0x40;
|
len = be32_to_cpu(hdr.size) + 0x40;
|
||||||
- len = mtd_pad_erasesize(master, part->offset, len);
|
- len = mtd_pad_erasesize(master, part->offset, len);
|
||||||
- if (len + master->erasesize > part->mtd.size)
|
- if (len + master->erasesize > part->mtd.size)
|
||||||
- return;
|
- return;
|
||||||
-
|
|
||||||
__mtd_add_partition(master, "rootfs", part->offset + len,
|
if (config_enabled(CONFIG_MTD_SPLIT_UIMAGE_FW))
|
||||||
part->mtd.size - len, false);
|
pr_err("Dedicated partitioner didn't split firmware partition, please fill a bug report!\n");
|
||||||
}
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
} hdr;
|
} hdr;
|
||||||
size_t len;
|
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))
|
if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -22,7 +22,6 @@
|
||||||
+ len = be32_to_cpu(hdr.kern_size);
|
+ len = be32_to_cpu(hdr.kern_size);
|
||||||
+ else
|
+ else
|
||||||
+ len = be32_to_cpu(hdr.size) + 0x40;
|
+ len = be32_to_cpu(hdr.size) + 0x40;
|
||||||
+
|
|
||||||
__mtd_add_partition(master, "rootfs", part->offset + len,
|
if (config_enabled(CONFIG_MTD_SPLIT_UIMAGE_FW))
|
||||||
part->mtd.size - len, false);
|
pr_err("Dedicated partitioner didn't split firmware partition, please fill a bug report!\n");
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue