summaryrefslogtreecommitdiff
path: root/board/dave/PPChameleonEVB/nand.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2006-12-28 19:09:07 +0100
committerStefan Roese <sr@denx.de>2006-12-28 19:09:07 +0100
commitcce2adfb93ea31d21a2f69bbf68146dfe8c40350 (patch)
tree1485bc01fbdd9b6b8b8493c490ba4bf6f5cb4439 /board/dave/PPChameleonEVB/nand.c
parent074acedbff821026ed47035e56a18600d789ce05 (diff)
parent92eb729bad876725aeea908d2addba0800620840 (diff)
downloadu-boot-imx-cce2adfb93ea31d21a2f69bbf68146dfe8c40350.zip
u-boot-imx-cce2adfb93ea31d21a2f69bbf68146dfe8c40350.tar.gz
u-boot-imx-cce2adfb93ea31d21a2f69bbf68146dfe8c40350.tar.bz2
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'board/dave/PPChameleonEVB/nand.c')
-rw-r--r--board/dave/PPChameleonEVB/nand.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/board/dave/PPChameleonEVB/nand.c b/board/dave/PPChameleonEVB/nand.c
index 40a827c..f5c3dd9 100644
--- a/board/dave/PPChameleonEVB/nand.c
+++ b/board/dave/PPChameleonEVB/nand.c
@@ -105,7 +105,7 @@ static int ppchameleonevb_device_ready(struct mtd_info *mtdinfo)
* Members with a "?" were not set in the merged testing-NAND branch,
* so they are not set here either.
*/
-void board_nand_init(struct nand_chip *nand)
+int board_nand_init(struct nand_chip *nand)
{
nand->hwcontrol = ppchameleonevb_hwcontrol;
@@ -113,5 +113,6 @@ void board_nand_init(struct nand_chip *nand)
nand->eccmode = NAND_ECC_SOFT;
nand->chip_delay = NAND_BIG_DELAY_US;
nand->options = NAND_SAMSUNG_LP_OPTIONS;
+ return 0;
}
#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) */