diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-08-18 21:57:54 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-08-18 21:57:54 +0000 |
| commit | 4a9acacf5341933d0f43476b4aa02de81daff457 (patch) | |
| tree | e319440c9c56147793f4148f7886617322c7840c /target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch | |
| parent | 770ba9d40fc6a0198e0253c6e6eab283b9a22ebd (diff) | |
| download | upstream-4a9acacf5341933d0f43476b4aa02de81daff457.tar.gz upstream-4a9acacf5341933d0f43476b4aa02de81daff457.tar.bz2 upstream-4a9acacf5341933d0f43476b4aa02de81daff457.zip | |
kernel: 3.14: update bcm47xxpart
It it used by brcm47xx and bcm53xx targets, so put patches in generic.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 42212
Diffstat (limited to 'target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch b/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch new file mode 100644 index 0000000000..8c6380318f --- /dev/null +++ b/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch @@ -0,0 +1,66 @@ +--- a/drivers/mtd/bcm47xxpart.c ++++ b/drivers/mtd/bcm47xxpart.c +@@ -36,6 +36,7 @@ + #define ML_MAGIC2 0x26594131 + #define TRX_MAGIC 0x30524448 + #define SQSH_MAGIC 0x71736873 /* shsq */ ++#define UBI_EC_MAGIC 0x23494255 /* UBI# */ + + struct trx_header { + uint32_t magic; +@@ -46,7 +47,7 @@ struct trx_header { + uint32_t offset[3]; + } __packed; + +-static void bcm47xxpart_add_part(struct mtd_partition *part, char *name, ++static void bcm47xxpart_add_part(struct mtd_partition *part, const char *name, + u64 offset, uint32_t mask_flags) + { + part->name = name; +@@ -54,6 +55,26 @@ static void bcm47xxpart_add_part(struct + part->mask_flags = mask_flags; + } + ++static const char *bcm47xxpart_trx_data_part_name(struct mtd_info *master, ++ size_t offset) ++{ ++ uint32_t buf; ++ size_t bytes_read; ++ ++ if (mtd_read(master, offset, sizeof(&buf), &bytes_read, ++ (uint8_t *)&buf) < 0) { ++ pr_err("mtd_read error while parsing (offset: 0x%X)!\n", ++ offset); ++ goto out_default; ++ } ++ ++ if (buf == UBI_EC_MAGIC) ++ return "ubi"; ++ ++out_default: ++ return "rootfs"; ++} ++ + static int bcm47xxpart_parse(struct mtd_info *master, + struct mtd_partition **pparts, + struct mtd_part_parser_data *data) +@@ -147,6 +168,8 @@ static int bcm47xxpart_parse(struct mtd_ + + /* TRX */ + if (buf[0x000 / 4] == TRX_MAGIC) { ++ const char *name; ++ + if (BCM47XXPART_MAX_PARTS - curr_part < 4) { + pr_warn("Not enough partitions left to register trx, scanning stopped!\n"); + break; +@@ -177,7 +200,9 @@ static int bcm47xxpart_parse(struct mtd_ + * trx->length - trx->offset[i]. We don't fill it as + * we want to have jffs2 (overlay) in the same mtd. + */ +- bcm47xxpart_add_part(&parts[curr_part++], "rootfs", ++ name = bcm47xxpart_trx_data_part_name(master, ++ offset + trx->offset[i]); ++ bcm47xxpart_add_part(&parts[curr_part++], name, + offset + trx->offset[i], 0); + i++; + |