diff options
| author | Tom Rini <trini@ti.com> | 2014-12-04 09:24:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-04 09:24:05 -0500 |
| commit | 97cdf64026c7d749dd7a5c0dbaba7a60a7292ac9 (patch) | |
| tree | 2bd7522657fef09538d52b4dd6cef71a9031d273 /common/cmd_mem.c | |
| parent | f0c6e1c31b94f193047619b6adf67c2d792b659e (diff) | |
| parent | 1d8104fe8897c5fec3e03b4165bc67c57eeeaa72 (diff) | |
Merge branch 'sandbox' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'common/cmd_mem.c')
| -rw-r--r-- | common/cmd_mem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 0d50dcfe9c1..bcb3ee325ac 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -19,6 +19,7 @@ #include <dataflash.h> #endif #include <hash.h> +#include <inttypes.h> #include <watchdog.h> #include <asm/io.h> #include <linux/compiler.h> @@ -338,7 +339,8 @@ static int do_mem_cmp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (word1 != word2) { ulong offset = buf1 - base; #ifdef CONFIG_SYS_SUPPORT_64BIT_DATA - printf("%s at 0x%p (%#0*llx) != %s at 0x%p (%#0*llx)\n", + printf("%s at 0x%p (%#0*"PRIx64") != %s at 0x%p (%#0*" + PRIx64 ")\n", type, (void *)(addr1 + offset), size, word1, type, (void *)(addr2 + offset), size, word2); #else @@ -1146,7 +1148,7 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[]) printf(" %08x", *((u32 *)ptr)); #ifdef CONFIG_SYS_SUPPORT_64BIT_DATA else if (size == 8) - printf(" %016llx", *((u64 *)ptr)); + printf(" %016" PRIx64, *((u64 *)ptr)); #endif else if (size == 2) printf(" %04x", *((u16 *)ptr)); |