colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

post: memory: Fix format strings

Browse Source 
This fixes numerous cases of format strings not matching their
arguments. Also keep the format strings on one line for easier grepping.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Sean Anderson
2022-08-23 15:10:39 -04:00
committed by Tom Rini
parent 57fb86a97d
commit 56ce22c0cd
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
post/drivers/memory.c
View File

@@ -228,9 +228,8 @@ static int memory_post_dataline(unsigned long long * pmem)
hi = (temp64>>32) & 0xffffffff; hi = (temp64>>32) & 0xffffffff;
lo = temp64 & 0xffffffff; lo = temp64 & 0xffffffff;
post_log("Memory (data line) error at %08x, " post_log("Memory (data line) error at %p, wrote %08x%08x, read %08x%08x !\n",
"wrote %08x%08x, read %08x%08x !\n", pmem, pathi, patlo, hi, lo);
pmem, pathi, patlo, hi, lo);
ret = -1; ret = -1;
} }
} }
@@ -259,9 +258,8 @@ static int memory_post_addrline(ulong *testaddr, ulong *base, ulong size)
} }
#endif #endif
if(readback == *testaddr) { if(readback == *testaddr) {
post_log("Memory (address line) error at %08x<->%08x, " post_log("Memory (address line) error at %p<->%p, XOR value %08lx !\n",
"XOR value %08x !\n", testaddr, target, xor);
testaddr, target, xor);
ret = -1; ret = -1;
} }
} }
@@ -287,9 +285,8 @@ static int memory_post_test1(unsigned long start,
for (i = 0; i < size / sizeof (ulong) && !ret; i++) { for (i = 0; i < size / sizeof (ulong) && !ret; i++) {
readback = mem[i]; readback = mem[i];
if (readback != val) { if (readback != val) {
post_log("Memory error at %08x, " post_log("Memory error at %p, wrote %08lx, read %08lx !\n",
"wrote %08x, read %08x !\n", mem + i, val, readback);
mem + i, val, readback);
ret = -1; ret = -1;
break; break;
@@ -317,9 +314,8 @@ static int memory_post_test2(unsigned long start, unsigned long size)
for (i = 0; i < size / sizeof (ulong) && !ret; i++) { for (i = 0; i < size / sizeof (ulong) && !ret; i++) {
readback = mem[i]; readback = mem[i];
if (readback != (1 << (i % 32))) { if (readback != (1 << (i % 32))) {
post_log("Memory error at %08x, " post_log("Memory error at %p, wrote %08lx, read %08lx !\n",
"wrote %08x, read %08x !\n", mem + i, 1UL << (i % 32), readback);
mem + i, 1 << (i % 32), readback);
ret = -1; ret = -1;
break; break;
@@ -347,9 +343,8 @@ static int memory_post_test3(unsigned long start, unsigned long size)
for (i = 0; i < size / sizeof (ulong) && !ret; i++) { for (i = 0; i < size / sizeof (ulong) && !ret; i++) {
readback = mem[i]; readback = mem[i];
if (readback != i) { if (readback != i) {
post_log("Memory error at %08x, " post_log("Memory error at %p, wrote %08lx, read %08lx !\n",
"wrote %08x, read %08x !\n", mem + i, i, readback);
mem + i, i, readback);
ret = -1; ret = -1;
break; break;
@@ -377,9 +372,8 @@ static int memory_post_test4(unsigned long start, unsigned long size)
for (i = 0; i < size / sizeof (ulong) && !ret; i++) { for (i = 0; i < size / sizeof (ulong) && !ret; i++) {
readback = mem[i]; readback = mem[i];
if (readback != ~i) { if (readback != ~i) {
post_log("Memory error at %08x, " post_log("Memory error at %p, wrote %08lx, read %08lx !\n",
"wrote %08x, read %08x !\n", mem + i, ~i, readback);
mem + i, ~i, readback);
ret = -1; ret = -1;
break; break;