projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regmap: Add raw read/write functions
[oweals/u-boot.git]
/
cmd
/
mem.c
diff --git
a/cmd/mem.c
b/cmd/mem.c
index 6775ab77336c401b2605a4f5c1abce3747342318..392ed1756b636ea89bfc40302134ccc05993cf41 100644
(file)
--- a/
cmd/mem.c
+++ b/
cmd/mem.c
@@
-1,8
+1,7
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
*/
/*
@@
-18,7
+17,6
@@
#include <command.h>
#include <console.h>
#include <hash.h>
#include <command.h>
#include <console.h>
#include <hash.h>
-#include <inttypes.h>
#include <mapmem.h>
#include <watchdog.h>
#include <asm/io.h>
#include <mapmem.h>
#include <watchdog.h>
#include <asm/io.h>
@@
-276,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
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
type, (void *)(addr1 + offset), size, word1,
type, (void *)(addr2 + offset), size, word2);
#else
@@
-1001,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(" %08x", *((u32 *)ptr));
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA
else if (size == 8)
- printf(" %016
" PRIx64
, *((u64 *)ptr));
+ printf(" %016
llx"
, *((u64 *)ptr));
#endif
else if (size == 2)
printf(" %04x", *((u16 *)ptr));
#endif
else if (size == 2)
printf(" %04x", *((u16 *)ptr));