diff options
| author | Marian Balakowicz <m8@semihalf.com> | 2008-02-29 13:56:44 +0100 |
|---|---|---|
| committer | Marian Balakowicz <m8@semihalf.com> | 2008-02-29 13:56:44 +0100 |
| commit | e18489e8c27e843e337258fb00f2652ff0f43b92 (patch) | |
| tree | 2a3b2afa224e61cb7f1206a1641007e526d25160 /drivers/mtd/cfi_flash.c | |
| parent | 75fa002c47171b73fb4c1f2c2fe4d6391c136276 (diff) | |
| parent | b29661fc1151077776454288051bc9a488351ce8 (diff) | |
| download | u-boot-imx-e18489e8c27e843e337258fb00f2652ff0f43b92.zip u-boot-imx-e18489e8c27e843e337258fb00f2652ff0f43b92.tar.gz u-boot-imx-e18489e8c27e843e337258fb00f2652ff0f43b92.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot into new-image
Diffstat (limited to 'drivers/mtd/cfi_flash.c')
| -rw-r--r-- | drivers/mtd/cfi_flash.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index eb509f5..439c950 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++) { |