From: Armando Visconti <armando.visconti@st.com>
Date: Mon, 7 May 2012 07:30:28 +0000 (+0530)
Subject: st_smi: Fix bug in flash_print_info()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf9026deb8d83b00c37b19ec7b63491e9338d49f;p=people%2Fms%2Fu-boot.git

st_smi: Fix bug in flash_print_info()

If the flash size was smaller than 1MB then flash_print_info()
was erroneously reporting 0 MB.

Signed-off-by: Armando Visconti <armando.visconti@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
Signed-off-by: Stefan Roese <sr@denx.de>
---

diff --git a/drivers/mtd/st_smi.c b/drivers/mtd/st_smi.c
index 976b0979e2..5378b57b1b 100644
--- a/drivers/mtd/st_smi.c
+++ b/drivers/mtd/st_smi.c
@@ -471,8 +471,13 @@ void flash_print_info(flash_info_t *info)
 		puts("missing or unknown FLASH type\n");
 		return;
 	}
-	printf("  Size: %ld MB in %d Sectors\n",
-	       info->size >> 20, info->sector_count);
+
+	if (info->size >= 0x100000)
+		printf("  Size: %ld MB in %d Sectors\n",
+		       info->size >> 20, info->sector_count);
+	else
+		printf("  Size: %ld KB in %d Sectors\n",
+		       info->size >> 10, info->sector_count);
 
 	puts("  Sector Start Addresses:");
 	for (i = 0; i < info->sector_count; ++i) {