projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
239c885
)
Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
author
Wolfgang Denk
<wd@denx.de>
Fri, 22 Feb 2008 12:02:10 +0000
(13:02 +0100)
committer
Wolfgang Denk
<wd@denx.de>
Fri, 22 Feb 2008 12:02:10 +0000
(13:02 +0100)
drivers/mtd/cfi_flash.c
patch
|
blob
|
history
diff --git
a/drivers/mtd/cfi_flash.c
b/drivers/mtd/cfi_flash.c
index
eb509f5
..
439c950
100644
(file)
--- a/
drivers/mtd/cfi_flash.c
+++ b/
drivers/mtd/cfi_flash.c
@@
-1538,7
+1538,12
@@
static int __flash_detect_cfi (flash_info_t * info, struct cfi_qry *qry)
{
int cfi_offset;
- flash_write_cmd (info, 0, 0, info->cmd_reset);
+ /* We do not yet know what kind of commandset to use, so we issue
+ the reset command in both Intel and AMD variants, in the hope
+ that AMD flash roms ignore the Intel command. */
+ 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++) {