Author: rmilecki Date: 2016-02-01 13:41:47 +0100 (Mon, 01 Feb 2016) New Revision: 48599
Modified: trunk/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c trunk/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h Log: kernel: mtdsplit: detect UBI partition when looking for rootfs This allows mtdsplit parsers work with UBI which is very popular on NAND flases. Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c =================================================================== --- trunk/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c 2016-02-01 12:41:41 UTC (rev 48598) +++ trunk/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c 2016-02-01 12:41:47 UTC (rev 48599) @@ -22,6 +22,8 @@ #include "mtdsplit.h" +#define UBI_EC_MAGIC 0x55424923 /* UBI# */ + struct squashfs_super_block { __le32 s_magic; __le32 pad0[9]; @@ -93,6 +95,10 @@ if (type) *type = MTDSPLIT_PART_TYPE_JFFS2; return 0; + } else if (be32_to_cpu(magic) == UBI_EC_MAGIC) { + if (type) + *type = MTDSPLIT_PART_TYPE_UBI; + return 0; } return -EINVAL; Modified: trunk/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h =================================================================== --- trunk/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h 2016-02-01 12:41:41 UTC (rev 48598) +++ trunk/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h 2016-02-01 12:41:47 UTC (rev 48599) @@ -22,6 +22,7 @@ MTDSPLIT_PART_TYPE_UNK = 0, MTDSPLIT_PART_TYPE_SQUASHFS, MTDSPLIT_PART_TYPE_JFFS2, + MTDSPLIT_PART_TYPE_UBI, }; #ifdef CONFIG_MTD_SPLIT _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
