Memory footprint optimizations

[u-boot] / common / cmd_mem.c

diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index ed91f27046b52c5c6dd3f0208f708d3f02bd09aa..d6d7a5b77f90d4bbd508aecbb1996d029953a2fe 100644 (file)
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -417,7 +417,7 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        /* check if we are copying to Flash */
        if ( (addr2info(dest) != NULL)
 #ifdef CONFIG_HAS_DATAFLASH
-          && (!addr_dataflash(addr))
+          && (!addr_dataflash(dest))
 #endif
           ) {
                int rc;
@@ -492,7 +492,11 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        }
 
        /* Check if we are copying from DataFlash to RAM */
-       if (addr_dataflash(addr) && !addr_dataflash(dest) && (addr2info(dest)==NULL) ){
+       if (addr_dataflash(addr) && !addr_dataflash(dest)
+#ifndef CFG_NO_FLASH
+                                && (addr2info(dest) == NULL)
+#endif
+          ){
                int rc;
                rc = read_dataflash(addr, count * size, (char *) dest);
                if (rc != 1) {