diff options
| author | Stefan Roese <sr@denx.de> | 2006-11-27 14:11:22 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2006-11-27 14:11:22 +0100 |
| commit | 48c7d6dba9140869a1d644248aa8cfabe01c98a6 (patch) | |
| tree | e5dcf79067eb653dcfa5e87667d4af204c0fb554 /include/flash.h | |
| parent | dfc8a9ee0040e53ada125a3c52f241e37f09cf28 (diff) | |
| parent | 3b58d9459081ae33885335c645fc0b865584ae4e (diff) | |
| download | u-boot-imx-48c7d6dba9140869a1d644248aa8cfabe01c98a6.zip u-boot-imx-48c7d6dba9140869a1d644248aa8cfabe01c98a6.tar.gz u-boot-imx-48c7d6dba9140869a1d644248aa8cfabe01c98a6.tar.bz2 | |
Merge with /home/stefan/git/u-boot/denx
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 */ |