diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-03-18 00:40:57 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-03-18 00:40:57 +0100 |
| commit | efb47346d4be024d995fe907dbd358a21651a67e (patch) | |
| tree | 8acc6a1f8549cf7e4cf42116cf0d67895773cf82 /board | |
| parent | efa0215228a26a90c86ac03511da73cb519eb516 (diff) | |
| parent | 8d8235f84d3ef3f29b7d14e741369b5824b5bb4a (diff) | |
| download | u-boot-imx-efb47346d4be024d995fe907dbd358a21651a67e.zip u-boot-imx-efb47346d4be024d995fe907dbd358a21651a67e.tar.gz u-boot-imx-efb47346d4be024d995fe907dbd358a21651a67e.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
Diffstat (limited to 'board')
| -rw-r--r-- | board/freescale/m5329evb/nand.c | 6 | ||||
| -rw-r--r-- | board/freescale/m5373evb/nand.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/board/freescale/m5329evb/nand.c b/board/freescale/m5329evb/nand.c index cf27dda..16025f9 100644 --- a/board/freescale/m5329evb/nand.c +++ b/board/freescale/m5329evb/nand.c @@ -47,10 +47,12 @@ static void nand_hwcontrol(struct mtd_info *mtdinfo, int cmd, unsigned int ctrl) ulong IO_ADDR_W = (ulong) this->IO_ADDR_W; IO_ADDR_W &= ~(SET_ALE | SET_CLE); - *nCE &= 0xFFFB; if (ctrl & NAND_NCE) + *nCE &= 0xFFFB; + else *nCE |= 0x0004; + if (ctrl & NAND_CLE) IO_ADDR_W |= SET_CLE; if (ctrl & NAND_ALE) @@ -78,7 +80,7 @@ int board_nand_init(struct nand_chip *nand) gpio->pclrr_timer = 0; gpio->podr_timer = 0; - nand->chip_delay = 50; + nand->chip_delay = 60; nand->ecc.mode = NAND_ECC_SOFT; nand->cmd_ctrl = nand_hwcontrol; diff --git a/board/freescale/m5373evb/nand.c b/board/freescale/m5373evb/nand.c index 3ebef05..df8c03b 100644 --- a/board/freescale/m5373evb/nand.c +++ b/board/freescale/m5373evb/nand.c @@ -47,10 +47,12 @@ static void nand_hwcontrol(struct mtd_info *mtdinfo, int cmd, unsigned int ctrl) ulong IO_ADDR_W = (ulong) this->IO_ADDR_W; IO_ADDR_W &= ~(SET_ALE | SET_CLE); - *nCE &= 0xFFFB; if (ctrl & NAND_NCE) + *nCE &= 0xFFFB; + else *nCE |= 0x0004; + if (ctrl & NAND_CLE) IO_ADDR_W |= SET_CLE; if (ctrl & NAND_ALE) @@ -82,7 +84,7 @@ int board_nand_init(struct nand_chip *nand) gpio->pclrr_timer = 0; gpio->podr_timer = 0; - nand->chip_delay = 50; + nand->chip_delay = 60; nand->ecc.mode = NAND_ECC_SOFT; nand->cmd_ctrl = nand_hwcontrol; |