Fix some more printf() format issues.

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

diff --git a/cpu/ixp/npe/npe.c b/cpu/ixp/npe/npe.c
index a33b956975eaec6f71be9bc337da3683411a6f53..892096b26feb5324aa1189775d5e36ebc25e0090 100644 (file)
--- a/cpu/ixp/npe/npe.c
+++ b/cpu/ixp/npe/npe.c
@@ -67,7 +67,7 @@ static void *npe_alloc(int size)
                p = npe_alloc_free;
                npe_alloc_free += size;
        } else {
-               printf("%s: failed (count=%d, size=%d)!\n", count, size);
+               printf("npe_alloc: failed (count=%d, size=%d)!\n", count, size);
        }
        return p;
 }

diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index b7ea1a9c99355cc0fefd127a6df93f572dccee50..a2f365042c98b3135d4dea162cfb283b6afb87d7 100644 (file)
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -126,7 +126,10 @@
 #define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOTCOMMAND     "bootm 40000"
 #define CONFIG_BOOTARGS                "root=/dev/mtdblock2 rootfstype=cramfs console=ttyS0,115200"
-#define CONFIG_CMDLINE_TAG
+
+#define CONFIG_CMDLINE_TAG             1       /* enable passing of ATAGs */
+#define CONFIG_SETUP_MEMORY_TAGS       1
+/* #define CONFIG_INITRD_TAG           1 */
 
 /*
  * Current memory map for Vibren supplied Linux images:
@@ -208,10 +211,6 @@
 /*                     "protect off"   */
 
 
-#define CONFIG_CMDLINE_TAG             1       /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS       1
-/* #define CONFIG_INITRD_TAG           1 */
-
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   115200          /* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX  2               /* which serial port to use */

diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c
index 8fe3782b758318cfee5c2408dfab5c6e2e55f96d..5c46a5aec361ab8e7e61f5951f07e1be1b1455bc 100644 (file)
--- a/lib_mips/bootm.c
+++ b/lib_mips/bootm.c
@@ -54,7 +54,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
        char    *commandline = getenv ("bootargs");
        char    env_buf[12];
        int     ret;
-       const char *cp;
+       char    *cp;
 
        /* find kernel entry point */
        if (images->legacy_hdr_valid) {
@@ -89,15 +89,11 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
        linux_params_init (UNCACHED_SDRAM (gd->bd->bi_boot_params), commandline);
 
 #ifdef CONFIG_MEMSIZE_IN_BYTES
-       sprintf (env_buf, "%lu", gd->ram_size);
-#ifdef DEBUG
-       printf ("## Giving linux memsize in bytes, %lu\n", gd->ram_size);
-#endif
+       sprintf (env_buf, "%lu", (ulong)gd->ram_size);
+       debug ("## Giving linux memsize in bytes, %lu\n", (ulong)gd->ram_size);
 #else
-       sprintf (env_buf, "%lu", gd->ram_size >> 20);
-#ifdef DEBUG
-       printf ("## Giving linux memsize in MB, %lu\n", gd->ram_size >> 20);
-#endif
+       sprintf (env_buf, "%lu", (ulong)(gd->ram_size >> 20));
+       debug ("## Giving linux memsize in MB, %lu\n", (ulong)(gd->ram_size >> 20));
 #endif /* CONFIG_MEMSIZE_IN_BYTES */
 
        linux_env_set ("memsize", env_buf);

diff --git a/net/eth.c b/net/eth.c
index 7fc9aeea5efb8d5f8d9dd05bc3d42a0920b4c6d1..38979aa5a53140cd082b689f1936148799472a99 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -627,7 +627,7 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_MCF52x2)
        mcf52x2_miiphy_initialize(bis);
 #endif
-#if defined(CONFIG_NETARM)
+#if defined(CONFIG_DRIVER_NS7520_ETHERNET)
        ns7520_miiphy_initialize(bis);
 #endif
 #if defined(CONFIG_DRIVER_TI_EMAC)

diff --git a/net/net.c b/net/net.c
index c96f566fab1ac8064e293b62b9400616a63bb77f..313d5d8dab354cbbdc4d32b2f3888a37c11df68f 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -1390,7 +1390,7 @@ NetReceive(volatile uchar * inpkt, int len)
                puts ("Got IP\n");
 #endif
                if (len < IP_HDR_SIZE) {
-                       debug ("len bad %d < %ld\n", len, IP_HDR_SIZE);
+                       debug ("len bad %d < %lu\n", len, (ulong)IP_HDR_SIZE);
                        return;
                }
                if (len < ntohs(ip->ip_len)) {