summaryrefslogtreecommitdiff
path: root/board/amcc/acadia/memory.c
diff options
context:
space:
mode:
authorMarian Balakowicz <m8@semihalf.com>2008-03-12 11:23:02 (GMT)
committerMarian Balakowicz <m8@semihalf.com>2008-03-12 11:23:02 (GMT)
commit7e492d8258182e31c988bbf9917d4a3d41949d56 (patch)
treee9c9db79d797cf487107c019537c6bb00b854c6c /board/amcc/acadia/memory.c
parentafe45c87e3c5d77bad76b1a57dccd20764d45b5d (diff)
parent30f1806f60978d707b0cff2d7bf89d141fc24290 (diff)
downloadu-boot-fsl-qoriq-7e492d8258182e31c988bbf9917d4a3d41949d56.tar.xz
Merge branch 'master' of git://www.denx.de/git/u-boot into new-image
Diffstat (limited to 'board/amcc/acadia/memory.c')
-rw-r--r--board/amcc/acadia/memory.c2
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