From b26aeffe76854b683b28273108c97d560138cef7 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 12 Jan 2014 18:50:45 +0000 Subject: brcm47xx: update mtd drivers This backports some patches from linux upstream. Signed-off-by: Hauke Mehrtens git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39249 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...part-detect-block-aligned-Squashfs-partit.patch | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 target/linux/brcm47xx/patches-3.10/021-mtd-bcm47xxpart-detect-block-aligned-Squashfs-partit.patch (limited to 'target/linux/brcm47xx/patches-3.10/021-mtd-bcm47xxpart-detect-block-aligned-Squashfs-partit.patch') diff --git a/target/linux/brcm47xx/patches-3.10/021-mtd-bcm47xxpart-detect-block-aligned-Squashfs-partit.patch b/target/linux/brcm47xx/patches-3.10/021-mtd-bcm47xxpart-detect-block-aligned-Squashfs-partit.patch new file mode 100644 index 0000000000..72891b2c6a --- /dev/null +++ b/target/linux/brcm47xx/patches-3.10/021-mtd-bcm47xxpart-detect-block-aligned-Squashfs-partit.patch @@ -0,0 +1,50 @@ +From 020c6bcfbeabee72c18d862769d72cf9241b9004 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Mon, 21 Oct 2013 22:34:37 +0200 +Subject: [PATCH] mtd: bcm47xxpart: detect block aligned Squashfs partition +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Most of the bcm47xx devices use TRX format for storing kernel and some +partition like Squashfs or JFFS2. This is pretty flexible solution, CFE +(the bootloader) just writes (and later boots) TRX at some hardcoded +place and paritions can vary in the size. + +However some devices don't use TRX format. Very recently we have +discovered ZTE H218N that has kernel and rootfs partitions at some +"random" places. + +This patch allows Linux find a rootfs partition after installing custom +image with a CFE bootloader. + +Signed-off-by: Rafał Miłecki +Signed-off-by: Brian Norris +--- + drivers/mtd/bcm47xxpart.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/drivers/mtd/bcm47xxpart.c ++++ b/drivers/mtd/bcm47xxpart.c +@@ -32,6 +32,7 @@ + #define ML_MAGIC1 0x39685a42 + #define ML_MAGIC2 0x26594131 + #define TRX_MAGIC 0x30524448 ++#define SQSH_MAGIC 0x71736873 /* shsq */ + + struct trx_header { + uint32_t magic; +@@ -174,6 +175,13 @@ static int bcm47xxpart_parse(struct mtd_ + offset = rounddown(offset + trx->length, blocksize); + continue; + } ++ ++ /* Squashfs on devices not using TRX */ ++ if (buf[0x000 / 4] == SQSH_MAGIC) { ++ bcm47xxpart_add_part(&parts[curr_part++], "rootfs", ++ offset, 0); ++ continue; ++ } + } + + /* Look for NVRAM at the end of the last block. */ -- cgit v1.2.3