summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-08-06 20:47:40 +0900
committerTom Rini <trini@konsulko.com>2018-09-10 20:48:17 -0400
commitdee37fc99d945eb96f0f501d17833cbb05798ad3 (patch)
tree3ebe9b7ac68003faf3a9cccd54b42a80895561e0 /cmd
parent3747bdbb2bb83a3bb2e7bd823856de4f4908f711 (diff)
downloadu-boot-dee37fc99d945eb96f0f501d17833cbb05798ad3.tar.gz
u-boot-dee37fc99d945eb96f0f501d17833cbb05798ad3.tar.xz
u-boot-dee37fc99d945eb96f0f501d17833cbb05798ad3.zip
Remove <inttypes.h> includes and PRI* usages in printf() entirely
In int-ll64.h, we always use the following typedefs: typedef unsigned int u32; typedef unsigned long uintptr_t; typedef unsigned long long u64; This does not need to match to the compiler's <inttypes.h>. Do not include it. The use of PRI* makes the code super-ugly. You can simply use "l" for printing uintptr_t, "ll" for u64, and no modifier for u32. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/mem.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/cmd/mem.c b/cmd/mem.c
index 509b400b24..392ed1756b 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -17,7 +17,6 @@
#include <command.h>
#include <console.h>
#include <hash.h>
-#include <inttypes.h>
#include <mapmem.h>
#include <watchdog.h>
#include <asm/io.h>
@@ -275,8 +274,7 @@ 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*"PRIx64") != %s at 0x%p (%#0*"
- PRIx64 ")\n",
+ printf("%s at 0x%p (%#0*llx) != %s at 0x%p (%#0*llx)\n",
type, (void *)(addr1 + offset), size, word1,
type, (void *)(addr2 + offset), size, word2);
#else
@@ -1000,7 +998,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(" %016" PRIx64, *((u64 *)ptr));
+ printf(" %016llx", *((u64 *)ptr));
#endif
else if (size == 2)
printf(" %04x", *((u16 *)ptr));