diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-02-01 12:41:47 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2016-02-01 12:41:47 +0000 |
| commit | dae91075584260451e12fc43d1255b8a11fbcafe (patch) | |
| tree | 729d47d236bad88c6a6ca8930014b82a943e14b6 | |
| parent | 7abdb1b98a883bf94e1e0dfe51224c917856b621 (diff) | |
| download | master-187ad058-dae91075584260451e12fc43d1255b8a11fbcafe.tar.gz master-187ad058-dae91075584260451e12fc43d1255b8a11fbcafe.tar.bz2 master-187ad058-dae91075584260451e12fc43d1255b8a11fbcafe.zip | |
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ł Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48599 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c | 6 | ||||
| -rw-r--r-- | target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h | 1 |
2 files changed, 7 insertions, 0 deletions
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 |