diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2006-11-28 23:35:49 -0600 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2006-11-28 23:35:49 -0600 |
| commit | 32081125a028aff9e93af5281c777b0745ef8558 (patch) | |
| tree | 4e4f95da64aed9db11bb245a00e5c0bead04ad23 /include/flash.h | |
| parent | cf3d045e51ca8dcc6cf759827140861d6ac25c04 (diff) | |
| parent | d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b (diff) | |
| download | u-boot-imx-32081125a028aff9e93af5281c777b0745ef8558.zip u-boot-imx-32081125a028aff9e93af5281c777b0745ef8558.tar.gz u-boot-imx-32081125a028aff9e93af5281c777b0745ef8558.tar.bz2 | |
Merge http://www.denx.de/git/u-boot
Diffstat (limited to 'include/flash.h')
| -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 */ |