diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-01-12 23:59:53 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-01-12 23:59:53 +0100 |
| commit | c6b734f5aea2ba75caaa1929f7e649ecda8d2f31 (patch) | |
| tree | 3359c7fafc959e4a9a4cabb416b726890c8c0c92 /arch/sh/lib/board.c | |
| parent | 072f4125f1df8e9a25b3d8f4298b000183763cf4 (diff) | |
| parent | a972089a5bf7613334088f60e2ae92fc25a8749b (diff) | |
| download | u-boot-imx-c6b734f5aea2ba75caaa1929f7e649ecda8d2f31.zip u-boot-imx-c6b734f5aea2ba75caaa1929f7e649ecda8d2f31.tar.gz u-boot-imx-c6b734f5aea2ba75caaa1929f7e649ecda8d2f31.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'arch/sh/lib/board.c')
| -rw-r--r-- | arch/sh/lib/board.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c index 3d201b2..cdac382 100644 --- a/arch/sh/lib/board.c +++ b/arch/sh/lib/board.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007,2008 + * Copyright (C) 2007, 2008, 2010 * Nobuhiro Iwamatsu <iwamatsu@nigauri.org> * * This program is free software; you can redistribute it and/or @@ -46,7 +46,11 @@ unsigned long monitor_flash_len = CONFIG_SYS_MONITOR_LEN; static int sh_flash_init(void) { gd->bd->bi_flashsize = flash_init(); - printf("FLASH: %ldMB\n", gd->bd->bi_flashsize / (1024*1024)); + + if (gd->bd->bi_flashsize >= (1024 * 1024)) + printf("FLASH: %ldMB\n", gd->bd->bi_flashsize / (1024*1024)); + else + printf("FLASH: %ldKB\n", gd->bd->bi_flashsize / 1024); return 0; } |