Signed-off-by: Hatim Kanchwala <ha...@hatimak.me>
---
 flashchips.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 flashchips.h |   8 +--
 2 files changed, 162 insertions(+), 4 deletions(-)

diff --git a/flashchips.c b/flashchips.c
index a76192c..a6da3b2 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -6210,30 +6210,69 @@ const struct flashchip flashchips[] = {
                                .block_erase = spi_block_erase_60,
                        }, {
                                .eraseblocks = { {256 * 1024, 1} },
                                .block_erase = spi_block_erase_c7,
                        }
                },
                .printlock      = spi_prettyprint_status_register_bp4_srwd,
                .unlock         = spi_disable_blockprotect_bp4_srwd, /* TODO: 
2nd status reg (read with 0x35) */
                .write          = spi_chip_write_256,
                .read           = spi_chip_read, /* Fast read (0x0B) and multi 
I/O supported */
                .voltage        = {2700, 3600},
        },
 
        {
                .vendor         = "GigaDevice",
+               .name           = "GD25Q21B",
+               .bustype        = BUS_SPI,
+               .manufacture_id = GIGADEVICE_ID,
+               .model_id       = GIGADEVICE_GD25Q20,
+               .total_size     = 256,
+               .page_size      = 256,
+               /* OTP: 1536B total; read 0x48, write 0x42, erase 0x44 */
+               .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI,
+               .tested         = TEST_OK_PREW,
+               .probe          = probe_spi_rdid,
+               .probe_timing   = TIMING_ZERO,
+               .block_erasers  =
+               {
+                       {
+                               .eraseblocks = { {4 * 1024, 64} },
+                               .block_erase = spi_block_erase_20,
+                       }, {
+                               .eraseblocks = { {32 * 1024, 8} },
+                               .block_erase = spi_block_erase_52,
+                       }, {
+                               .eraseblocks = { {64 * 1024, 4} },
+                               .block_erase = spi_block_erase_d8,
+                       }, {
+                               .eraseblocks = { {256 * 1024, 1} },
+                               .block_erase = spi_block_erase_60,
+                       }, {
+                               .eraseblocks = { {256 * 1024, 1} },
+                               .block_erase = spi_block_erase_c7,
+                       }
+               },
+               .printlock      = spi_prettyprint_status_register_bp4_srwd,
+               .unlock         = spi_disable_blockprotect_bp4_srwd, /* TODO: 
2nd status reg (read 0x35) */
+               .write          = spi_chip_write_256,
+               .read           = spi_chip_read, /* Fast read (0x0B) and multi 
I/O supported */
+               .voltage        = {2700, 3600},
+       },
+
+       {
+               .vendor         = "GigaDevice",
                .name           = "GD25Q40(B)",
                .bustype        = BUS_SPI,
                .manufacture_id = GIGADEVICE_ID,
                .model_id       = GIGADEVICE_GD25Q40,
                .total_size     = 512,
                .page_size      = 256,
                .feature_bits   = FEATURE_WRSR_WREN,
                .tested         = TEST_UNTESTED,
                .probe          = probe_spi_rdid,
                .probe_timing   = TIMING_ZERO,
                .block_erasers  =
                {
                        {
                                .eraseblocks = { {4 * 1024, 128} },
                                .block_erase = spi_block_erase_20,
@@ -6248,30 +6287,69 @@ const struct flashchip flashchips[] = {
                                .block_erase = spi_block_erase_60,
                        }, {
                                .eraseblocks = { {512 * 1024, 1} },
                                .block_erase = spi_block_erase_c7,
                        }
                },
                .printlock      = spi_prettyprint_status_register_bp4_srwd,
                .unlock         = spi_disable_blockprotect_bp4_srwd, /* TODO: 
2nd status reg (read with 0x35) */
                .write          = spi_chip_write_256,
                .read           = spi_chip_read, /* Fast read (0x0B) and multi 
I/O supported */
                .voltage        = {2700, 3600},
        },
 
        {
                .vendor         = "GigaDevice",
+               .name           = "GD25Q41B",
+               .bustype        = BUS_SPI,
+               .manufacture_id = GIGADEVICE_ID,
+               .model_id       = GIGADEVICE_GD25Q40,
+               .total_size     = 512,
+               .page_size      = 256,
+               /* OTP: 1536B total; read 0x48, write 0x42, erase 0x44 */
+               .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI,
+               .tested         = TEST_OK_PREW,
+               .probe          = probe_spi_rdid,
+               .probe_timing   = TIMING_ZERO,
+               .block_erasers  =
+               {
+                       {
+                               .eraseblocks = { {4 * 1024, 128} },
+                               .block_erase = spi_block_erase_20,
+                       }, {
+                               .eraseblocks = { {32 * 1024, 16} },
+                               .block_erase = spi_block_erase_52,
+                       }, {
+                               .eraseblocks = { {64 * 1024, 8} },
+                               .block_erase = spi_block_erase_d8,
+                       }, {
+                               .eraseblocks = { {512 * 1024, 1} },
+                               .block_erase = spi_block_erase_60,
+                       }, {
+                               .eraseblocks = { {512 * 1024, 1} },
+                               .block_erase = spi_block_erase_c7,
+                       }
+               },
+               .printlock      = spi_prettyprint_status_register_bp4_srwd,
+               .unlock         = spi_disable_blockprotect_bp4_srwd, /* TODO: 
2nd status reg (read 0x35) */
+               .write          = spi_chip_write_256,
+               .read           = spi_chip_read, /* Fast read (0x0B) and multi 
I/O supported */
+               .voltage        = {2700, 3600},
+       },
+
+       {
+               .vendor         = "GigaDevice",
                .name           = "GD25Q80(B)",
                .bustype        = BUS_SPI,
                .manufacture_id = GIGADEVICE_ID,
                .model_id       = GIGADEVICE_GD25Q80,
                .total_size     = 1024,
                .page_size      = 256,
                /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, 
erase 0x44 (B version only) */
                .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP,
                .tested         = TEST_OK_PREW,
                .probe          = probe_spi_rdid,
                .probe_timing   = TIMING_ZERO,
                .block_erasers  =
                {
                        {
                                .eraseblocks = { {4 * 1024, 256} },
@@ -6287,30 +6365,70 @@ const struct flashchip flashchips[] = {
                                .block_erase = spi_block_erase_60,
                        }, {
                                .eraseblocks = { {1024 * 1024, 1} },
                                .block_erase = spi_block_erase_c7,
                        }
                },
                .printlock      = spi_prettyprint_status_register_bp4_srwd,
                .unlock         = spi_disable_blockprotect_bp4_srwd, /* TODO: 
2nd status reg (read with 0x35) */
                .write          = spi_chip_write_256,
                .read           = spi_chip_read, /* Fast read (0x0B) and multi 
I/O supported */
                .voltage        = {2700, 3600},
        },
 
        {
                .vendor         = "GigaDevice",
+               .name           = "GD25Q80C",
+               .bustype        = BUS_SPI,
+               .manufacture_id = GIGADEVICE_ID,
+               .model_id       = GIGADEVICE_GD25Q80,
+               .total_size     = 1024,
+               .page_size      = 256,
+               /* supports SFDP (C revision only) */
+               /* OTP: 1024B total; read 0x48, write 0x42, erase 0x44 */
+               .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI,
+               .tested         = TEST_UNTESTED,
+               .probe          = probe_spi_rdid,
+               .probe_timing   = TIMING_ZERO,
+               .block_erasers  =
+               {
+                       {
+                               .eraseblocks = { {4 * 1024, 256} },
+                               .block_erase = spi_block_erase_20,
+                       }, {
+                               .eraseblocks = { {32 * 1024, 32} },
+                               .block_erase = spi_block_erase_52,
+                       }, {
+                               .eraseblocks = { {64 * 1024, 16} },
+                               .block_erase = spi_block_erase_d8,
+                       }, {
+                               .eraseblocks = { {1024 * 1024, 1} },
+                               .block_erase = spi_block_erase_60,
+                       }, {
+                               .eraseblocks = { {1024 * 1024, 1} },
+                               .block_erase = spi_block_erase_c7,
+                       }
+               },
+               .printlock      = spi_prettyprint_status_register_bp4_srwd,
+               .unlock         = spi_disable_blockprotect_bp4_srwd, /* TODO: 
2nd status reg (read 0x35) */
+               .write          = spi_chip_write_256,
+               .read           = spi_chip_read, /* Fast read (0x0B) and multi 
I/O supported */
+               .voltage        = {2700, 3600},
+       },
+
+       {
+               .vendor         = "GigaDevice",
                .name           = "GD25Q16(B)",
                .bustype        = BUS_SPI,
                .manufacture_id = GIGADEVICE_ID,
                .model_id       = GIGADEVICE_GD25Q16,
                .total_size     = 2048,
                .page_size      = 256,
                /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, 
erase 0x44 (B version only) */
                .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP,
                .tested         = TEST_OK_PREW,
                .probe          = probe_spi_rdid,
                .probe_timing   = TIMING_ZERO,
                .block_erasers  =
                {
                        {
                                .eraseblocks = { {4 * 1024, 512} },
@@ -6326,30 +6444,70 @@ const struct flashchip flashchips[] = {
                                .block_erase = spi_block_erase_60,
                        }, {
                                .eraseblocks = { {2 * 1024 * 1024, 1} },
                                .block_erase = spi_block_erase_c7,
                        }
                },
                .printlock      = spi_prettyprint_status_register_bp4_srwd,
                .unlock         = spi_disable_blockprotect_bp4_srwd, /* TODO: 
2nd status reg (read with 0x35) */
                .write          = spi_chip_write_256,
                .read           = spi_chip_read, /* Fast read (0x0B) and multi 
I/O supported */
                .voltage        = {2700, 3600},
        },
 
        {
                .vendor         = "GigaDevice",
+               .name           = "GD25Q16C",
+               .bustype        = BUS_SPI,
+               .manufacture_id = GIGADEVICE_ID,
+               .model_id       = GIGADEVICE_GD25Q16,
+               .total_size     = 2 * 1024,
+               .page_size      = 256,
+               /* supports SFDP (C revision only) */
+               /* OTP: 1024B total; read 0x48, write 0x42, erase 0x44 */
+               .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI,
+               .tested         = TEST_UNTESTED,
+               .probe          = probe_spi_rdid,
+               .probe_timing   = TIMING_ZERO,
+               .block_erasers  =
+               {
+                       {
+                               .eraseblocks = { {4 * 1024, 512} },
+                               .block_erase = spi_block_erase_20,
+                       }, {
+                               .eraseblocks = { {32 * 1024, 64} },
+                               .block_erase = spi_block_erase_52,
+                       }, {
+                               .eraseblocks = { {64 * 1024, 32} },
+                               .block_erase = spi_block_erase_d8,
+                       }, {
+                               .eraseblocks = { {2 * 1024 * 1024, 1} },
+                               .block_erase = spi_block_erase_60,
+                       }, {
+                               .eraseblocks = { {2 * 1024 * 1024, 1} },
+                               .block_erase = spi_block_erase_c7,
+                       }
+               },
+               .printlock      = spi_prettyprint_status_register_bp4_srwd,
+               .unlock         = spi_disable_blockprotect_bp4_srwd, /* TODO: 
2nd status reg (read 0x35) */
+               .write          = spi_chip_write_256,
+               .read           = spi_chip_read, /* Fast read (0x0B) and multi 
I/O supported */
+               .voltage        = {2700, 3600},
+       },
+
+       {
+               .vendor         = "GigaDevice",
                .name           = "GD25Q32(B)",
                .bustype        = BUS_SPI,
                .manufacture_id = GIGADEVICE_ID,
                .model_id       = GIGADEVICE_GD25Q32,
                .total_size     = 4096,
                .page_size      = 256,
                /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, 
erase 0x44 */
                .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP,
                .tested         = TEST_OK_PREW,
                .probe          = probe_spi_rdid,
                .probe_timing   = TIMING_ZERO,
                .block_erasers  =
                {
                        {
                                .eraseblocks = { {4 * 1024, 1024} },
diff --git a/flashchips.h b/flashchips.h
index a2d25ec..d420a54 100644
--- a/flashchips.h
+++ b/flashchips.h
@@ -353,34 +353,34 @@
 #define FUJITSU_MBM29LV008TA   0x3E
 #define FUJITSU_MBM29LV080A    0x38
 #define FUJITSU_MBM29LV200BC   0xBF
 #define FUJITSU_MBM29LV200TC   0x3B
 #define FUJITSU_MBM29LV400BC   0xBA
 #define FUJITSU_MBM29LV400TC   0xB9
 #define FUJITSU_MBM29LV800BA   0x5B    /* Same as MBM29LV800BE */
 #define FUJITSU_MBM29LV800TA   0xDA    /* Same as MBM29LV800TE */
 #define FUJITSU_MBM29LV160BE   0x49    /* 16 b mode 0x2249 */
 #define FUJITSU_MBM29LV160TE   0xC4    /* 16 b mode 0x22C4 */
 
 #define GIGADEVICE_ID          0xC8    /* GigaDevice */
 #define GIGADEVICE_GD25T80     0x3114
 #define GIGADEVICE_GD25Q512    0x4010  /* Same as GD25D05B */
 #define GIGADEVICE_GD25Q10     0x4011  /* Same as GD25D10B */
-#define GIGADEVICE_GD25Q20     0x4012  /* Same as GD25QB */
-#define GIGADEVICE_GD25Q40     0x4013  /* Same as GD25QB */
-#define GIGADEVICE_GD25Q80     0x4014  /* Same as GD25Q80B (which has OTP) */
-#define GIGADEVICE_GD25Q16     0x4015  /* Same as GD25Q16B (which has OTP) */
+#define GIGADEVICE_GD25Q20     0x4012  /* Same as GD25Q21B */
+#define GIGADEVICE_GD25Q40     0x4013  /* Same as GD25Q41B */
+#define GIGADEVICE_GD25Q80     0x4014  /* Same as GD25Q80B and GD25Q80C, 
latter distinguished by SFDP */
+#define GIGADEVICE_GD25Q16     0x4015  /* Same as GD25Q16B and GD25Q16C, 
latter distinguished by SFDP */
 #define GIGADEVICE_GD25Q32     0x4016  /* Same as GD25Q32B */
 #define GIGADEVICE_GD25Q64     0x4017  /* Same as GD25Q64B */
 #define GIGADEVICE_GD25Q128    0x4018  /* GD25Q128B and GD25Q128C only, can be 
distinguished by SFDP */
 #define GIGADEVICE_GD25VQ21B   0x4212
 #define GIGADEVICE_GD25VQ41B   0x4213  /* Same as GD25VQ40C, can be 
distinguished by SFDP */
 #define GIGADEVICE_GD25VQ80C   0x4214
 #define GIGADEVICE_GD25VQ16C   0x4215
 #define GIGADEVICE_GD25LQ10    0x6011  /* Same as GD25LQ10B, can be 
distinguished by SFDP */
 #define GIGADEVICE_GD25LQ20    0x6012  /* Same as GD25LQ20B, can be 
distinguished by SFDP */
 #define GIGADEVICE_GD25LQ40    0x6013  /* Same as GD25LQ40B, can be 
distinguished by SFDP */
 #define GIGADEVICE_GD25LQ80    0x6014  /* Same as GD25LQ80B, can be 
distinguished by SFDP */
 #define GIGADEVICE_GD25LQ16    0x6015
 #define GIGADEVICE_GD25LQ32    0x6016
 #define GIGADEVICE_GD25LQ64    0x6017  /* Same as GD25LQ64B (which is faster) 
*/
 #define GIGADEVICE_GD25LQ128   0x6018
-- 
Regards,
Hatim Kanchwala
http://hatimak.me
B. Tech. Electrical Engineering
Indian Institute of Technology Patna

_______________________________________________
flashrom mailing list
flashrom@flashrom.org
https://www.flashrom.org/mailman/listinfo/flashrom

Reply via email to