diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2014-12-13 20:06:47 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2014-12-13 20:06:47 +0000 |
| commit | 2b4fbeb6d4f77fe3cb441a36f26a577166df381a (patch) | |
| tree | 549347edf8c99e78c47352ae9e2e43ea4a2da112 /target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch | |
| parent | 0fa857f3bad4ee0c385aa3fac6defa97e3e1b991 (diff) | |
| download | upstream-2b4fbeb6d4f77fe3cb441a36f26a577166df381a.tar.gz upstream-2b4fbeb6d4f77fe3cb441a36f26a577166df381a.tar.bz2 upstream-2b4fbeb6d4f77fe3cb441a36f26a577166df381a.zip | |
kernel: move old firmware uimage splitter into separated patch
This will allow us to drop it in the future. This patch doesn't change
the final mtdpart.c, it remains the same.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 43696
Diffstat (limited to 'target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch b/target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch new file mode 100644 index 0000000000..b63690a1d4 --- /dev/null +++ b/target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch @@ -0,0 +1,65 @@ +--- a/drivers/mtd/Kconfig ++++ b/drivers/mtd/Kconfig +@@ -27,6 +27,11 @@ config MTD_SPLIT_FIRMWARE_NAME + depends on MTD_SPLIT_FIRMWARE + default "firmware" + ++config MTD_UIMAGE_SPLIT ++ bool "Enable split support for firmware partitions containing a uImage" ++ depends on MTD_SPLIT_FIRMWARE ++ default y ++ + source "drivers/mtd/mtdsplit/Kconfig" + + config MTD_SPLIT +--- a/drivers/mtd/mtdpart.c ++++ b/drivers/mtd/mtdpart.c +@@ -681,6 +681,32 @@ mtd_pad_erasesize(struct mtd_info *mtd, + return len; + } + ++#define UBOOT_MAGIC 0x27051956 ++ ++static void split_uimage(struct mtd_info *master, struct mtd_part *part) ++{ ++ struct { ++ __be32 magic; ++ __be32 pad[2]; ++ __be32 size; ++ } hdr; ++ size_t len; ++ ++ if (mtd_read(master, part->offset, sizeof(hdr), &len, (void *) &hdr)) ++ return; ++ ++ if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC)) ++ 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); ++} ++ + #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME + #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME + #else +@@ -689,7 +715,14 @@ mtd_pad_erasesize(struct mtd_info *mtd, + + static void split_firmware(struct mtd_info *master, struct mtd_part *part) + { +- run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE); ++ int ret; ++ ++ ret = run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE); ++ if (ret > 0) ++ return; ++ ++ if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT)) ++ split_uimage(master, part); + } + + void __weak arch_split_mtd_part(struct mtd_info *master, const char *name, |