diff options
| author | wdenk <wdenk> | 2003-10-06 21:55:32 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-10-06 21:55:32 +0000 |
| commit | fbe4b5cbdea438ccec0d93de443f367f3ba46196 (patch) | |
| tree | 7a0a65dbae5217950bcc6301a435a074263fa0a7 /board/dave | |
| parent | bb65a312675f3cd1923a5cbe325ad9ca1703fc58 (diff) | |
| download | blackbird-obmc-uboot-fbe4b5cbdea438ccec0d93de443f367f3ba46196.tar.gz blackbird-obmc-uboot-fbe4b5cbdea438ccec0d93de443f367f3ba46196.zip | |
* Update TRAB auto update code
* Make fatload set filesize environment variable
fix potential buffer overlow problem
* enable basic / medium / high-end configurations for PPChameleonEVB
board; fix NAND code
* enable TFTP client code to specify to the server the desired
timeout value (see RFC-2349)
Diffstat (limited to 'board/dave')
| -rw-r--r-- | board/dave/PPChameleonEVB/PPChameleonEVB.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/board/dave/PPChameleonEVB/PPChameleonEVB.c b/board/dave/PPChameleonEVB/PPChameleonEVB.c index 47670fa21b..811f6f8d4b 100644 --- a/board/dave/PPChameleonEVB/PPChameleonEVB.c +++ b/board/dave/PPChameleonEVB/PPChameleonEVB.c @@ -261,10 +261,13 @@ nand_probe(ulong physadr); void nand_init(void) { - ulong totlen; + ulong totlen = 0; +#if (CONFIG_PPCHAMELEON_MODULE_MODEL == CONFIG_PPCHAMELEON_MODULE_ME) || \ + (CONFIG_PPCHAMELEON_MODULE_MODEL == CONFIG_PPCHAMELEON_MODULE_HI) debug ("Probing at 0x%.8x\n", CFG_NAND0_BASE); - totlen = nand_probe (CFG_NAND0_BASE); + totlen += nand_probe (CFG_NAND0_BASE); +#endif /* CONFIG_PPCHAMELEON_MODULE_ME, CONFIG_PPCHAMELEON_MODULE_HI */ debug ("Probing at 0x%.8x\n", CFG_NAND1_BASE); totlen += nand_probe (CFG_NAND1_BASE); |
