diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2007-01-04 11:10:05 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-01-04 11:10:05 +0800 |
| commit | a41969e09b9d886091a804c2ba5f1ab84b084dd3 (patch) | |
| tree | 96d4b03713537e6c0a696e4770c23f9d39792666 /board/zylonite | |
| parent | d3bb5ec198edad4869ac5276a5899881b7bf5433 (diff) | |
| parent | 92eb729bad876725aeea908d2addba0800620840 (diff) | |
| download | u-boot-imx-a41969e09b9d886091a804c2ba5f1ab84b084dd3.zip u-boot-imx-a41969e09b9d886091a804c2ba5f1ab84b084dd3.tar.gz u-boot-imx-a41969e09b9d886091a804c2ba5f1ab84b084dd3.tar.bz2 | |
Merge branch 'master' into hpc2
Diffstat (limited to 'board/zylonite')
| -rw-r--r-- | board/zylonite/nand.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/board/zylonite/nand.c b/board/zylonite/nand.c index 5d2cd65..a417143 100644 --- a/board/zylonite/nand.c +++ b/board/zylonite/nand.c @@ -448,7 +448,7 @@ static void dfc_gpio_init(void) * 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) { unsigned long tCH, tCS, tWH, tWP, tRH, tRP, tRP_high, tR, tWHR, tAR; @@ -576,6 +576,7 @@ void board_nand_init(struct nand_chip *nand) nand->cmdfunc = dfc_cmdfunc; nand->autooob = &delta_oob; nand->badblock_pattern = &delta_bbt_descr; + return 0; } #else |