summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/mem.c6
-rw-r--r--cmd/part.c2
2 files changed, 3 insertions, 5 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));
diff --git a/cmd/part.c b/cmd/part.c
index bee204fff0..bfb6488b0f 100644
--- a/cmd/part.c
+++ b/cmd/part.c
@@ -90,7 +90,7 @@ static int do_part_list(int argc, char * const argv[])
char str[512] = { '\0', };
disk_partition_t info;
- for (p = 1; p < 128; p++) {
+ for (p = 1; p < MAX_SEARCH_PARTITIONS; p++) {
char t[5];
int r = part_get_info(desc, p, &info);