diff options
| author | Tom Rini <trini@ti.com> | 2014-07-28 14:54:29 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-07-28 14:54:29 -0400 |
| commit | d5f8a6ddd41dee0de17888f8b5334fe1b636c4ca (patch) | |
| tree | 1df8ab92fd228598d5884db37cceddcb18a0c020 /drivers/mtd/nand/fsl_ifc_spl.c | |
| parent | ee860c60d2c5283c009f7ea740c6ee706da87cb7 (diff) | |
| parent | fb5368789a45ca5ee4396cbbf563a8f16ab24f9c (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers/mtd/nand/fsl_ifc_spl.c')
| -rw-r--r-- | drivers/mtd/nand/fsl_ifc_spl.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mtd/nand/fsl_ifc_spl.c b/drivers/mtd/nand/fsl_ifc_spl.c index 510077282c..e336cb1c94 100644 --- a/drivers/mtd/nand/fsl_ifc_spl.c +++ b/drivers/mtd/nand/fsl_ifc_spl.c @@ -97,7 +97,7 @@ int nand_spl_load_image(uint32_t offs, unsigned int uboot_size, void *vdst) int pages_per_blk; int blk_size; int bad_marker = 0; - int bufnum_mask, bufnum; + int bufnum_mask, bufnum, ver = 0; int csor, cspr; int pos = 0; @@ -130,6 +130,10 @@ int nand_spl_load_image(uint32_t offs, unsigned int uboot_size, void *vdst) bad_marker = 5; } + ver = ifc_in32(&ifc->ifc_rev); + if (ver >= FSL_IFC_V2_0_0) + bufnum_mask = (bufnum_mask * 2) + 1; + pages_per_blk = 32 << ((csor & CSOR_NAND_PB_MASK) >> CSOR_NAND_PB_SHIFT); |