diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-26 23:38:04 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-26 23:38:04 (GMT) |
| commit | 9241265f29f3670e380a9859a343ddc14873c46f (patch) | |
| tree | ac4fe2a1ee8c1aeaf7baabcba1ead224ce340d3e /include | |
| parent | f66bc0e0beeff7fa27c29f740d2f314d63b3346d (diff) | |
| parent | 72443c7f7d2174903e73ee88dcb4364e0387bbb2 (diff) | |
| download | u-boot-9241265f29f3670e380a9859a343ddc14873c46f.tar.xz | |
Merge git://www.denx.de/git/u-boot-cfi-flash
Diffstat (limited to 'include')
| -rw-r--r-- | include/flash.h | 5 | ||||
| -rw-r--r-- | include/mtd/cfi_flash.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/flash.h b/include/flash.h index f53fe91..dc67cb2 100644 --- a/include/flash.h +++ b/include/flash.h @@ -42,11 +42,16 @@ typedef struct { ushort cfi_offset; /* offset for cfi query */ ulong addr_unlock1; /* unlock address 1 for AMD flash roms */ ulong addr_unlock2; /* unlock address 2 for AMD flash roms */ + uchar sr_supported; /* status register supported */ const char *name; /* human-readable name */ #endif #ifdef CONFIG_MTD struct mtd_info *mtd; #endif +#ifdef CONFIG_CFI_FLASH /* DM-specific parts */ + struct udevice *dev; + phys_addr_t base; +#endif } flash_info_t; extern flash_info_t flash_info[]; /* info for FLASH chips */ diff --git a/include/mtd/cfi_flash.h b/include/mtd/cfi_flash.h index eade2b3..095725a 100644 --- a/include/mtd/cfi_flash.h +++ b/include/mtd/cfi_flash.h @@ -62,6 +62,7 @@ #define FLASH_OFFSET_MANUFACTURER_ID 0x00 #define FLASH_OFFSET_DEVICE_ID 0x01 +#define FLASH_OFFSET_LOWER_SW_BITS 0x0C #define FLASH_OFFSET_DEVICE_ID2 0x0E #define FLASH_OFFSET_DEVICE_ID3 0x0F #define FLASH_OFFSET_CFI 0x55 |