summaryrefslogtreecommitdiff
path: root/board/ppmc7xx
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2008-07-10 10:26:07 +0200
committerMarkus Klotzbuecher <mk@denx.de>2008-07-10 10:26:07 +0200
commit794a5924972fc8073616e98a2668da4a5f9aea90 (patch)
treedd0db39b3e183b5bcb0300d5377d7a0d5ac5fd0c /board/ppmc7xx
parentf2aeecc320f5b181b30effcaa67683aec8d5a843 (diff)
parent4188f0491886b3b486164e819c0a83fdb97efd7d (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'board/ppmc7xx')
-rw-r--r--board/ppmc7xx/Makefile2
-rw-r--r--board/ppmc7xx/ppmc7xx.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/ppmc7xx/Makefile b/board/ppmc7xx/Makefile
index 5fbefeb71c..22332fb3dc 100644
--- a/board/ppmc7xx/Makefile
+++ b/board/ppmc7xx/Makefile
@@ -40,7 +40,7 @@ clean:
rm -f $(SOBJS) $(OBJS)
distclean: clean
- rm -f $(LIB) core *.bak .depend
+ rm -f $(LIB) core *.bak $(obj).depend
#########################################################################
diff --git a/board/ppmc7xx/ppmc7xx.c b/board/ppmc7xx/ppmc7xx.c
index 402ac5e201..061e01ec4f 100644
--- a/board/ppmc7xx/ppmc7xx.c
+++ b/board/ppmc7xx/ppmc7xx.c
@@ -29,7 +29,7 @@ extern void _start_warm(void);
* the SDRAM was already initialised by board_asm_init (see init.S) so we just
* return the size of RAM.
*/
-long initdram( int board_type )
+phys_size_t initdram( int board_type )
{
return CFG_SDRAM_SIZE;
}