kernel: mtdsplit_uimage: replace "openwrt, okli" parser

[openwrt/staging/jow.git] / target / linux / generic / files / drivers / mtd / mtdsplit / mtdsplit_uimage.c

diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_uimage.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_uimage.c
index 58c40e9ec70b5a88452a119c0ad13795a13be443..32c027d3e9795853c5f482f815032713c0fae4da 100644 (file)
--- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_uimage.c
+++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_uimage.c
@@ -429,58 +429,6 @@ static struct mtd_part_parser uimage_edimax_parser = {
        .type = MTD_PARSER_TYPE_FIRMWARE,
 };
 
-/**************************************************
- * OKLI (OpenWrt Kernel Loader Image)
- **************************************************/
-
-#define IH_MAGIC_OKLI  0x4f4b4c49
-
-static ssize_t uimage_verify_okli(u_char *buf, size_t len, u32 ih_magic)
-{
-       struct uimage_header *header = (struct uimage_header *)buf;
-
-       /* default sanity checks */
-       if (be32_to_cpu(header->ih_magic) != IH_MAGIC_OKLI) {
-               pr_debug("invalid uImage magic: %08x\n",
-                        be32_to_cpu(header->ih_magic));
-               return -EINVAL;
-       }
-
-       if (header->ih_os != IH_OS_LINUX) {
-               pr_debug("invalid uImage OS: %08x\n",
-                        be32_to_cpu(header->ih_os));
-               return -EINVAL;
-       }
-
-       if (header->ih_type != IH_TYPE_KERNEL) {
-               pr_debug("invalid uImage type: %08x\n",
-                        be32_to_cpu(header->ih_type));
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-static int
-mtdsplit_uimage_parse_okli(struct mtd_info *master,
-                             const struct mtd_partition **pparts,
-                             struct mtd_part_parser_data *data)
-{
-       return __mtdsplit_parse_uimage(master, pparts, data,
-                                     uimage_verify_okli);
-}
-
-static const struct of_device_id mtdsplit_uimage_okli_of_match_table[] = {
-       { .compatible = "openwrt,okli" },
-       {},
-};
-
-static struct mtd_part_parser uimage_okli_parser = {
-       .owner = THIS_MODULE,
-       .name = "okli-fw",
-       .of_match_table = mtdsplit_uimage_okli_of_match_table,
-       .parse_fn = mtdsplit_uimage_parse_okli,
-};
 
 /**************************************************
  * Init
@@ -492,7 +440,6 @@ static int __init mtdsplit_uimage_init(void)
        register_mtd_parser(&uimage_netgear_parser);
        register_mtd_parser(&uimage_allnet_parser);
        register_mtd_parser(&uimage_edimax_parser);
-       register_mtd_parser(&uimage_okli_parser);
 
        return 0;
 }