Fix some more printf() format issues.

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/board/amcc/taishan/showinfo.c b/board/amcc/taishan/showinfo.c
index 040b8004dac1a179b01171c52043903c44622829..5b8b88e856b31d60c254312964c4ffb74144fb15 100644 (file)
--- a/board/amcc/taishan/showinfo.c
+++ b/board/amcc/taishan/showinfo.c
@@ -34,59 +34,59 @@ void show_reset_reg(void)
        /* read clock regsiter */
        printf("===== Display reset and initialize register Start =========\n");
        mfcpr(clk_pllc,reg);
-       printf("cpr_pllc   = %#010x\n",reg);
+       printf("cpr_pllc   = %#010lx\n",reg);
 
        mfcpr(clk_plld,reg);
-       printf("cpr_plld   = %#010x\n",reg);
+       printf("cpr_plld   = %#010lx\n",reg);
 
        mfcpr(clk_primad,reg);
-       printf("cpr_primad = %#010x\n",reg);
+       printf("cpr_primad = %#010lx\n",reg);
 
        mfcpr(clk_primbd,reg);
-       printf("cpr_primbd = %#010x\n",reg);
+       printf("cpr_primbd = %#010lx\n",reg);
 
        mfcpr(clk_opbd,reg);
-       printf("cpr_opbd   = %#010x\n",reg);
+       printf("cpr_opbd   = %#010lx\n",reg);
 
        mfcpr(clk_perd,reg);
-       printf("cpr_perd   = %#010x\n",reg);
+       printf("cpr_perd   = %#010lx\n",reg);
 
        mfcpr(clk_mald,reg);
-       printf("cpr_mald   = %#010x\n",reg);
+       printf("cpr_mald   = %#010lx\n",reg);
 
        /* read sdr register */
        mfsdr(sdr_ebc,reg);
-       printf("sdr_ebc    = %#010x\n",reg);
+       printf("sdr_ebc    = %#010lx\n",reg);
 
        mfsdr(sdr_cp440,reg);
-       printf("sdr_cp440  = %#010x\n",reg);
+       printf("sdr_cp440  = %#010lx\n",reg);
 
        mfsdr(sdr_xcr,reg);
-       printf("sdr_xcr    = %#010x\n",reg);
+       printf("sdr_xcr    = %#010lx\n",reg);
 
        mfsdr(sdr_xpllc,reg);
-       printf("sdr_xpllc  = %#010x\n",reg);
+       printf("sdr_xpllc  = %#010lx\n",reg);
 
        mfsdr(sdr_xplld,reg);
-       printf("sdr_xplld  = %#010x\n",reg);
+       printf("sdr_xplld  = %#010lx\n",reg);
 
        mfsdr(sdr_pfc0,reg);
-       printf("sdr_pfc0   = %#010x\n",reg);
+       printf("sdr_pfc0   = %#010lx\n",reg);
 
        mfsdr(sdr_pfc1,reg);
-       printf("sdr_pfc1   = %#010x\n",reg);
+       printf("sdr_pfc1   = %#010lx\n",reg);
 
        mfsdr(sdr_cust0,reg);
-       printf("sdr_cust0  = %#010x\n",reg);
+       printf("sdr_cust0  = %#010lx\n",reg);
 
        mfsdr(sdr_cust1,reg);
-       printf("sdr_cust1  = %#010x\n",reg);
+       printf("sdr_cust1  = %#010lx\n",reg);
 
        mfsdr(sdr_uart0,reg);
-       printf("sdr_uart0  = %#010x\n",reg);
+       printf("sdr_uart0  = %#010lx\n",reg);
 
        mfsdr(sdr_uart1,reg);
-       printf("sdr_uart1  = %#010x\n",reg);
+       printf("sdr_uart1  = %#010lx\n",reg);
 
        printf("===== Display reset and initialize register End   =========\n");
 }
@@ -97,13 +97,13 @@ void show_xbridge_info(void)
 
        printf("PCI-X chip control registers\n");
        mfsdr(sdr_xcr, reg);
-       printf("sdr_xcr    = %#010x\n", reg);
+       printf("sdr_xcr    = %#010lx\n", reg);
 
        mfsdr(sdr_xpllc, reg);
-       printf("sdr_xpllc  = %#010x\n", reg);
+       printf("sdr_xpllc  = %#010lx\n", reg);
 
        mfsdr(sdr_xplld, reg);
-       printf("sdr_xplld  = %#010x\n", reg);
+       printf("sdr_xplld  = %#010lx\n", reg);
 
        printf("PCI-X Bridge Configure registers\n");
        printf("PCIX0_VENDID            = %#06x\n", in16r(PCIX0_VENDID));
@@ -116,49 +116,49 @@ void show_xbridge_info(void)
        printf("PCIX0_HDTYPE            = %#04x\n", in8(PCIX0_HDTYPE));
        printf("PCIX0_BIST              = %#04x\n", in8(PCIX0_BIST));
 
-       printf("PCIX0_BAR0              = %#010x\n", in32r(PCIX0_BAR0));
-       printf("PCIX0_BAR1              = %#010x\n", in32r(PCIX0_BAR1));
-       printf("PCIX0_BAR2              = %#010x\n", in32r(PCIX0_BAR2));
-       printf("PCIX0_BAR3              = %#010x\n", in32r(PCIX0_BAR3));
-       printf("PCIX0_BAR4              = %#010x\n", in32r(PCIX0_BAR4));
-       printf("PCIX0_BAR5              = %#010x\n", in32r(PCIX0_BAR5));
+       printf("PCIX0_BAR0              = %#010lx\n", in32r(PCIX0_BAR0));
+       printf("PCIX0_BAR1              = %#010lx\n", in32r(PCIX0_BAR1));
+       printf("PCIX0_BAR2              = %#010lx\n", in32r(PCIX0_BAR2));
+       printf("PCIX0_BAR3              = %#010lx\n", in32r(PCIX0_BAR3));
+       printf("PCIX0_BAR4              = %#010lx\n", in32r(PCIX0_BAR4));
+       printf("PCIX0_BAR5              = %#010lx\n", in32r(PCIX0_BAR5));
 
-       printf("PCIX0_CISPTR            = %#010x\n", in32r(PCIX0_CISPTR));
+       printf("PCIX0_CISPTR            = %#010lx\n", in32r(PCIX0_CISPTR));
        printf("PCIX0_SBSSYSVID         = %#010x\n", in16r(PCIX0_SBSYSVID));
        printf("PCIX0_SBSSYSID          = %#010x\n", in16r(PCIX0_SBSYSID));
-       printf("PCIX0_EROMBA            = %#010x\n", in32r(PCIX0_EROMBA));
+       printf("PCIX0_EROMBA            = %#010lx\n", in32r(PCIX0_EROMBA));
        printf("PCIX0_CAP               = %#04x\n", in8(PCIX0_CAP));
        printf("PCIX0_INTLN             = %#04x\n", in8(PCIX0_INTLN));
        printf("PCIX0_INTPN             = %#04x\n", in8(PCIX0_INTPN));
        printf("PCIX0_MINGNT            = %#04x\n", in8(PCIX0_MINGNT));
        printf("PCIX0_MAXLTNCY          = %#04x\n", in8(PCIX0_MAXLTNCY));
 
-       printf("PCIX0_BRDGOPT1          = %#010x\n", in32r(PCIX0_BRDGOPT1));
-       printf("PCIX0_BRDGOPT2          = %#010x\n", in32r(PCIX0_BRDGOPT2));
-
-       printf("PCIX0_POM0LAL           = %#010x\n", in32r(PCIX0_POM0LAL));
-       printf("PCIX0_POM0LAH           = %#010x\n", in32r(PCIX0_POM0LAH));
-       printf("PCIX0_POM0SA            = %#010x\n", in32r(PCIX0_POM0SA));
-       printf("PCIX0_POM0PCILAL        = %#010x\n", in32r(PCIX0_POM0PCIAL));
-       printf("PCIX0_POM0PCILAH        = %#010x\n", in32r(PCIX0_POM0PCIAH));
-       printf("PCIX0_POM1LAL           = %#010x\n", in32r(PCIX0_POM1LAL));
-       printf("PCIX0_POM1LAH           = %#010x\n", in32r(PCIX0_POM1LAH));
-       printf("PCIX0_POM1SA            = %#010x\n", in32r(PCIX0_POM1SA));
-       printf("PCIX0_POM1PCILAL        = %#010x\n", in32r(PCIX0_POM1PCIAL));
-       printf("PCIX0_POM1PCILAH        = %#010x\n", in32r(PCIX0_POM1PCIAH));
-       printf("PCIX0_POM2SA            = %#010x\n", in32r(PCIX0_POM2SA));
-
-       printf("PCIX0_PIM0SA            = %#010x\n", in32r(PCIX0_PIM0SA));
-       printf("PCIX0_PIM0LAL           = %#010x\n", in32r(PCIX0_PIM0LAL));
-       printf("PCIX0_PIM0LAH           = %#010x\n", in32r(PCIX0_PIM0LAH));
-       printf("PCIX0_PIM1SA            = %#010x\n", in32r(PCIX0_PIM1SA));
-       printf("PCIX0_PIM1LAL           = %#010x\n", in32r(PCIX0_PIM1LAL));
-       printf("PCIX0_PIM1LAH           = %#010x\n", in32r(PCIX0_PIM1LAH));
-       printf("PCIX0_PIM2SA            = %#010x\n", in32r(PCIX0_PIM1SA));
-       printf("PCIX0_PIM2LAL           = %#010x\n", in32r(PCIX0_PIM1LAL));
-       printf("PCIX0_PIM2LAH           = %#010x\n", in32r(PCIX0_PIM1LAH));
-
-       printf("PCIX0_XSTS              = %#010x\n", in32r(PCIX0_STS));
+       printf("PCIX0_BRDGOPT1          = %#010lx\n", in32r(PCIX0_BRDGOPT1));
+       printf("PCIX0_BRDGOPT2          = %#010lx\n", in32r(PCIX0_BRDGOPT2));
+
+       printf("PCIX0_POM0LAL           = %#010lx\n", in32r(PCIX0_POM0LAL));
+       printf("PCIX0_POM0LAH           = %#010lx\n", in32r(PCIX0_POM0LAH));
+       printf("PCIX0_POM0SA            = %#010lx\n", in32r(PCIX0_POM0SA));
+       printf("PCIX0_POM0PCILAL        = %#010lx\n", in32r(PCIX0_POM0PCIAL));
+       printf("PCIX0_POM0PCILAH        = %#010lx\n", in32r(PCIX0_POM0PCIAH));
+       printf("PCIX0_POM1LAL           = %#010lx\n", in32r(PCIX0_POM1LAL));
+       printf("PCIX0_POM1LAH           = %#010lx\n", in32r(PCIX0_POM1LAH));
+       printf("PCIX0_POM1SA            = %#010lx\n", in32r(PCIX0_POM1SA));
+       printf("PCIX0_POM1PCILAL        = %#010lx\n", in32r(PCIX0_POM1PCIAL));
+       printf("PCIX0_POM1PCILAH        = %#010lx\n", in32r(PCIX0_POM1PCIAH));
+       printf("PCIX0_POM2SA            = %#010lx\n", in32r(PCIX0_POM2SA));
+
+       printf("PCIX0_PIM0SA            = %#010lx\n", in32r(PCIX0_PIM0SA));
+       printf("PCIX0_PIM0LAL           = %#010lx\n", in32r(PCIX0_PIM0LAL));
+       printf("PCIX0_PIM0LAH           = %#010lx\n", in32r(PCIX0_PIM0LAH));
+       printf("PCIX0_PIM1SA            = %#010lx\n", in32r(PCIX0_PIM1SA));
+       printf("PCIX0_PIM1LAL           = %#010lx\n", in32r(PCIX0_PIM1LAL));
+       printf("PCIX0_PIM1LAH           = %#010lx\n", in32r(PCIX0_PIM1LAH));
+       printf("PCIX0_PIM2SA            = %#010lx\n", in32r(PCIX0_PIM1SA));
+       printf("PCIX0_PIM2LAL           = %#010lx\n", in32r(PCIX0_PIM1LAL));
+       printf("PCIX0_PIM2LAH           = %#010lx\n", in32r(PCIX0_PIM1LAH));
+
+       printf("PCIX0_XSTS              = %#010lx\n", in32r(PCIX0_STS));
 }
 
 int do_show_xbridge_info(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])

diff --git a/board/freescale/mpc7448hpc2/tsi108_init.c b/board/freescale/mpc7448hpc2/tsi108_init.c
index efa952c2e7939e9a03a961dd2ab681f5e026f02b..ad80694077691b9d9d3dc86445b4b4fd2ea9be0b 100644 (file)
--- a/board/freescale/mpc7448hpc2/tsi108_init.c
+++ b/board/freescale/mpc7448hpc2/tsi108_init.c
@@ -165,8 +165,8 @@ int board_early_init_f (void)
                printf ("Invalid DDR2 clock setting\n");
                return -1;
        }
-       printf ("BUS: %d MHz\n", get_board_bus_clk() / 1000000);
-       printf ("MEM: %d MHz\n", gd->mem_clk / 1000000);
+       printf ("BUS: %lu MHz\n", get_board_bus_clk() / 1000000);
+       printf ("MEM: %lu MHz\n", gd->mem_clk / 1000000);
        return 0;
 }
 
@@ -622,8 +622,8 @@ int misc_init_r (void)
 #ifdef CFG_L2
        l2cache_enable ();
 #endif
-       printf ("BUS:   %d MHz\n", gd->bus_clk / 1000000);
-       printf ("MEM:   %d MHz\n", gd->mem_clk / 1000000);
+       printf ("BUS:   %lu MHz\n", gd->bus_clk / 1000000);
+       printf ("MEM:   %lu MHz\n", gd->mem_clk / 1000000);
 
        /*
         * All the information needed to print the cache details is avaiblable

diff --git a/board/netstal/hcu5/sdram.c b/board/netstal/hcu5/sdram.c
index 80e84aebb86665fa8821794e73f2956b4910804f..66a958c78ae96189a9ba87907fd0ef879ee65dc3 100644 (file)
--- a/board/netstal/hcu5/sdram.c
+++ b/board/netstal/hcu5/sdram.c
@@ -71,7 +71,7 @@ void board_add_ram_info(int use_default)
        }
 
        get_sys_info(&board_cfg);
-       printf(", %d MHz", (board_cfg.freqPLB * 2) / 1000000);
+       printf(", %lu MHz", (board_cfg.freqPLB * 2) / 1000000);
 
        mfsdram(DDR0_03, val);
        val = DDR0_03_CASLAT_DECODE(val);

diff --git a/board/sandburst/metrobox/metrobox.c b/board/sandburst/metrobox/metrobox.c
index 97049013e1cea80f27867a9e7e564a1f79a6c437..66cdfb1562cca9c347d1957a7e59f54fb4f62265 100644 (file)
--- a/board/sandburst/metrobox/metrobox.c
+++ b/board/sandburst/metrobox/metrobox.c
@@ -270,7 +270,7 @@ int checkboard (void)
        }
 
        printf ("OptoFPGA ID:\t0x%02X\tRev:  0x%02X\n", opto_id, opto_rev);
-       printf ("Board Rev:\t0x%02X\tID:  %s\n", brd_rev, (char *)board_id_as[brd_id]);
+       printf ("Board Rev:\t0x%02X\tID:  %s\n", brd_rev, board_id_as[brd_id].name);
 
        /* Fix the ack in the bme 32 */
        udelay(5000);

diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
index 57c0dc3ceac7ccd62e553f95e04de8f1fd6e033a..2534097df5577e01250728feb7e921b8ab5fa6aa 100644 (file)
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/tsi108_eth.c
@@ -899,7 +899,7 @@ static int tsi108_eth_send (struct eth_device *dev,
        status = le32_to_cpu(tx_descr->config_status);
        if ((status & DMA_DESCR_TX_OK) == 0) {
 #ifdef TX_PRINT_ERRORS
-               printf ("TX packet error: 0x%08x\n    %s%s%s%s\n", status,
+               printf ("TX packet error: 0x%08lx\n    %s%s%s%s\n", status,
                       status & DMA_DESCR_TX_OK ? "tx error, " : "",
                       status & DMA_DESCR_TX_RETRY_LIMIT ?
                       "retry limit reached, " : "",
@@ -959,7 +959,7 @@ static int tsi108_eth_recv (struct eth_device *dev)
                status = le32_to_cpu(rx_descr->config_status);
                if (status & DMA_DESCR_RX_BAD_FRAME) {
 #ifdef RX_PRINT_ERRORS
-                       printf ("RX packet error: 0x%08x\n    %s%s%s%s%s%s\n",
+                       printf ("RX packet error: 0x%08lx\n    %s%s%s%s%s%s\n",
                               status,
                               status & DMA_DESCR_RX_FRAME_IS_TYPE ? "too big, "
                               : "",