Skip to content

U
U-Boot.Mirror

OS / U-Boot.Mirror

通知 1
Star 0
Fork 0
U
U-Boot.Mirror

体验新版 GitCode，发现更多精彩内容 >>

提交 db421e64 编写于 作者: W Wolfgang Denk
浏览文件
操作

Fix drivers/cfi_flash.c: use info->reset_cmd instead of FLASH_CMD_RESET 

Patch by Zachary Landau, 11 Feb 2005
上级 c177bb5f
隐藏空白更改
内联 并排
Showing with 8 addition and 5 deletion
CHANGELOG
浏览文件 @ db421e64
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
Changes for U-Boot 1.1.4: 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 * Fix VOH405 Support
Patch by Matthias Fuchs, 25 Sep 2005 Patch by Matthias Fuchs, 25 Sep 2005
......
drivers/cfi_flash.c
浏览文件 @ db421e64
...@@ -638,7 +638,7 @@ void flash_read_user_serial (flash_info_t * info, void *buffer, int offset, ...@@ -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); src = flash_make_addr (info, 0, FLASH_OFFSET_USER_PROTECTION);
flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID); flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
memcpy (dst, src + offset, len); 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, ...@@ -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); src = flash_make_addr (info, 0, FLASH_OFFSET_INTEL_PROTECTION);
flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID); flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
memcpy (buffer, src + offset, len); 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 */ #endif /* CFG_FLASH_PROTECTION */
...@@ -737,7 +737,7 @@ static int flash_full_status_check (flash_info_t * info, flash_sect_t sector, ...@@ -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)) if (flash_isset (info, sector, 0, FLASH_STATUS_VPENS))
puts ("Vpp Low Error.\n"); puts ("Vpp Low Error.\n");
} }
flash_write_cmd (info, sector, 0, FLASH_CMD_RESET); flash_write_cmd (info, sector, 0, info->cmd_reset);
break; break;
default: default:
break; break;
...@@ -978,7 +978,7 @@ static int flash_detect_cfi (flash_info_t * info) ...@@ -978,7 +978,7 @@ static int flash_detect_cfi (flash_info_t * info)
for (info->chipwidth = FLASH_CFI_BY8; for (info->chipwidth = FLASH_CFI_BY8;
info->chipwidth <= info->portwidth; info->chipwidth <= info->portwidth;
info->chipwidth <<= 1) { 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); flash_write_cmd (info, 0, FLASH_OFFSET_CFI, FLASH_CMD_CFI);
if (flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP, 'Q') if (flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP, 'Q')
&& flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 1, 'R') && flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 1, 'R')
...@@ -1102,7 +1102,7 @@ static ulong flash_get_size (ulong base, int banknum) ...@@ -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); return (info->size);
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或