Commit 06c53bea authored by Wolfgang Denk's avatar Wolfgang Denk

Fix some more print() format errors.

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parent c4b81f32
......@@ -670,7 +670,7 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
/* Check if Flash is (sufficiently) erased */
if ((*addr & data) != data) {
printf ("not erased at %08lx (%lx)\n", (ulong) addr, *addr);
printf ("not erased at %08lx (%lx)\n", (ulong)addr, (ulong)*addr);
return (2);
}
/* Disable interrupts which might cause a timeout here */
......@@ -712,7 +712,7 @@ static int write_data_block (flash_info_t * info, ulong src, ulong dest)
for (i = 0; i < WR_BLOCK; i++)
if ((*dstaddr++ & 0xff) != 0xff) {
printf ("not erased at %08lx (%lx)\n",
(ulong) dstaddr, *dstaddr);
(ulong)dstaddr, (ulong)*dstaddr);
return (2);
}
......
......@@ -177,7 +177,7 @@ unsigned update_flash (unsigned char *buf)
write_flash ((char *)buf, (*buf) & 0xFE);
*((unsigned char *)0xFF800000) = 0xF0;
udelay (100);
printf ("buf [%#010x] %#010x\n", buf, (*buf));
printf ("buf [%#010x] %#010x\n", (unsigned)buf, (*buf));
/* XXX - fall through??? */
case BOOT_WORKING :
return BOOT_WORKING;
......@@ -273,10 +273,10 @@ void barcobcd_boot (void)
/* give length of the kernel image to bootm */
sprintf (bootm_args[0],"%x",start->size);
/* give address of the kernel image to bootm */
sprintf (bootm_args[1],"%x",buf);
sprintf (bootm_args[1],"%x",(unsigned)buf);
printf ("flash address: %#10x\n",start->address+8);
printf ("buf address: %#10x\n",buf);
printf ("buf address: %#10x\n",(unsigned)buf);
/* aha, we reserve 8 bytes here... */
for (cnt = 0; cnt < start->size ; cnt++) {
......
......@@ -613,7 +613,7 @@ static void *boot_get_kernel (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]
return NULL;
}
debug (" kernel data at 0x%08lx, len = 0x%08lx (%d)\n",
debug (" kernel data at 0x%08lx, len = 0x%08lx (%ld)\n",
*os_data, *os_len, *os_len);
return (void *)img_addr;
......
......@@ -770,14 +770,14 @@ ns8382x_send(struct eth_device *dev, volatile void *packet, int length)
for (i = 0; (tx_stat = le32_to_cpu(txd.cmdsts)) & DescOwn; i++) {
if (i >= TOUT_LOOP) {
printf ("%s: tx error buffer not ready: txd.cmdsts %#X\n",
printf ("%s: tx error buffer not ready: txd.cmdsts %#lX\n",
dev->name, tx_stat);
goto Done;
}
}
if (!(tx_stat & DescPktOK)) {
printf("ns8382x_send: Transmit error, Tx status %X.\n", tx_stat);
printf("ns8382x_send: Transmit error, Tx status %lX.\n", tx_stat);
goto Done;
}
#ifdef NS8382X_DEBUG
......
......@@ -392,7 +392,7 @@ static int rtl8169_init_board(struct eth_device *dev)
/* if unknown chip, assume array element #0, original RTL-8169 in this case */
printf("PCI device %s: unknown chip version, assuming RTL-8169\n", dev->name);
printf("PCI device: TxConfig = 0x%hX\n", (unsigned long) RTL_R32(TxConfig));
printf("PCI device: TxConfig = 0x%lX\n", (unsigned long) RTL_R32(TxConfig));
tpc->chipset = 0;
match:
......
......@@ -173,7 +173,7 @@ static int test_burst_start (unsigned long size, unsigned long pattern)
int i, n;
int res = 1;
printf ("Test pattern %08x ...", pattern);
printf ("Test pattern %08lx ...", pattern);
n = size / 4;
......@@ -248,7 +248,7 @@ static void test_desc(unsigned long size)
{
printf(
"The following tests will be conducted:\n"
"1) Map %d-byte region of physical RAM at 0x%08x\n"
"1) Map %ld-byte region of physical RAM at 0x%08x\n"
" into two virtual regions:\n"
" one cached at 0x%08x and\n"
" the the other uncached at 0x%08x.\n",
......@@ -277,8 +277,8 @@ static void test_error(
p[1] = val;
p[2] = pattern;
printf ("\nError at step %s, addr %08x: read %08x, pattern %08x",
step, addr, val, pattern);
printf ("\nError at step %s, addr %08lx: read %08lx, pattern %08lx",
(unsigned long)step, addr, val, pattern);
}
static void signal_init(void)
......
......@@ -786,7 +786,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
*/
s = getenv ("flashchecksum");
if (s && (*s == 'y')) {
printf (" CRC: %08lX",
printf (" CRC: %08X",
crc32 (0, (const unsigned char *) CFG_FLASH_BASE, flash_size)
);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment