diff options
author | Wolfgang Denk <wd@denx.de> | 2009-01-10 18:18:37 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-01-10 18:18:37 +0100 |
commit | 950309c6436ff78d2166377da34bfdb0ae00a4a4 (patch) | |
tree | 77fee7945ade9471aef1dff0204858f217a78245 /board/bf537-stamp/nand.c | |
parent | 3dd9395a0d7ce69a335d0e743c04b9caedd681d3 (diff) | |
parent | 032a1c934ef4dc003281f57302b6e693062c1868 (diff) | |
download | u-boot-imx-950309c6436ff78d2166377da34bfdb0ae00a4a4.zip u-boot-imx-950309c6436ff78d2166377da34bfdb0ae00a4a4.tar.gz u-boot-imx-950309c6436ff78d2166377da34bfdb0ae00a4a4.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'board/bf537-stamp/nand.c')
-rw-r--r-- | board/bf537-stamp/nand.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/board/bf537-stamp/nand.c b/board/bf537-stamp/nand.c index c597f2d..20a7d0e 100644 --- a/board/bf537-stamp/nand.c +++ b/board/bf537-stamp/nand.c @@ -87,7 +87,7 @@ int bfin_device_ready(struct mtd_info *mtd) * 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) { *PORT(CONFIG_NAND_GPIO_PORT, _FER) &= ~BFIN_NAND_READY; *PORT(CONFIG_NAND_GPIO_PORT, IO_DIR) &= ~BFIN_NAND_READY; @@ -97,5 +97,7 @@ void board_nand_init(struct nand_chip *nand) nand->ecc.mode = NAND_ECC_SOFT; nand->dev_ready = bfin_device_ready; nand->chip_delay = 30; + + return 0; } #endif |