diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2007-04-23 13:17:22 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2007-04-23 13:17:22 +0200 |
| commit | 61ea75aa07838435ec570ac85a2e3fc038844596 (patch) | |
| tree | 20135a513c4c9d0bddb2a8ceaf009a8ed5e8bbdf /board/nc650 | |
| parent | e2fb36a57f364016b973b1db255531e07cfefd52 (diff) | |
| parent | 14da5f7675bbb427c469e3f45006e027b6e21db9 (diff) | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/nc650')
| -rw-r--r-- | board/nc650/config.mk | 3 | ||||
| -rw-r--r-- | board/nc650/nc650.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/board/nc650/config.mk b/board/nc650/config.mk index 52c8ffe353..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. # @@ -27,4 +27,3 @@ # TEXT_BASE = 0x40700000 -BOARDLIBS = $(obj)drivers/nand/libnand.a 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); |