From 4156f292c157b8e118ac05ea4b8e861c58531eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 1 Feb 2016 12:41:47 +0000 Subject: kernel: mtdsplit: detect UBI partition when looking for rootfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows mtdsplit parsers work with UBI which is very popular on NAND flases. Signed-off-by: Rafał Miłecki SVN-Revision: 48599 --- target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c | 6 ++++++ target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h | 1 + 2 files changed, 7 insertions(+) (limited to 'target/linux/generic') diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c index 4f6b46e28b..9a330df252 100644 --- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c +++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c @@ -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 @@ int mtd_check_rootfs_magic(struct mtd_info *mtd, size_t offset, 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; diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h index b757758685..42841ef541 100644 --- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h +++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h @@ -22,6 +22,7 @@ enum mtdsplit_part_type { MTDSPLIT_PART_TYPE_UNK = 0, MTDSPLIT_PART_TYPE_SQUASHFS, MTDSPLIT_PART_TYPE_JFFS2, + MTDSPLIT_PART_TYPE_UBI, }; #ifdef CONFIG_MTD_SPLIT -- cgit v1.2.3