diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-05-09 18:33:36 -0400 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2011-06-29 10:05:19 +0200 |
| commit | 4c2105cb9fc6f2cd871ad6b5c3c1a0b116196804 (patch) | |
| tree | 0c1973338b72892530af2e1c1611031cfe939710 | |
| parent | b1af6f532e0d348b153d5c148369229d24af361a (diff) | |
| download | u-boot-imx-4c2105cb9fc6f2cd871ad6b5c3c1a0b116196804.zip u-boot-imx-4c2105cb9fc6f2cd871ad6b5c3c1a0b116196804.tar.gz u-boot-imx-4c2105cb9fc6f2cd871ad6b5c3c1a0b116196804.tar.bz2 | |
cfi_flash: reverse geometry for newer STM parts
For newer STM parts where CFI >= 1.1, there is a byte in the extended
structure that declares the flash layout type (just like the AMD parts),
so key off of that to find out when we need to reverse the geometry.
This can be seen with M29W640 parts where U-Boot does:
Bank # 1: CFI conformant FLASH (16 x 16) Size: 8 MB in 135 Sectors
AMD Standard command set, Manufacturer ID: 0x20, Device ID: 0x22ED
Erase timeout: 8192 ms, write timeout: 1 ms
Buffer write timeout: 1 ms, buffer size: 16 bytes
Sector Start Addresses:
20000000 RO 20002000 RO 20004000 RO 20006000 RO 20008000 RO
2000A000 RO 2000C000 RO 2000E000 RO 20010000 RO 20020000 RO
...
But Linux does:
physmap platform flash device: 00800000 at 20000000
physmap-flash.0: Found 1 x16 devices at 0x0 in 16-bit bank.
Manufacturer ID 0x000020 Chip ID 0x0022ed
physmap-flash.0: Swapping erase regions for top-boot CFI table.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | drivers/mtd/cfi_flash.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 6039e1f..929f9a9 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -1874,6 +1874,10 @@ static void flash_fixup_stm(flash_info_t *info, struct cfi_qry *qry) info->device_id == 0x22D7) { /* M29W800DT */ cfi_reverse_geometry(qry); } + } else if (flash_read_uchar(info, info->ext_addr + 0xf) == 3) { + /* CFI >= 1.1, deduct from top/bottom flag */ + /* note: ext_addr is valid since cfi_version > 0 */ + cfi_reverse_geometry(qry); } } } |