Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / mtd / cfi_flash.h

diff --git a/include/mtd/cfi_flash.h b/include/mtd/cfi_flash.h
index 9bd76eb97603c44cabfc9b55cf98ee76d6335fc9..966b5e00cac20a3cd36a60917ff226980908ffee 100644 (file)
--- a/include/mtd/cfi_flash.h
+++ b/include/mtd/cfi_flash.h
@@ -78,30 +78,29 @@
 #define FLASH_CONTINUATION_CODE                0x7F
 
 #define FLASH_OFFSET_MANUFACTURER_ID   0x00
-#define FLASH_OFFSET_DEVICE_ID         0x02
-#define FLASH_OFFSET_DEVICE_ID2                0x1C
-#define FLASH_OFFSET_DEVICE_ID3                0x1E
-#define FLASH_OFFSET_CFI               0xAA
-
+#define FLASH_OFFSET_DEVICE_ID         0x01
+#define FLASH_OFFSET_DEVICE_ID2                0x0E
+#define FLASH_OFFSET_DEVICE_ID3                0x0F
+#define FLASH_OFFSET_CFI               0x55
 #define FLASH_OFFSET_CFI_ALT           0x555
-#define FLASH_OFFSET_CFI_RESP          0x20
-#define FLASH_OFFSET_PRIMARY_VENDOR    0x26
+#define FLASH_OFFSET_CFI_RESP          0x10
+#define FLASH_OFFSET_PRIMARY_VENDOR    0x13
 /* extended query table primary address */
-#define FLASH_OFFSET_EXT_QUERY_T_P_ADDR   0x2A
+#define FLASH_OFFSET_EXT_QUERY_T_P_ADDR        0x15
 #define FLASH_OFFSET_WTOUT             0x1F
-#define FLASH_OFFSET_WBTOUT            0x40
-#define FLASH_OFFSET_ETOUT             0x4A
-#define FLASH_OFFSET_CETOUT            0x44
-#define FLASH_OFFSET_WMAX_TOUT         0x46
-#define FLASH_OFFSET_WBMAX_TOUT                0x48
-#define FLASH_OFFSET_EMAX_TOUT         0x4A
-#define FLASH_OFFSET_CEMAX_TOUT                0x4C
-#define FLASH_OFFSET_SIZE              0x4E
-#define FLASH_OFFSET_INTERFACE         0x50
-#define FLASH_OFFSET_BUFFER_SIZE       0x54
-#define FLASH_OFFSET_NUM_ERASE_REGIONS 0x58
-#define FLASH_OFFSET_ERASE_REGIONS     0x5A
-#define FLASH_OFFSET_PROTECT           0x04
+#define FLASH_OFFSET_WBTOUT            0x20
+#define FLASH_OFFSET_ETOUT             0x21
+#define FLASH_OFFSET_CETOUT            0x22
+#define FLASH_OFFSET_WMAX_TOUT         0x23
+#define FLASH_OFFSET_WBMAX_TOUT                0x24
+#define FLASH_OFFSET_EMAX_TOUT         0x25
+#define FLASH_OFFSET_CEMAX_TOUT                0x26
+#define FLASH_OFFSET_SIZE              0x27
+#define FLASH_OFFSET_INTERFACE         0x28
+#define FLASH_OFFSET_BUFFER_SIZE       0x2A
+#define FLASH_OFFSET_NUM_ERASE_REGIONS 0x2C
+#define FLASH_OFFSET_ERASE_REGIONS     0x2D
+#define FLASH_OFFSET_PROTECT           0x02
 #define FLASH_OFFSET_USER_PROTECTION   0x85
 #define FLASH_OFFSET_INTEL_PROTECTION  0x81