summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-04-23 12:01:50 +0200
committerStefan Roese <sr@denx.de>2007-04-23 12:01:50 +0200
commit8d1c439e2d9b0bdfe35df207e2c6b2f3a2312a3b (patch)
tree223110de2b6eb0452d927a72c3a7b4d9090aa8ed /board
parent323bfa8f436dc3bc57187c9b1488bc3146ff1522 (diff)
parent14da5f7675bbb427c469e3f45006e027b6e21db9 (diff)
downloadblackbird-obmc-uboot-8d1c439e2d9b0bdfe35df207e2c6b2f3a2312a3b.tar.gz
blackbird-obmc-uboot-8d1c439e2d9b0bdfe35df207e2c6b2f3a2312a3b.zip
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board')
-rw-r--r--board/nc650/config.mk2
-rw-r--r--board/nc650/nc650.c6
2 files changed, 3 insertions, 5 deletions
diff --git a/board/nc650/config.mk b/board/nc650/config.mk
index b5c9df2898..9d9b892600 100644
--- a/board/nc650/config.mk
+++ b/board/nc650/config.mk
@@ -1,5 +1,5 @@
#
-# (C) Copyright 2006 Detlev Zundel, dzu@denx.de
+# (C) Copyright 2006, 2007 Detlev Zundel, dzu@denx.de
# (C) Copyright 2004
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
diff --git a/board/nc650/nc650.c b/board/nc650/nc650.c
index 8a6b5b00a9..707e4b97d1 100644
--- a/board/nc650/nc650.c
+++ b/board/nc650/nc650.c
@@ -177,16 +177,14 @@ long int initdram (int board_type)
*
* try 8 column mode
*/
- size8 = dram_size (CFG_MAMR_8COL, (ulong *) SDRAM_BASE3_PRELIM,
- SDRAM_MAX_SIZE);
+ size8 = dram_size (CFG_MAMR_8COL, SDRAM_BASE3_PRELIM, SDRAM_MAX_SIZE);
udelay (1000);
/*
* try 9 column mode
*/
- size9 = dram_size (CFG_MAMR_9COL, (ulong *) SDRAM_BASE3_PRELIM,
- SDRAM_MAX_SIZE);
+ size9 = dram_size (CFG_MAMR_9COL, SDRAM_BASE3_PRELIM, SDRAM_MAX_SIZE);
udelay (1000);
OpenPOWER on IntegriCloud