diff options
author | Wolfgang Denk <wd@denx.de> | 2006-12-24 01:30:04 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2006-12-24 01:30:04 +0100 |
commit | bc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea (patch) | |
tree | bcb2fa6abc6e2b2ed36a06cd77bb7f869abbe92f /cpu/ppc4xx | |
parent | 1b3c360c235dc684ec06c2d5f183f0a282ce45e2 (diff) | |
parent | fa23044564091f05d9695beb7b5b9a931e7f41a4 (diff) | |
download | u-boot-imx-bc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea.zip u-boot-imx-bc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea.tar.gz u-boot-imx-bc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea.tar.bz2 |
Merge with /home/hs/TQ/u-boot-dev
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 |