summaryrefslogtreecommitdiffstats
path: root/nand_spl
diff options
context:
space:
mode:
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>2012-08-13 22:50:53 +0200
committerScott Wood <scottwood@freescale.com>2012-09-17 19:51:45 -0500
commit9c60e75e05dab5a0197728b6a940aaac02762936 (patch)
tree6fda8b0d612fbdacbded796e47fb39914529b24d /nand_spl
parent1884d6577e6b298ab2966d7d8fd7be888c3b7332 (diff)
downloadblackbird-obmc-uboot-9c60e75e05dab5a0197728b6a940aaac02762936.tar.gz
blackbird-obmc-uboot-9c60e75e05dab5a0197728b6a940aaac02762936.zip
mxc nand: Homogenize IP revisions with Linux
Use the same IP revisions as in Linux in order to make the comparison more clear. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Scott Wood <scottwood@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'nand_spl')
-rw-r--r--nand_spl/nand_boot_fsl_nfc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nand_spl/nand_boot_fsl_nfc.c b/nand_spl/nand_boot_fsl_nfc.c
index ea05952eb5..a40c99877c 100644
--- a/nand_spl/nand_boot_fsl_nfc.c
+++ b/nand_spl/nand_boot_fsl_nfc.c
@@ -47,7 +47,7 @@ static void nfc_wait_ready(void)
static void nfc_nand_init(void)
{
-#if defined(MXC_NFC_V1_1)
+#if defined(MXC_NFC_V2_1)
int ecc_per_page = CONFIG_SYS_NAND_PAGE_SIZE / 512;
int config1;
@@ -142,7 +142,7 @@ static int nfc_nand_check_ecc(void)
#if defined(MXC_NFC_V1)
u16 ecc_status = readw(&nfc->ecc_status_result);
return (ecc_status & 0x3) == 2 || (ecc_status >> 2) == 2;
-#elif defined(MXC_NFC_V1_1)
+#elif defined(MXC_NFC_V2_1)
u32 ecc_status = readl(&nfc->ecc_status_result);
int ecc_per_page = CONFIG_SYS_NAND_PAGE_SIZE / 512;
int err_limit = CONFIG_SYS_NAND_SPARE_SIZE / ecc_per_page > 16 ? 8 : 4;
OpenPOWER on IntegriCloud