Eric Lee / smarc-uboot

Download as
Browse Code »

Commit 0eee20fc1bb16f484771d626e1d7bde7d770a01c

Authored by Benoît Thébaudeau
Committed by Scott Wood
1 parent 5d818a2821
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

spl mxc nand: Remove duplicated code 

The ECC_EN and INT_MSK bits of CONFIG1 are not volatile, so it is sufficient to
set them once in nfc_nand_init().

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>

Showing 1 changed file with 2 additions and 8 deletions Side-by-side Diff

nand_spl/nand_boot_fsl_nfc.c
Diff comments   View file @ 0eee20f
... ... @@ -57,7 +57,7 @@
57 57 writew(0x2, &nfc->config);
58 58  
59 59 /* hardware ECC checking and correct */
60   - config1 = readw(&nfc->config1) | NFC_ECC_EN | NFC_FP_INT;
  60 + config1 = readw(&nfc->config1) | NFC_ECC_EN | NFC_INT_MSK | NFC_FP_INT;
61 61 /*
62 62 * if spare size is larger that 16 bytes per 512 byte hunk
63 63 * then use 8 symbol correction instead of 4
... ... @@ -72,7 +72,7 @@
72 72 writew(0x2, &nfc->config);
73 73  
74 74 /* hardware ECC checking and correct */
75   - writew(NFC_ECC_EN, &nfc->config1);
  75 + writew(NFC_ECC_EN | NFC_INT_MSK, &nfc->config1);
76 76 #endif
77 77 }
78 78  
79 79  
... ... @@ -116,13 +116,10 @@
116 116  
117 117 static void nfc_nand_data_output(void)
118 118 {
119   - int config1 = readw(&nfc->config1);
120 119 #ifdef NAND_MXC_2K_MULTI_CYCLE
121 120 int i;
122 121 #endif
123 122  
124   - config1 |= NFC_ECC_EN | NFC_INT_MSK;
125   - writew(config1, &nfc->config1);
126 123 writew(0, &nfc->buf_addr);
127 124 writew(NFC_OUTPUT, &nfc->config2);
128 125 nfc_wait_ready();
... ... @@ -132,9 +129,6 @@
132 129 * for pages larger than 512 bytes.
133 130 */
134 131 for (i = 1; i < CONFIG_SYS_NAND_PAGE_SIZE / 512; i++) {
135   - config1 = readw(&nfc->config1);
136   - config1 |= NFC_ECC_EN | NFC_INT_MSK;
137   - writew(config1, &nfc->config1);
138 132 writew(i, &nfc->buf_addr);
139 133 writew(NFC_OUTPUT, &nfc->config2);
140 134 nfc_wait_ready();