Fix merge problems

[u-boot] / include / flash.h

diff --git a/include/flash.h b/include/flash.h
index 6e252ccad8bd24f327db46bcb1c0175104675638..af8a7c08838b70bc42d3d37eefb4ae7179bd8173 100644 (file)
--- a/include/flash.h
+++ b/include/flash.h
@@ -51,10 +51,10 @@ typedef struct {
        ushort  device_id2;             /* extended device id                   */
        ushort  ext_addr;               /* extended query table address         */
        ushort  cfi_version;            /* cfi version                          */
-       ushort  cfi_offset;             /* offset for cfi query                 */
+       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  */
-       const char *name;               /* human-readable name                  */
+       const char *name;               /* human-readable name                  */
 #endif
 } flash_info_t;
 
@@ -80,6 +80,7 @@ typedef struct {
 #define FLASH_CFI_X8           0x00
 #define FLASH_CFI_X16          0x01
 #define FLASH_CFI_X8X16                0x02
+#define FLASH_CFI_X16X32       0x05
 
 /* convert between bit value and numeric value */
 #define CFI_FLASH_SHIFT_WIDTH  3