summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.(none)>2005-09-25 16:41:22 +0200
committerWolfgang Denk <wd@pollux.(none)>2005-09-25 16:41:22 +0200
commitdb421e6451b9e51882ebfebf388cef3bc6ab3117 (patch)
tree4e3f8166834596c3bdad93ec6c1fec2dea99cf0e
parentc177bb5f6c0d496c5e2a429c72f89f325b46198c (diff)
downloadu-boot-imx-db421e6451b9e51882ebfebf388cef3bc6ab3117.zip
u-boot-imx-db421e6451b9e51882ebfebf388cef3bc6ab3117.tar.gz
u-boot-imx-db421e6451b9e51882ebfebf388cef3bc6ab3117.tar.bz2
Fix drivers/cfi_flash.c: use info->reset_cmd instead of FLASH_CMD_RESET
Patch by Zachary Landau, 11 Feb 2005
-rw-r--r--CHANGELOG3
-rw-r--r--drivers/cfi_flash.c10
2 files changed, 8 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 45f759e..620a72c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes for U-Boot 1.1.4:
======================================================================
+* Fix drivers/cfi_flash.c: use info->reset_cmd instead of FLASH_CMD_RESET
+ Patch by Zachary Landau, 11 Feb 2005
+
* Fix VOH405 Support
Patch by Matthias Fuchs, 25 Sep 2005
diff --git a/drivers/cfi_flash.c b/drivers/cfi_flash.c
index 2ffaf80..23c0244 100644
--- a/drivers/cfi_flash.c
+++ b/drivers/cfi_flash.c
@@ -638,7 +638,7 @@ void flash_read_user_serial (flash_info_t * info, void *buffer, int offset,
src = flash_make_addr (info, 0, FLASH_OFFSET_USER_PROTECTION);
flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
memcpy (dst, src + offset, len);
- flash_write_cmd (info, 0, 0, FLASH_CMD_RESET);
+ flash_write_cmd (info, 0, 0, info->cmd_reset);
}
/*
@@ -652,7 +652,7 @@ void flash_read_factory_serial (flash_info_t * info, void *buffer, int offset,
src = flash_make_addr (info, 0, FLASH_OFFSET_INTEL_PROTECTION);
flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
memcpy (buffer, src + offset, len);
- flash_write_cmd (info, 0, 0, FLASH_CMD_RESET);
+ flash_write_cmd (info, 0, 0, info->cmd_reset);
}
#endif /* CFG_FLASH_PROTECTION */
@@ -737,7 +737,7 @@ static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
if (flash_isset (info, sector, 0, FLASH_STATUS_VPENS))
puts ("Vpp Low Error.\n");
}
- flash_write_cmd (info, sector, 0, FLASH_CMD_RESET);
+ flash_write_cmd (info, sector, 0, info->cmd_reset);
break;
default:
break;
@@ -978,7 +978,7 @@ static int flash_detect_cfi (flash_info_t * info)
for (info->chipwidth = FLASH_CFI_BY8;
info->chipwidth <= info->portwidth;
info->chipwidth <<= 1) {
- flash_write_cmd (info, 0, 0, FLASH_CMD_RESET);
+ flash_write_cmd (info, 0, 0, info->cmd_reset);
flash_write_cmd (info, 0, FLASH_OFFSET_CFI, FLASH_CMD_CFI);
if (flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP, 'Q')
&& flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 1, 'R')
@@ -1102,7 +1102,7 @@ static ulong flash_get_size (ulong base, int banknum)
}
}
- flash_write_cmd (info, 0, 0, FLASH_CMD_RESET);
+ flash_write_cmd (info, 0, 0, info->cmd_reset);
return (info->size);
}