[PATCH] mtd: bcm47xxpart: detect Squashfs partition

[Brian Norris]

On Fri, Sep 13, 2013 at 06:38:17PM +0200, Rafał Miłecki wrote:
> 
> Signed-off-by: Rafał Miłecki <zajec5 at gmail.com>
> ---
>  drivers/mtd/bcm47xxpart.c |    8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
> index 9279a91..96f821a 100644
> --- 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 */

s/shsq/sqsh/

Or really, the "sqsh" comment doesn't add much to the SQSH_MAGIC macro.
Maybe this instead?

s/shsq/SquashFS/

>  
>  struct trx_header {
>  	uint32_t magic;
> @@ -167,6 +168,13 @@ static int bcm47xxpart_parse(struct mtd_info *master,
>  			offset = rounddown(offset + trx->length, blocksize);
>  			continue;
>  		}
> +
> +		/* Squashfs */
> +		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. */

Brian