summaryrefslogtreecommitdiffstats
path: root/drivers/nor
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2010-11-27 00:00:38 +0800
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2010-12-03 01:53:12 +0800
commit64e70cd0508e36e76ae69f1a9eedacd6be7e18be (patch)
tree8be9a57cd86956fadd442b9a350c55873b108521 /drivers/nor
parentae416f62701feb0cc93257b80c1a9a2b3c3bd54b (diff)
downloadbarebox-64e70cd0508e36e76ae69f1a9eedacd6be7e18be.tar.gz
barebox-64e70cd0508e36e76ae69f1a9eedacd6be7e18be.tar.xz
cfi_flash: use amd and standard reset flash command at probing
as we do not known which flash we have yet Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'drivers/nor')
-rw-r--r--drivers/nor/cfi_flash.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nor/cfi_flash.c b/drivers/nor/cfi_flash.c
index 0efe0d4b58..fb5935e352 100644
--- a/drivers/nor/cfi_flash.c
+++ b/drivers/nor/cfi_flash.c
@@ -279,7 +279,8 @@ static int flash_detect_cfi (struct flash_info *info)
for (info->chipwidth = FLASH_CFI_BY8;
info->chipwidth <= info->portwidth;
info->chipwidth <<= 1) {
- flash_write_cmd (info, 0, 0, info->cmd_reset);
+ flash_write_cmd (info, 0, 0, AMD_CMD_RESET);
+ flash_write_cmd (info, 0, 0, FLASH_CMD_RESET);
for (cfi_offset=0; cfi_offset < sizeof(flash_offset_cfi)/sizeof(uint); cfi_offset++) {
flash_write_cmd (info, 0, flash_offset_cfi[cfi_offset], FLASH_CMD_CFI);
if (flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP, 'Q')