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 /cpu/ppc4xx | |
| 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 'cpu/ppc4xx')
| -rw-r--r-- | cpu/ppc4xx/ndfc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpu/ppc4xx/ndfc.c b/cpu/ppc4xx/ndfc.c index 3521731..b198ff4 100644 --- a/cpu/ppc4xx/ndfc.c +++ b/cpu/ppc4xx/ndfc.c @@ -156,7 +156,7 @@ void board_nand_select_device(struct nand_chip *nand, int chip) out32(base + NDFC_CCR, 0x00000000 | (cs << 24)); } -void board_nand_init(struct nand_chip *nand) +int board_nand_init(struct nand_chip *nand) { int cs = (ulong)nand->IO_ADDR_W & 0x00000003; ulong base = (ulong)nand->IO_ADDR_W & 0xfffffffc; @@ -188,6 +188,7 @@ void board_nand_init(struct nand_chip *nand) */ board_nand_select_device(nand, cs); out32(base + NDFC_BCFG0 + (cs << 2), 0x80002222); + return 0; } #endif |