1 --- a/drivers/mtd/Kconfig
2 +++ b/drivers/mtd/Kconfig
3 @@ -27,6 +27,11 @@ config MTD_SPLIT_FIRMWARE_NAME
4 depends on MTD_SPLIT_FIRMWARE
7 +config MTD_UIMAGE_SPLIT
8 + bool "Enable split support for firmware partitions containing a uImage"
9 + depends on MTD_SPLIT_FIRMWARE
12 source "drivers/mtd/mtdsplit/Kconfig"
15 --- a/drivers/mtd/mtdpart.c
16 +++ b/drivers/mtd/mtdpart.c
17 @@ -668,6 +668,37 @@ mtd_pad_erasesize(struct mtd_info *mtd,
21 +#define UBOOT_MAGIC 0x27051956
23 +static void split_uimage(struct mtd_info *master, struct mtd_part *part)
32 + if (mtd_read(master, part->offset, sizeof(hdr), &len, (void *) &hdr))
35 + if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC))
38 + len = be32_to_cpu(hdr.size) + 0x40;
39 + len = mtd_pad_erasesize(master, part->offset, len);
40 + if (len + master->erasesize > part->mtd.size)
43 + if (config_enabled(CONFIG_MTD_SPLIT_UIMAGE_FW))
44 + pr_err("Dedicated partitioner didn't split firmware partition, please fill a bug report!\n");
46 + pr_warn("Support for built-in firmware splitter will be removed, please use CONFIG_MTD_SPLIT_UIMAGE_FW\n");
48 + __mtd_add_partition(master, "rootfs", part->offset + len,
49 + part->mtd.size - len, false);
52 #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
53 #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
55 @@ -676,7 +707,14 @@ mtd_pad_erasesize(struct mtd_info *mtd,
57 static void split_firmware(struct mtd_info *master, struct mtd_part *part)
59 - run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
62 + ret = run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
66 + if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
67 + split_uimage(master, part);
70 void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,