summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-10-15 04:38:35 -0600
committerTom Rini <trini@ti.com>2014-10-27 11:04:01 -0400
commitc6da9ae8a4895ad31a8ff4e3bf3728fd7d0fd535 (patch)
tree4604c0d442e1bbfa08f8e70202f45f307805a46b
parent6bf6725962ad2d79178c860801ff99f8495b3f44 (diff)
downloadu-boot-imx-c6da9ae8a4895ad31a8ff4e3bf3728fd7d0fd535.zip
u-boot-imx-c6da9ae8a4895ad31a8ff4e3bf3728fd7d0fd535.tar.gz
u-boot-imx-c6da9ae8a4895ad31a8ff4e3bf3728fd7d0fd535.tar.bz2
Tidy up data sizes and function comment in display_options
Use inttypes.h and uint64_t to correct the code so that it will not issue warnings on 64-bit machines where 'uint64_t' is 'unsigned long'. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--include/common.h14
-rw-r--r--lib/display_options.c14
2 files changed, 18 insertions, 10 deletions
diff --git a/include/common.h b/include/common.h
index 6213511..ecf7fca 100644
--- a/include/common.h
+++ b/include/common.h
@@ -253,7 +253,19 @@ int cpu_init(void);
/* */
phys_size_t initdram (int);
int display_options (void);
-void print_size(unsigned long long, const char *);
+
+/**
+ * print_size() - Print a size with a suffic
+ *
+ * print sizes as "xxx KiB", "xxx.y KiB", "xxx MiB", "xxx.y MiB",
+ * xxx GiB, xxx.y GiB, etc as needed; allow for optional trailing string
+ * (like "\n")
+ *
+ * @size: Size to print
+ * @suffix String to print after the size
+ */
+void print_size(uint64_t size, const char *suffix);
+
int print_buffer(ulong addr, const void *data, uint width, uint count,
uint linelen);
diff --git a/lib/display_options.c b/lib/display_options.c
index 4c0c886..d5d17b2 100644
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -7,6 +7,7 @@
#include <config.h>
#include <common.h>
+#include <inttypes.h>
#include <version.h>
#include <linux/ctype.h>
#include <asm/io.h>
@@ -21,15 +22,10 @@ int display_options (void)
return 0;
}
-/*
- * print sizes as "xxx KiB", "xxx.y KiB", "xxx MiB", "xxx.y MiB",
- * xxx GiB, xxx.y GiB, etc as needed; allow for optional trailing string
- * (like "\n")
- */
-void print_size(unsigned long long size, const char *s)
+void print_size(uint64_t size, const char *s)
{
unsigned long m = 0, n;
- unsigned long long f;
+ uint64_t f;
static const char names[] = {'E', 'P', 'T', 'G', 'M', 'K'};
unsigned long d = 10 * ARRAY_SIZE(names);
char c = 0;
@@ -43,7 +39,7 @@ void print_size(unsigned long long size, const char *s)
}
if (!c) {
- printf("%llu Bytes%s", size, s);
+ printf("%" PRIu64 " Bytes%s", size, s);
return;
}
@@ -127,7 +123,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count,
else
x = lb.uc[i] = *(volatile uint8_t *)data;
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA
- printf(" %0*llx", width * 2, x);
+ printf(" %0*" PRIx64, width * 2, x);
#else
printf(" %0*x", width * 2, x);
#endif