unified MX27, MX25, MX37 trees

[karo-tx-redboot.git] / packages / devs / flash / arm / mxc / v2_0 / include / imx_nfc.h

diff --git a/packages/devs/flash/arm/mxc/v2_0/include/imx_nfc.h b/packages/devs/flash/arm/mxc/v2_0/include/imx_nfc.h
index d8f5704b5e1d403d7c3d5f1b643cc60b425cae56..cf762c2701ee1c39b5d23a217be2948254765581 100644 (file)
--- a/packages/devs/flash/arm/mxc/v2_0/include/imx_nfc.h
+++ b/packages/devs/flash/arm/mxc/v2_0/include/imx_nfc.h
@@ -52,47 +52,58 @@
 //
 //==========================================================================
 
-#define NFC_DEBUG_MIN   1
-#define NFC_DEBUG_MED   2
-#define NFC_DEBUG_MAX   3
-#define NFC_DEBUG_DEF   NFC_DEBUG_MED
+enum {
+       MXC_NFC_V1 = 0x10,
+       MXC_NFC_V1_1 = 0x11,
+       MXC_NFC_V2 = 0x20,
+       MXC_NFC_V3 = 0x30,
+};
+
+enum {
+       NFC_DEBUG_NONE,
+       NFC_DEBUG_MIN,
+       NFC_DEBUG_MED,
+       NFC_DEBUG_MAX,
+};
+#define NFC_DEBUG_DEF  NFC_DEBUG_NONE
 
 extern int _mxc_boot;
 typedef unsigned short u16;
 typedef unsigned int u32;
 typedef unsigned char u8;
+typedef unsigned long long u64;
 
 //----------------------------------------------------------------------------
 // Common device details.
-#define FLASH_Read_ID                   (0x90)
+#define FLASH_Read_ID                                  0x90
 #ifdef CYGHWR_DEVS_FLASH_MXC_NAND_RESET_WORKAROUND
-#define FLASH_Reset                     0xFFFF
+#define FLASH_Reset                                            0xFFFF
 #else
-#define FLASH_Reset                     (0xFF)
+#define FLASH_Reset                                            0xFF
 #endif
-#define FLASH_Read_Mode1                (0x00)
-#define FLASH_Read_Mode1_LG             (0x30)
-#define FLASH_Read_Mode2                (0x01)
-#define FLASH_Read_Mode3                (0x50)
-#define FLASH_Program                   (0x10)
-#define FLASH_Send_Data                 (0x80)
-#define FLASH_Status                    (0x70)
-#define FLASH_Block_Erase               (0x60)
-#define FLASH_Start_Erase               (0xD0)
+#define FLASH_Read_Mode1                               0x00
+#define FLASH_Read_Mode1_LG                            0x30
+#define FLASH_Read_Mode2                               0x01
+#define FLASH_Read_Mode3                               0x50
+#define FLASH_Program                                  0x10
+#define FLASH_Send_Data                                        0x80
+#define FLASH_Status                                   0x70
+#define FLASH_Block_Erase                              0x60
+#define FLASH_Start_Erase                              0xD0
 
 enum nfc_page_area {
-    NFC_SPARE_ONLY,
-    NFC_MAIN_ONLY,
+       NFC_SPARE_ONLY,
+       NFC_MAIN_ONLY,
 };
 
 enum {
-    MXC_NAND_8_BIT = 8,
-    MXC_NAND_16_BIT =  16,
+       MXC_NAND_8_BIT = 8,
+       MXC_NAND_16_BIT =  16,
 };
 
 enum {
-    NAND_SLC = 0,
-    NAND_MLC = 1,
+       NAND_SLC = 0,
+       NAND_MLC = 1,
 };
 
 // read column 464-465 byte but only 464 for bad block marker