From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wang Jian Date: Mon, 03 Apr 2006 15:22:31 +0800 Subject: [U-Boot-Users] [PATCH] Fix for configuration has both dataflash and parallel flash Message-ID: <20060403151210.8B8D.LARK@linux.net.cn> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi, When the board has both dataflash and parallel flash, using 'cp' command will write to parallel flash and then fail. The patch below fixes the problem. BTW, I think "addr" is typo of "dest" in the dataflash test, so the patch may be as simple as s/addr/dest/ in dataflash test. I am in a hurry, so let suitable person to decide. diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 0f4f9b7..a01c2a5 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -423,6 +423,7 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int fl /* check if we are copying to Flash */ if ( (addr2info(dest) != NULL) #ifdef CONFIG_HAS_DATAFLASH + && (!addr_dataflash(dest)) && (!addr_dataflash(addr)) #endif ) { -- lark