Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx-merge-sr

[u-boot] / include / flash.h

diff --git a/include/flash.h b/include/flash.h
index 9c57cbc427c90bd9c0a68ea80df251ae0f2cc6cb..55b6d8f3885c1871e5583cfad7193a7d5c5abd33 100644 (file)
--- a/include/flash.h
+++ b/include/flash.h
@@ -51,6 +51,7 @@ 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                 */
 #endif
 } flash_info_t;
 
@@ -303,6 +304,7 @@ extern void flash_read_factory_serial(flash_info_t * info, void * buffer, int of
 
 #define TOSH_ID_FVT160 0xC2            /* TC58FVT160 ID (16 M, top )           */
 #define TOSH_ID_FVB160 0x43            /* TC58FVT160 ID (16 M, bottom )        */
+#define PHILIPS_LPC2292 0x0401FF13  /* LPC2292 internal FLASH                  */
 
 /*-----------------------------------------------------------------------
  * Internal FLASH identification codes