diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-03-02 21:30:18 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-03-02 21:30:18 +0100 |
| commit | 24ae0d1728f446d634728802370f50d7651d9f48 (patch) | |
| tree | 7fa711aaca114b278d9d3527f95507738d37fb1d /board | |
| parent | 2f6e76d23ced547a7f752abd4a753e7787559775 (diff) | |
| parent | 64cd594e623c39f73964d18787763e4533f791f7 (diff) | |
| download | u-boot-imx-24ae0d1728f446d634728802370f50d7651d9f48.zip u-boot-imx-24ae0d1728f446d634728802370f50d7651d9f48.tar.gz u-boot-imx-24ae0d1728f446d634728802370f50d7651d9f48.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Diffstat (limited to 'board')
| -rw-r--r-- | board/amcc/acadia/memory.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/board/amcc/acadia/memory.c b/board/amcc/acadia/memory.c index 9346d2c..709d41e 100644 --- a/board/amcc/acadia/memory.c +++ b/board/amcc/acadia/memory.c @@ -117,7 +117,9 @@ long int initdram(int board_type) return (CFG_MBYTES_RAM << 20); } +#ifndef CONFIG_NAND_SPL int testdram(void) { return (0); } +#endif |