X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnon_cfi.c;h=a98ed7a0c85472336ebf7c8d471139646708ece7;hb=30dc76644da0dd9203dc9969a9be1d520fc5feb0;hp=3a74ff92f00f675a493d2ec350a27ad64f028f21;hpb=237e894805dd757cc24029af1b4b1e824c51712b;p=openocd.git

diff --git a/src/flash/non_cfi.c b/src/flash/non_cfi.c
index 3a74ff92f0..a98ed7a0c8 100644
--- a/src/flash/non_cfi.c
+++ b/src/flash/non_cfi.c
@@ -35,13 +35,13 @@ non_cfi_t non_cfi_flashes[] = {
 		.mfr = CFI_MFR_SST,
 		.id = 0xd4,
 		.pri_id = 0x02,
-		.dev_size = 0x10,
-		.interface_desc = 0x0,
+		.dev_size = 0x10,			/* 2^16 = 64KB */
+		.interface_desc = 0x0,		/* x8 only device */
 		.max_buf_write_size = 0x0,
 		.num_erase_regions = 1,
 		.erase_region_info =
 		{
-			0x0010000f,
+			0x0010000f,				/* 16x  4KB */
 			0x00000000
 		}
 	},
@@ -49,8 +49,8 @@ non_cfi_t non_cfi_flashes[] = {
 		.mfr = CFI_MFR_SST,
 		.id = 0xd5,
 		.pri_id = 0x02,
-		.dev_size = 0x11,
-		.interface_desc = 0x0,
+		.dev_size = 0x11,			/* 2^17 = 128KB */
+		.interface_desc = 0x0,		/* x8 only device */
 		.max_buf_write_size = 0x0,
 		.num_erase_regions = 1,
 		.erase_region_info =
@@ -63,8 +63,8 @@ non_cfi_t non_cfi_flashes[] = {
 		.mfr = CFI_MFR_SST,
 		.id = 0xd6,
 		.pri_id = 0x02,
-		.dev_size = 0x12,
-		.interface_desc = 0x0,
+		.dev_size = 0x12,			/* 2^18 = 256KB */
+		.interface_desc = 0x0,		/* x8 only device */
 		.max_buf_write_size = 0x0,
 		.num_erase_regions = 1,
 		.erase_region_info =
@@ -77,8 +77,8 @@ non_cfi_t non_cfi_flashes[] = {
 		.mfr = CFI_MFR_SST,
 		.id = 0xd7,
 		.pri_id = 0x02,
-		.dev_size = 0x13,
-		.interface_desc = 0x0,
+		.dev_size = 0x13,			/* 2^19 = 512KB */
+		.interface_desc = 0x0,		/* x8 only device */
 		.max_buf_write_size = 0x0,
 		.num_erase_regions = 1,
 		.erase_region_info =
@@ -87,6 +87,105 @@ non_cfi_t non_cfi_flashes[] = {
 			0x00000000
 		}
 	},
+	{
+		.mfr = CFI_MFR_SST,
+		.id = 0x2780,
+		.pri_id = 0x02,
+		.dev_size = 0x13,			/* 2^19 = 512KB */
+		.interface_desc = 0x2,		/* x8 or x16 device */
+		.max_buf_write_size = 0x0,
+		.num_erase_regions = 1,
+		.erase_region_info =
+		{
+			0x0010007f,
+			0x00000000
+		}
+	},
+	{
+		.mfr = CFI_MFR_ST,
+		.id = 0xd6,					/* ST29F400BB */
+		.pri_id = 0x02,
+		.dev_size = 0x13,			/* 2^19 = 512KB */
+		.interface_desc = 0x2,		/* x8 or x16 device with nBYTE */
+		.max_buf_write_size = 0x0,
+		.num_erase_regions = 4,
+		.erase_region_info =
+		{
+			0x00400000,		/* 1x 16KB */
+			0x00200001,		/* 2x  8KB */
+			0x00800000,		/* 1x 32KB */
+			0x01000006,		/* 7x 64KB */
+			0x00000000
+		}
+	},
+	{
+		.mfr = CFI_MFR_ST,
+		.id = 0xd5,					/* ST29F400BT */
+		.pri_id = 0x02,
+		.dev_size = 0x13,			/* 2^19 = 512KB */
+		.interface_desc = 0x2,		/* x8 or x16 device with nBYTE */
+		.max_buf_write_size = 0x0,
+		.num_erase_regions = 4,
+		.erase_region_info =
+		{
+			0x01000006,		/* 7x 64KB */
+			0x00800000,		/* 1x 32KB */
+			0x00200001,		/* 2x  8KB */
+			0x00400000,		/* 1x 16KB */
+			0x00000000
+		}
+	},
+	{
+		.mfr = CFI_MFR_AMD,
+		.id = 0x22ab,				/* AM29F400BB */
+		.pri_id = 0x02,
+		.dev_size = 0x13,			/* 2^19 = 512KB */
+		.interface_desc = 0x2,		/* x8 or x16 device with nBYTE */
+		.max_buf_write_size = 0x0,
+		.num_erase_regions = 4,
+		.erase_region_info =
+		{
+			0x00400000,		/* 1x 16KB */
+			0x00200001,		/* 2x  8KB */
+			0x00800000,		/* 1x 32KB */
+			0x01000006,		/* 7x 64KB */
+			0x00000000
+		}
+	},
+	{
+		.mfr = CFI_MFR_AMD,
+		.id = 0x2223,				/* AM29F400BT */
+		.pri_id = 0x02,
+		.dev_size = 0x13,			/* 2^19 = 512KB */
+		.interface_desc = 0x2,		/* x8 or x16 device with nBYTE */
+		.max_buf_write_size = 0x0,
+		.num_erase_regions = 4,
+		.erase_region_info =
+		{
+			0x01000006,		/* 7x 64KB */
+			0x00800000,		/* 1x 32KB */
+			0x00200001,		/* 2x  8KB */
+			0x00400000,		/* 1x 16KB */
+			0x00000000
+		}
+	},
+	{
+		.mfr = CFI_MFR_FUJITSU,
+		.id = 0x226b,				/* AM29SL800DB */
+		.pri_id = 0x02,
+		.dev_size = 0x14,			/* 2^20 = 1MB */
+		.interface_desc = 0x2,		/* x8 or x16 device with nBYTE */
+		.max_buf_write_size = 0x0,
+		.num_erase_regions = 4,
+		.erase_region_info =
+		{
+                        0x00400000,             /* 1x 16KB */
+                        0x00200001,             /* 2x 8KB */
+                        0x00800000,             /* 1x 32KB */
+                        0x0100000e,             /* 15x 64KB */
+			0x00000000
+		}
+	},
 	{
 		.mfr = 0,
 		.id = 0,
@@ -168,8 +267,9 @@ void cfi_fixup_non_cfi(flash_bank_t *bank, void *param)
 		cfi_info->pri_ext = pri_ext;
 	} else if ((cfi_info->pri_id == 0x1) || (cfi_info->pri_id == 0x3))
 	{
-		ERROR("BUG: non-CFI flashes using the Intel commandset are not yet supported");
+		LOG_ERROR("BUG: non-CFI flashes using the Intel commandset are not yet supported");
 		exit(-1);
 	}
 }
 
+