diff options
| author | Tom Rini <trini@ti.com> | 2013-11-25 10:42:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-25 10:42:13 -0500 |
| commit | faca8ff55f4a2cf45fb906cc37f44601149fc00e (patch) | |
| tree | 181e94fa3326f2ec97f0287f3bbbe54ccd3b13d1 /drivers/mtd/nand/fsl_ifc_spl.c | |
| parent | 5a4fe1aaf1210b02bb98e347993ffbcffeb4ffaa (diff) | |
| parent | 2c17e6d1d996a1b8b9325de15f253a13d5877dee (diff) | |
| download | olio-uboot-2014.01-faca8ff55f4a2cf45fb906cc37f44601149fc00e.tar.xz olio-uboot-2014.01-faca8ff55f4a2cf45fb906cc37f44601149fc00e.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'drivers/mtd/nand/fsl_ifc_spl.c')
| -rw-r--r-- | drivers/mtd/nand/fsl_ifc_spl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mtd/nand/fsl_ifc_spl.c b/drivers/mtd/nand/fsl_ifc_spl.c index d4622653f..9fa5ccbc5 100644 --- a/drivers/mtd/nand/fsl_ifc_spl.c +++ b/drivers/mtd/nand/fsl_ifc_spl.c @@ -112,10 +112,13 @@ static void nand_load(unsigned int offs, int uboot_size, uchar *dst) port_size = (cspr & CSPR_PORT_SIZE_16) ? 16 : 8; - if (csor & CSOR_NAND_PGS_4K) { + if ((csor & CSOR_NAND_PGS_MASK) == CSOR_NAND_PGS_8K) { + page_size = 8192; + bufnum_mask = 0x0; + } else if ((csor & CSOR_NAND_PGS_MASK) == CSOR_NAND_PGS_4K) { page_size = 4096; bufnum_mask = 0x1; - } else if (csor & CSOR_NAND_PGS_2K) { + } else if ((csor & CSOR_NAND_PGS_MASK) == CSOR_NAND_PGS_2K) { page_size = 2048; bufnum_mask = 0x3; } else { |