ARM: davici_emac: Fix condition for number of phy detects

[u-boot] / common / cmd_mem.c

diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index a5576aaab00df0f16f2342c311dd376d1594503f..f7e76d6b680596610b85fb81291888a6e9c81c3d 100644 (file)
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -471,7 +471,7 @@ int do_mem_base (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 int do_mem_loop (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       ulong   addr, length, i, junk;
+       ulong   addr, length, i;
        int     size;
        volatile uint   *longp;
        volatile ushort *shortp;
@@ -518,7 +518,7 @@ int do_mem_loop (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        longp = (uint *)addr;
                        i = length;
                        while (i-- > 0)
-                               junk = *longp++;
+                               *longp++;
                }
        }
        if (size == 2) {
@@ -526,14 +526,14 @@ int do_mem_loop (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        shortp = (ushort *)addr;
                        i = length;
                        while (i-- > 0)
-                               junk = *shortp++;
+                               *shortp++;
                }
        }
        for (;;) {
                cp = (u_char *)addr;
                i = length;
                while (i-- > 0)
-                       junk = *cp++;
+                       *cp++;
        }
 }
 
@@ -937,7 +937,7 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        if (readback != val) {
                                printf ("\nMem error @ 0x%08X: "
                                        "found %08lX, expected %08lX\n",
-                                       (uint)addr, readback, val);
+                                       (uint)(uintptr_t)addr, readback, val);
                                errs++;
                                if (ctrlc()) {
                                        putc ('\n');
@@ -977,7 +977,6 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[])
 {
        ulong   addr, i;
        int     nbytes, size;
-       extern char console_buffer[];
 
        if (argc != 2)
                return cmd_usage(cmdtp);
@@ -1092,7 +1091,7 @@ int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        length = simple_strtoul (argv[2], NULL, 16);
 
-       crc = crc32 (0, (const uchar *) addr, length);
+       crc = crc32_wd (0, (const uchar *) addr, length, CHUNKSZ_CRC32);
 
        printf ("CRC32 for %08lx ... %08lx ==> %08lx\n",
                        addr, addr + length - 1, crc);
@@ -1137,7 +1136,7 @@ usage:
        addr += base_address;
        length = simple_strtoul(*av++, NULL, 16);
 
-       crc = crc32(0, (const uchar *) addr, length);
+       crc = crc32_wd (0, (const uchar *) addr, length, CHUNKSZ_CRC32);
 
        if (!verify) {
                printf ("CRC32 for %08lx ... %08lx ==> %08lx\n",