Eliminate MixedCaps symbol from public JTAG TAP API:

[openocd] / src / flash / non_cfi.c

diff --git a/src/flash/non_cfi.c b/src/flash/non_cfi.c
index b9ef1127331c435c364b908ef311d77787abdcf7..3e86e0da30ed80cd9d639d906eb81c7793f2b607 100644 (file)
--- a/src/flash/non_cfi.c
+++ b/src/flash/non_cfi.c
@@ -23,13 +23,9 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-
-#include "log.h"
-
-#include "flash.h"
-#include "cfi.h"
 #include "non_cfi.h"
+#include "cfi.h"
+
 
 #define KB 1024
 #define MB (1024*1024)
@@ -44,6 +40,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 64*KB,
                .interface_desc = 0x0,          /* x8 only device */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 1,
                .erase_region_info =
                {
@@ -57,6 +54,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 128*KB,
                .interface_desc = 0x0,          /* x8 only device */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 1,
                .erase_region_info =
                {
@@ -70,6 +68,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 256*KB,
                .interface_desc = 0x0,          /* x8 only device */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 1,
                .erase_region_info =
                {
@@ -83,6 +82,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 512*KB,
                .interface_desc = 0x0,          /* x8 only device */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 1,
                .erase_region_info =
                {
@@ -96,6 +96,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 512*KB,
                .interface_desc = 0x2,          /* x8 or x16 device */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 1,
                .erase_region_info =
                {
@@ -109,6 +110,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 512*KB,
                .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 4,
                .erase_region_info =
                {
@@ -125,6 +127,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 512*KB,
                .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 4,
                .erase_region_info =
                {
@@ -134,6 +137,94 @@ non_cfi_t non_cfi_flashes[] = {
                        ERASE_REGION( 1, 16*KB)
                }
        },
+
+       /* SST 39VF* do not support DQ5 status polling - this currently is
+          only supported by the host algorithm, not by the target code using
+          the work area. */
+       {
+               .mfr = CFI_MFR_SST,
+               .id = 0x2782,                           /* SST39xF160 */
+               .pri_id = 0x02,
+               .dev_size = 2*MB,
+               .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
+               .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ6_DQ7,
+               .num_erase_regions = 1,
+               .erase_region_info =
+               {
+                       ERASE_REGION(512, 4*KB)
+               }
+       },
+       {
+               .mfr = CFI_MFR_SST,
+               .id = 0x2783,                           /* SST39VF320 */
+               .pri_id = 0x02,
+               .dev_size = 4*MB,
+               .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
+               .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ6_DQ7,
+               .num_erase_regions = 1,
+               .erase_region_info =
+               {
+                       ERASE_REGION(1024, 4*KB)
+               }
+       },
+       {
+               .mfr = CFI_MFR_SST,
+               .id = 0x234b,                           /* SST39VF1601 */
+               .pri_id = 0x02,
+               .dev_size = 2*MB,
+               .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
+               .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ6_DQ7,
+               .num_erase_regions = 1,
+               .erase_region_info =
+               {
+                       ERASE_REGION(512, 4*KB)
+               }
+       },
+       {
+               .mfr = CFI_MFR_SST,
+               .id = 0x234a,                           /* SST39VF1602 */
+               .pri_id = 0x02,
+               .dev_size = 2*MB,
+               .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
+               .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ6_DQ7,
+               .num_erase_regions = 1,
+               .erase_region_info =
+               {
+                       ERASE_REGION(512, 4*KB)
+               }
+       },
+       {
+               .mfr = CFI_MFR_SST,
+               .id = 0x235b,                           /* SST39VF3201 */
+               .pri_id = 0x02,
+               .dev_size = 4*MB,
+               .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
+               .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ6_DQ7,
+               .num_erase_regions = 1,
+               .erase_region_info =
+               {
+                       ERASE_REGION(1024, 4*KB)
+               }
+       },
+       {
+               .mfr = CFI_MFR_SST,
+               .id = 0x235a,                           /* SST39VF3202 */
+               .pri_id = 0x02,
+               .dev_size = 4*MB,
+               .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
+               .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ6_DQ7,
+               .num_erase_regions = 1,
+               .erase_region_info =
+               {
+                       ERASE_REGION(1024, 4*KB)
+               }
+       },
        {
                .mfr = CFI_MFR_AMD,
                .id = 0x22ab,                           /* AM29F400BB */
@@ -141,6 +232,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 512*KB,
                .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 4,
                .erase_region_info =
                {
@@ -157,6 +249,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 512*KB,
                .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 4,
                .erase_region_info =
                {
@@ -173,6 +266,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 1*MB,
                .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 4,
                .erase_region_info =
                {
@@ -189,6 +283,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 1*MB,
                .interface_desc = 0x2,
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 4,
                .erase_region_info =
                {
@@ -205,6 +300,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 1*MB,
                .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 4,
                .erase_region_info =
                {
@@ -222,6 +318,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 2*MB,
                .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 4,
                .erase_region_info =
                {
@@ -238,6 +335,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 2*MB,
                .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 4,
                .erase_region_info =
                {
@@ -247,19 +345,6 @@ non_cfi_t non_cfi_flashes[] = {
                        ERASE_REGION( 1, 16*KB)
                }
        },
-       {
-               .mfr = CFI_MFR_SST,
-               .id = 0x2782,                           /* SST39xF160 */
-               .pri_id = 0x02,
-               .dev_size = 2*MB,
-               .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
-               .max_buf_write_size = 0x0,
-               .num_erase_regions = 1,
-               .erase_region_info =
-               {
-                       ERASE_REGION(512, 4*KB)
-               }
-       },
        {
                .mfr = CFI_MFR_ATMEL,
                .id = 0x00c0,                           /* Atmel 49BV1614 */
@@ -267,6 +352,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 2*MB,
                .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 3,
                .erase_region_info =
                {
@@ -282,6 +368,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 2*MB,
                .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 3,
                .erase_region_info =
                {
@@ -297,6 +384,7 @@ non_cfi_t non_cfi_flashes[] = {
                .dev_size = 1*MB,
                .interface_desc = 0x2,          /* x8 or x16 device with nBYTE */
                .max_buf_write_size = 0x0,
+               .status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7,
                .num_erase_regions = 4,
                .erase_region_info =
                {
@@ -358,6 +446,7 @@ void cfi_fixup_non_cfi(flash_bank_t *bank)
 
        cfi_info->interface_desc = non_cfi->interface_desc;
        cfi_info->max_buf_write_size = non_cfi->max_buf_write_size;
+       cfi_info->status_poll_mask = non_cfi->status_poll_mask;
        cfi_info->num_erase_regions = non_cfi->num_erase_regions;
        cfi_info->erase_region_info = non_cfi->erase_region_info;
        cfi_info->dev_size = non_cfi->dev_size;