diff options
| author | Tom Rini <trini@ti.com> | 2012-12-17 18:39:45 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-17 18:39:45 -0700 |
| commit | e80e588bb8db254fd939f83116ccf901bd233066 (patch) | |
| tree | 36cbbced46e1d476021f2664db7f7f9b41021a1a | |
| parent | ebbf0d20aa85f623c49b7ed3349ebfea450c152d (diff) | |
| parent | 71779d5b873186941652188a30bf703c951b1616 (diff) | |
| download | u-boot-imx-e80e588bb8db254fd939f83116ccf901bd233066.zip u-boot-imx-e80e588bb8db254fd939f83116ccf901bd233066.tar.gz u-boot-imx-e80e588bb8db254fd939f83116ccf901bd233066.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
| -rw-r--r-- | drivers/mtd/nand/mxs_nand.c | 3 | ||||
| -rw-r--r-- | include/configs/m28evk.h | 2 | ||||
| -rw-r--r-- | include/configs/mx28evk.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c index 4701be8..e38e151 100644 --- a/drivers/mtd/nand/mxs_nand.c +++ b/drivers/mtd/nand/mxs_nand.c @@ -1058,6 +1058,8 @@ int mxs_nand_init(struct mxs_nand_info *info) { struct mxs_gpmi_regs *gpmi_regs = (struct mxs_gpmi_regs *)MXS_GPMI_BASE; + struct mxs_bch_regs *bch_regs = + (struct mxs_bch_regs *)MXS_BCH_BASE; int i = 0, j; info->desc = malloc(sizeof(struct mxs_dma_desc *) * @@ -1081,6 +1083,7 @@ int mxs_nand_init(struct mxs_nand_info *info) /* Reset the GPMI block. */ mxs_reset_block(&gpmi_regs->hw_gpmi_ctrl0_reg); + mxs_reset_block(&bch_regs->hw_bch_ctrl_reg); /* * Choose NAND mode, set IRQ polarity, disable write protection and diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index b49ec8c..3f37e84 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -297,7 +297,7 @@ "if tftp ${update_nand_full_filename} ; then " \ "run update_nand_get_fcb_size ; " \ "nand scrub -y 0x0 ${filesize} ; " \ - "nand write.raw ${loadaddr} 0x0 ${update_nand_fcb} ; " \ + "nand write.raw ${loadaddr} 0x0 ${fcb_sz} ; " \ "setexpr update_off ${loadaddr} + ${update_nand_fcb} ; " \ "setexpr update_sz ${filesize} - ${update_nand_fcb} ; " \ "nand write ${update_off} ${update_nand_fcb} ${update_sz} ; " \ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 2916c71..3d4a601 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -263,7 +263,7 @@ "if tftp ${update_nand_full_filename} ; then " \ "run update_nand_get_fcb_size ; " \ "nand scrub -y 0x0 ${filesize} ; " \ - "nand write.raw ${loadaddr} 0x0 ${update_nand_fcb} ; " \ + "nand write.raw ${loadaddr} 0x0 ${fcb_sz} ; " \ "setexpr update_off ${loadaddr} + ${update_nand_fcb} ; " \ "setexpr update_sz ${filesize} - ${update_nand_fcb} ; " \ "nand write ${update_off} ${update_nand_fcb} ${update_sz} ; " \ |