[PATCH] arm: mxs: bcb: fix usage of second bootstream

[PATCH] arm: mxs: bcb: fix usage of second bootstream

[Wolfram Sang]

If a second bootstream was used, there was a sanity check which was not
only wrong (using erasesize instead of writesize) but also superfluous
(we got the block from an existing cdev, so it must be in the flash
range). Simply remove it to make bcb work as expected.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
---
 arch/arm/mach-mxs/bcb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-mxs/bcb.c b/arch/arm/mach-mxs/bcb.c
index d0a3ddc..af51d24 100644
--- a/arch/arm/mach-mxs/bcb.c
+++ b/arch/arm/mach-mxs/bcb.c
@@ -236,7 +236,7 @@ static struct mx28_fcb *create_fcb(struct mtd_info *mtd, void *buf, unsigned fw1
 	fcb->fw1_start_page = fw1_start_block / mtd->writesize;
 	fcb->fw1_sectors = DIV_ROUND_UP(fw_size, mtd->writesize);
 
-	if (fw2_start_block != 0 && fw2_start_block < mtd->size / mtd->erasesize) {
+	if (fw2_start_block) {
 		fcb->fw2_start_page = fw2_start_block / mtd->writesize;
 		fcb->fw2_sectors = fcb->fw1_sectors;
 	}
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] arm: mxs: bcb: fix usage of second bootstream

[Sascha Hauer]

On Fri, Aug 31, 2012 at 06:00:27PM +0200, Wolfram Sang wrote:
> If a second bootstream was used, there was a sanity check which was not
> only wrong (using erasesize instead of writesize) but also superfluous
> (we got the block from an existing cdev, so it must be in the flash
> range). Simply remove it to make bcb work as expected.
> 
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>

Applied, thanks

Sascha

> ---
>  arch/arm/mach-mxs/bcb.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-mxs/bcb.c b/arch/arm/mach-mxs/bcb.c
> index d0a3ddc..af51d24 100644
> --- a/arch/arm/mach-mxs/bcb.c
> +++ b/arch/arm/mach-mxs/bcb.c
> @@ -236,7 +236,7 @@ static struct mx28_fcb *create_fcb(struct mtd_info *mtd, void *buf, unsigned fw1
>  	fcb->fw1_start_page = fw1_start_block / mtd->writesize;
>  	fcb->fw1_sectors = DIV_ROUND_UP(fw_size, mtd->writesize);
>  
> -	if (fw2_start_block != 0 && fw2_start_block < mtd->size / mtd->erasesize) {
> +	if (fw2_start_block) {
>  		fcb->fw2_start_page = fw2_start_block / mtd->writesize;
>  		fcb->fw2_sectors = fcb->fw1_sectors;
>  	}
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox