X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=cmd%2Fmem.c;h=83d34faf2d8885147e54ec62a200ae5ad41b6e18;hb=b504ff9f6bbdd4d3700595f64f3c30c5c9f70d35;hp=ff6a7709d2070bda873d0f28e1a06869f9a5d771;hpb=0675f992dbf4a785a05a1baf149c2bce6aa5fe90;p=u-boot

diff --git a/cmd/mem.c b/cmd/mem.c
index ff6a7709d2..83d34faf2d 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -396,7 +396,7 @@ static int do_mem_cp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		return 1;
 	}
 
-#ifndef CONFIG_SYS_NO_FLASH
+#ifdef CONFIG_MTD_NOR_FLASH
 	/* check if we are copying to Flash */
 	if ( (addr2info(dest) != NULL)
 #ifdef CONFIG_HAS_DATAFLASH
@@ -436,7 +436,7 @@ static int do_mem_cp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	/* Check if we are copying from DataFlash to RAM */
 	if (addr_dataflash(addr) && !addr_dataflash(dest)
-#ifndef CONFIG_SYS_NO_FLASH
+#ifdef CONFIG_MTD_NOR_FLASH
 				 && (addr2info(dest) == NULL)
 #endif
 	   ){