kernel: mtdsplit: add support for EVA images
authorFelix Fietkau <nbd@openwrt.org>
Sun, 17 Jan 2016 10:41:08 +0000 (10:41 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sun, 17 Jan 2016 10:41:08 +0000 (10:41 +0000)
This allows splitting EVA images (usually found in fritz devices). The
firmware will be split into a kernel and a separate rootfs partition.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
SVN-Revision: 48262

target/linux/generic/config-3.18
target/linux/generic/config-4.1
target/linux/generic/config-4.3
target/linux/generic/config-4.4
target/linux/generic/files/drivers/mtd/mtdsplit/Kconfig
target/linux/generic/files/drivers/mtd/mtdsplit/Makefile
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_eva.c [new file with mode: 0644]

index c8ba32802c989582707935e13d78b9707200b1cc..f3ec88d0369f837c8e58e01ec80abb9378774688 100644 (file)
@@ -2266,6 +2266,7 @@ CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_SPINAND_MT29F is not set
 CONFIG_MTD_SPLIT=y
 # CONFIG_MTD_SPLIT_BRNIMAGE_FW is not set
+# CONFIG_MTD_SPLIT_EVA_FW is not set
 # CONFIG_MTD_SPLIT_FIRMWARE is not set
 CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
 # CONFIG_MTD_SPLIT_FIT_FW is not set
index ade6807b2100f8d9fe844746ea12318756feb209..222f8c1c763e9bc1b876988a043d4e780e3b3dcc 100644 (file)
@@ -2358,6 +2358,7 @@ CONFIG_MTD_ROOTFS_ROOT_DEV=y
 # CONFIG_MTD_SPINAND_MT29F is not set
 CONFIG_MTD_SPLIT=y
 # CONFIG_MTD_SPLIT_BRNIMAGE_FW is not set
+# CONFIG_MTD_SPLIT_EVA_FW is not set
 # CONFIG_MTD_SPLIT_FIRMWARE is not set
 CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
 # CONFIG_MTD_SPLIT_FIT_FW is not set
index f5d8ce88a256d136667a4cf7fc3912f641a72fa0..23e6048736e8f193b38a5c62a5a8c34c1d5bc87f 100644 (file)
@@ -2416,6 +2416,7 @@ CONFIG_MTD_ROOTFS_ROOT_DEV=y
 # CONFIG_MTD_SPINAND_MT29F is not set
 CONFIG_MTD_SPLIT=y
 # CONFIG_MTD_SPLIT_BRNIMAGE_FW is not set
+# CONFIG_MTD_SPLIT_EVA_FW is not set
 # CONFIG_MTD_SPLIT_FIRMWARE is not set
 CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
 # CONFIG_MTD_SPLIT_FIT_FW is not set
index c27192d3858a5f013a51dc251c655f2b94d5024d..6ad3008af63ea7666ee015cf210e51bf3135025f 100644 (file)
@@ -2319,6 +2319,7 @@ CONFIG_MTD_ROOTFS_ROOT_DEV=y
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
 CONFIG_MTD_SPLIT=y
 # CONFIG_MTD_SPLIT_BRNIMAGE_FW is not set
+# CONFIG_MTD_SPLIT_EVA_FW is not set
 # CONFIG_MTD_SPLIT_FIRMWARE is not set
 CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
 # CONFIG_MTD_SPLIT_FIT_FW is not set
index 0370a21c9f36dd80e752af159a2810475a97a06e..131a74fd307d9fcfdc104681c21312a51bb5b158 100644 (file)
@@ -54,3 +54,8 @@ config MTD_SPLIT_BRNIMAGE_FW
        bool "brnImage (brnboot image) firmware parser"
        depends on MTD_SPLIT_SUPPORT
        select MTD_SPLIT
+
+config MTD_SPLIT_EVA_FW
+       bool "EVA image based firmware partition parser"
+       depends on MTD_SPLIT_SUPPORT
+       select MTD_SPLIT
index ca24c717dccf6897e869bf5ce5d1430e13e64161..acf799e27a0e47e5b73f990ab53265a61f7175ac 100644 (file)
@@ -7,3 +7,4 @@ obj-$(CONFIG_MTD_SPLIT_LZMA_FW) += mtdsplit_lzma.o
 obj-$(CONFIG_MTD_SPLIT_TPLINK_FW) += mtdsplit_tplink.o
 obj-$(CONFIG_MTD_SPLIT_TRX_FW) += mtdsplit_trx.o
 obj-$(CONFIG_MTD_SPLIT_BRNIMAGE_FW) += mtdsplit_brnimage.o
+obj-$(CONFIG_MTD_SPLIT_EVA_FW) += mtdsplit_eva.o
diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_eva.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_eva.c
new file mode 100644 (file)
index 0000000..d262e60
--- /dev/null
@@ -0,0 +1,96 @@
+/*
+ *  Copyright (C) 2012 John Crispin <blogic@openwrt.org>
+ *  Copyright (C) 2015 Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/byteorder/generic.h>
+
+#include "mtdsplit.h"
+
+#define EVA_NR_PARTS           2
+#define EVA_MAGIC              0xfeed1281
+#define EVA_FOOTER_SIZE                0x18
+#define EVA_DUMMY_SQUASHFS_SIZE        0x100
+
+struct eva_image_header {
+       uint32_t        magic;
+       uint32_t        size;
+};
+
+static int mtdsplit_parse_eva(struct mtd_info *master,
+                               struct mtd_partition **pparts,
+                               struct mtd_part_parser_data *data)
+{
+       struct mtd_partition *parts;
+       struct eva_image_header hdr;
+       size_t retlen;
+       unsigned long kernel_size, rootfs_offset;
+       int err;
+
+       err = mtd_read(master, 0, sizeof(hdr), &retlen, (void *) &hdr);
+       if (err)
+               return err;
+
+       if (retlen != sizeof(hdr))
+               return -EIO;
+
+       if (le32_to_cpu(hdr.magic) != EVA_MAGIC)
+               return -EINVAL;
+
+       kernel_size = le32_to_cpu(hdr.size) + EVA_FOOTER_SIZE;
+
+       /* rootfs starts at the next 0x10000 boundary: */
+       rootfs_offset = round_up(kernel_size, 0x10000);
+
+       /* skip the dummy EVA squashfs partition (with wrong endianness): */
+       rootfs_offset += EVA_DUMMY_SQUASHFS_SIZE;
+
+       if (rootfs_offset >= master->size)
+               return -EINVAL;
+
+       err = mtd_check_rootfs_magic(master, rootfs_offset);
+       if (err)
+               return err;
+
+       parts = kzalloc(EVA_NR_PARTS * sizeof(*parts), GFP_KERNEL);
+       if (!parts)
+               return -ENOMEM;
+
+       parts[0].name = KERNEL_PART_NAME;
+       parts[0].offset = 0;
+       parts[0].size = kernel_size;
+
+       parts[1].name = ROOTFS_PART_NAME;
+       parts[1].offset = rootfs_offset;
+       parts[1].size = master->size - rootfs_offset;
+
+       *pparts = parts;
+       return EVA_NR_PARTS;
+}
+
+static struct mtd_part_parser mtdsplit_eva_parser = {
+       .owner = THIS_MODULE,
+       .name = "eva-fw",
+       .parse_fn = mtdsplit_parse_eva,
+       .type = MTD_PARSER_TYPE_FIRMWARE,
+};
+
+static int __init mtdsplit_eva_init(void)
+{
+       register_mtd_parser(&mtdsplit_eva_parser);
+
+       return 0;
+}
+
+subsys_initcall(mtdsplit_eva_init);