diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-11-20 10:27:39 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2006-11-20 10:27:39 +0100 |
| commit | fb934873d665d7a4afa692353657db316437ed40 (patch) | |
| tree | 77b0eb9c87f811fba3296ecd92812ad2f7d3fe15 /include | |
| parent | b21b511d4c50408f4853f46f06b601272196223f (diff) | |
| parent | 260421a21e934a68d31fb6125b0fbd2631a8ca20 (diff) | |
| download | u-boot-imx-fb934873d665d7a4afa692353657db316437ed40.zip u-boot-imx-fb934873d665d7a4afa692353657db316437ed40.tar.gz u-boot-imx-fb934873d665d7a4afa692353657db316437ed40.tar.bz2 | |
Merge with /home/sr/git/u-boot/cfi-update
Diffstat (limited to 'include')
| -rw-r--r-- | include/flash.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/flash.h b/include/flash.h index d91589a..9c57cbc 100644 --- a/include/flash.h +++ b/include/flash.h @@ -43,9 +43,14 @@ typedef struct { ulong write_tout; /* maximum write timeout */ ulong buffer_write_tout; /* maximum buffer write timeout */ ushort vendor; /* the primary vendor id */ - ushort cmd_reset; /* Vendor specific reset command */ + ushort cmd_reset; /* vendor specific reset command */ ushort interface; /* used for x8/x16 adjustments */ ushort legacy_unlock; /* support Intel legacy (un)locking */ + uchar manufacturer_id; /* manufacturer id */ + ushort device_id; /* device id */ + ushort device_id2; /* extended device id */ + ushort ext_addr; /* extended query table address */ + ushort cfi_version; /* cfi version */ #endif } flash_info_t; @@ -439,6 +444,7 @@ extern void flash_read_factory_serial(flash_info_t * info, void * buffer, int of #define FLASH_MAN_MT 0x00400000 #define FLASH_MAN_SHARP 0x00500000 #define FLASH_MAN_ATM 0x00600000 +#define FLASH_MAN_CFI 0x01000000 #define FLASH_TYPEMASK 0x0000FFFF /* extract FLASH type information */ |