diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-13 23:38:27 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-13 23:38:27 +0200 |
| commit | 227ad917c5510f595bed29c996a3411b50118959 (patch) | |
| tree | 6e13b3676f2ab866ac42499d4e81c94ba2226028 /drivers | |
| parent | ed01c4f59ddda1cb898d86c1ac0945c756ab88c2 (diff) | |
| parent | b4db4a7638ef90cf0aacf7b954d9bf3043dda780 (diff) | |
| download | u-boot-imx-227ad917c5510f595bed29c996a3411b50118959.zip u-boot-imx-227ad917c5510f595bed29c996a3411b50118959.tar.gz u-boot-imx-227ad917c5510f595bed29c996a3411b50118959.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/cfi_flash.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index d0732f5..81ac5d3 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -835,14 +835,19 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest, break; case CFI_CMDSET_AMD_EXTENDED: case CFI_CMDSET_AMD_STANDARD: -#ifdef CONFIG_FLASH_CFI_LEGACY - case CFI_CMDSET_AMD_LEGACY: -#endif sect = find_sector(info, dest); flash_unlock_seq (info, sect); flash_write_cmd (info, sect, info->addr_unlock1, AMD_CMD_WRITE); sect_found = 1; break; +#ifdef CONFIG_FLASH_CFI_LEGACY + case CFI_CMDSET_AMD_LEGACY: + sect = find_sector(info, dest); + flash_unlock_seq (info, 0); + flash_write_cmd (info, 0, info->addr_unlock1, AMD_CMD_WRITE); + sect_found = 1; + break; +#endif } switch (info->portwidth) { |