diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2014-12-15 09:10:43 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2014-12-15 09:10:43 +0000 |
| commit | ce4d73fca12f30a010bd08b63c0f76c8efcbaeac (patch) | |
| tree | ae030aec01caff2f1e48373f5db99ef8903524fc /target/linux | |
| parent | 3a743d2632daf3edd36c5296e5f56b80952eaf18 (diff) | |
| download | upstream-ce4d73fca12f30a010bd08b63c0f76c8efcbaeac.tar.gz upstream-ce4d73fca12f30a010bd08b63c0f76c8efcbaeac.tar.bz2 upstream-ce4d73fca12f30a010bd08b63c0f76c8efcbaeac.zip | |
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-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/ramips/patches-3.14/0100-mtd-split-remove-padding.patch | 9 | ||||
| -rw-r--r-- | target/linux/ramips/patches-3.14/0101-mtd-add-rtn56u-support.patch | 9 |
2 files changed, 8 insertions, 10 deletions
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 4d1a4ce6fb..be4522ce09 100644 --- 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 -@@ -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"); diff --git a/target/linux/ramips/patches-3.14/0101-mtd-add-rtn56u-support.patch b/target/linux/ramips/patches-3.14/0101-mtd-add-rtn56u-support.patch index ec6ef462ba..03598807e5 100644 --- a/target/linux/ramips/patches-3.14/0101-mtd-add-rtn56u-support.patch +++ b/target/linux/ramips/patches-3.14/0101-mtd-add-rtn56u-support.patch @@ -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"); |