diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-07-10 10:26:07 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-07-10 10:26:07 +0200 |
| commit | 794a5924972fc8073616e98a2668da4a5f9aea90 (patch) | |
| tree | dd0db39b3e183b5bcb0300d5377d7a0d5ac5fd0c /board/trab/memory.c | |
| parent | f2aeecc320f5b181b30effcaa67683aec8d5a843 (diff) | |
| parent | 4188f0491886b3b486164e819c0a83fdb97efd7d (diff) | |
| download | blackbird-obmc-uboot-794a5924972fc8073616e98a2668da4a5f9aea90.tar.gz blackbird-obmc-uboot-794a5924972fc8073616e98a2668da4a5f9aea90.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'board/trab/memory.c')
| -rw-r--r-- | board/trab/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/trab/memory.c b/board/trab/memory.c index 8614be7bad..052432e9d9 100644 --- a/board/trab/memory.c +++ b/board/trab/memory.c @@ -460,7 +460,7 @@ int memory_post_test (int flags) { int ret = 0; bd_t *bd = gd->bd; - unsigned long memsize = (bd->bi_memsize >= 256 << 20 ? + phys_size_t memsize = (bd->bi_memsize >= 256 << 20 ? 256 << 20 : bd->bi_memsize) - (1 << 20); |
