summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-02-22 13:02:10 +0100
committerWolfgang Denk <wd@denx.de>2008-02-22 13:02:10 +0100
commit45d65b7f285b17d21270ff002127c246431bd668 (patch)
treee37102321a7eb6d7ef042e7060860c22b95abc96
parent239c885802bbce01a184550da7452621f027a5dd (diff)
parent1ba639da5604a64b3ed884a2cbb1c5414a9fa728 (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
-rw-r--r--drivers/mtd/cfi_flash.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index eb509f55571..439c950cf22 100644
--- 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++) {