Skip to content

GitLab

Commit 56358aae authored by Sean Nelson's avatar Sean Nelson
Browse files

Block eraser conversions and support for Eon EN25B series 


Convert chips to block_erasers:

SyncMOS S29C31004T
SyncMOS S29C51001T
SyncMOS S29C51002T
SyncMOS S29C51004T
TI TMS29F002RT
TI TMS29F002RB

SyncMOS chips have Uniform sector; boot blocks on chips are made up of uniform sectors but have locking.

Corresponding to flashrom svn r871.
Signed-off-by: default avatarSean Nelson <audiohacked@gmail.com>
Acked-by: default avatarCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
parent d38fac8c
Hide whitespace changes
Inline Side-by-side
Showing with 452 additions and 49 deletions
chipdrivers.h
View file @ 56358aae
...@@ -167,6 +167,9 @@ int write_49f002(struct flashchip *flash, uint8_t *buf); ...@@ -167,6 +167,9 @@ int write_49f002(struct flashchip *flash, uint8_t *buf);
/* stm50flw0x0x.c */ /* stm50flw0x0x.c */
int probe_stm50flw0x0x(struct flashchip *flash); int probe_stm50flw0x0x(struct flashchip *flash);
int erase_stm50flw0x0x(struct flashchip *flash); int erase_stm50flw0x0x(struct flashchip *flash);
int erase_block_stm50flw0x0x(struct flashchip *flash, unsigned int block, unsigned int blocksize);
int erase_sector_stm50flw0x0x(struct flashchip *flash, unsigned int block, unsigned int blocksize);
int erase_chip_stm50flw0x0x(struct flashchip *flash, unsigned int addr, unsigned int blocklen);
int write_stm50flw0x0x(struct flashchip *flash, uint8_t *buf); int write_stm50flw0x0x(struct flashchip *flash, uint8_t *buf);
#endif /* !__CHIPDRIVERS_H__ */ #endif /* !__CHIPDRIVERS_H__ */
flashchips.c
View file @ 56358aae
...@@ -4191,7 +4191,17 @@ struct flashchip flashchips[] = { ...@@ -4191,7 +4191,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_spi_rdid, .probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO, .probe_timing = TIMING_ZERO,
.erase = spi_chip_erase_c7, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {32 * 1024, 2} },
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {64 * 1024, 1} },
.block_erase = spi_block_erase_c7,
}
},
.write = spi_chip_write_256, .write = spi_chip_write_256,
.read = spi_chip_read, .read = spi_chip_read,
}, },
...@@ -4212,7 +4222,17 @@ struct flashchip flashchips[] = { ...@@ -4212,7 +4222,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_spi_res, .probe = probe_spi_res,
.probe_timing = TIMING_ZERO, .probe_timing = TIMING_ZERO,
.erase = spi_chip_erase_c7, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {32 * 1024, 2} },
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {64 * 1024, 1} },
.block_erase = spi_block_erase_c7,
}
},
.write = spi_chip_write_1, /* 128 */ .write = spi_chip_write_1, /* 128 */
.read = spi_chip_read, .read = spi_chip_read,
}, },
...@@ -4228,7 +4248,17 @@ struct flashchip flashchips[] = { ...@@ -4228,7 +4248,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_spi_rdid, .probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO, .probe_timing = TIMING_ZERO,
.erase = spi_chip_erase_c7, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {32 * 1024, 4} },
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {128 * 1024, 1} },
.block_erase = spi_block_erase_c7,
}
},
.write = spi_chip_write_256, .write = spi_chip_write_256,
.read = spi_chip_read, .read = spi_chip_read,
}, },
...@@ -4245,7 +4275,17 @@ struct flashchip flashchips[] = { ...@@ -4245,7 +4275,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_spi_res, .probe = probe_spi_res,
.probe_timing = TIMING_ZERO, .probe_timing = TIMING_ZERO,
.erase = spi_chip_erase_c7, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {32 * 1024, 4} },
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {128 * 1024, 1} },
.block_erase = spi_block_erase_c7,
}
},
.write = spi_chip_write_1, /* 128 */ .write = spi_chip_write_1, /* 128 */
.read = spi_chip_read, .read = spi_chip_read,
}, },
...@@ -4261,7 +4301,17 @@ struct flashchip flashchips[] = { ...@@ -4261,7 +4301,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_spi_rdid, .probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO, .probe_timing = TIMING_ZERO,
.erase = spi_chip_erase_c7, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {64 * 1024, 4} },
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {256 * 1024, 1} },
.block_erase = spi_block_erase_c7,
}
},
.write = spi_chip_write_256, .write = spi_chip_write_256,
.read = spi_chip_read, .read = spi_chip_read,
}, },
...@@ -4274,10 +4324,20 @@ struct flashchip flashchips[] = { ...@@ -4274,10 +4324,20 @@ struct flashchip flashchips[] = {
.model_id = ST_M25P40, .model_id = ST_M25P40,
.total_size = 512, .total_size = 512,
.page_size = 256, .page_size = 256,
.tested = TEST_OK_PREW, .tested = TEST_OK_PRW,
.probe = probe_spi_rdid, .probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO, .probe_timing = TIMING_ZERO,
.erase = spi_chip_erase_c7, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {64 * 1024, 8} },
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {512 * 1024, 1} },
.block_erase = spi_block_erase_c7,
}
},
.write = spi_chip_write_256, .write = spi_chip_write_256,
.read = spi_chip_read, .read = spi_chip_read,
}, },
...@@ -4293,7 +4353,17 @@ struct flashchip flashchips[] = { ...@@ -4293,7 +4353,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_spi_res, .probe = probe_spi_res,
.probe_timing = TIMING_ZERO, .probe_timing = TIMING_ZERO,
.erase = spi_chip_erase_c7, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {64 * 1024, 8} },
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {512 * 1024, 1} },
.block_erase = spi_block_erase_c7,
}
},
.write = spi_chip_write_256, .write = spi_chip_write_256,
.read = spi_chip_read, .read = spi_chip_read,
}, },
...@@ -4306,10 +4376,20 @@ struct flashchip flashchips[] = { ...@@ -4306,10 +4376,20 @@ struct flashchip flashchips[] = {
.model_id = ST_M25P80, .model_id = ST_M25P80,
.total_size = 1024, .total_size = 1024,
.page_size = 256, .page_size = 256,
.tested = TEST_OK_PREW, .tested = TEST_OK_PRW,
.probe = probe_spi_rdid, .probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO, .probe_timing = TIMING_ZERO,
.erase = spi_chip_erase_c7, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {64 * 1024, 16} },
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {1024 * 1024, 1} },
.block_erase = spi_block_erase_c7,
}
},
.write = spi_chip_write_256, .write = spi_chip_write_256,
.read = spi_chip_read, .read = spi_chip_read,
}, },
...@@ -4322,10 +4402,20 @@ struct flashchip flashchips[] = { ...@@ -4322,10 +4402,20 @@ struct flashchip flashchips[] = {
.model_id = ST_M25P16, .model_id = ST_M25P16,
.total_size = 2048, .total_size = 2048,
.page_size = 256, .page_size = 256,
.tested = TEST_OK_PREW, .tested = TEST_OK_PRW,
.probe = probe_spi_rdid, .probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO, .probe_timing = TIMING_ZERO,
.erase = spi_chip_erase_c7, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {64 * 1024, 32} },
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {2 * 1024 * 1024, 1} },
.block_erase = spi_block_erase_c7,
}
},
.write = spi_chip_write_256, .write = spi_chip_write_256,
.read = spi_chip_read, .read = spi_chip_read,
}, },
...@@ -4338,10 +4428,20 @@ struct flashchip flashchips[] = { ...@@ -4338,10 +4428,20 @@ struct flashchip flashchips[] = {
.model_id = ST_M25P32, .model_id = ST_M25P32,
.total_size = 4096, .total_size = 4096,
.page_size = 256, .page_size = 256,
.tested = TEST_OK_PREW, .tested = TEST_OK_PRW,
.probe = probe_spi_rdid, .probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO, .probe_timing = TIMING_ZERO,
.erase = spi_chip_erase_c7, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {64 * 1024, 64} },
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {4 * 1024 * 1024, 1} },
.block_erase = spi_block_erase_c7,
}
},
.write = spi_chip_write_256, .write = spi_chip_write_256,
.read = spi_chip_read, .read = spi_chip_read,
}, },
...@@ -4357,7 +4457,17 @@ struct flashchip flashchips[] = { ...@@ -4357,7 +4457,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_spi_rdid, .probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO, .probe_timing = TIMING_ZERO,
.erase = spi_chip_erase_c7, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {64 * 1024, 128} },
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {8 * 1024 * 1024, 1} },
.block_erase = spi_block_erase_c7,
}
},
.write = spi_chip_write_256, .write = spi_chip_write_256,
.read = spi_chip_read, .read = spi_chip_read,
}, },
...@@ -4373,7 +4483,17 @@ struct flashchip flashchips[] = { ...@@ -4373,7 +4483,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_spi_rdid, .probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO, .probe_timing = TIMING_ZERO,
.erase = spi_chip_erase_c7, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {256 * 1024, 64} },
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {16 * 1024 * 1024, 1} },
.block_erase = spi_block_erase_c7,
}
},
.write = spi_chip_write_256, .write = spi_chip_write_256,
.read = spi_chip_read, .read = spi_chip_read,
}, },
...@@ -4389,7 +4509,22 @@ struct flashchip flashchips[] = { ...@@ -4389,7 +4509,22 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */
.erase = erase_m29f002, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = {
{16 * 1024, 1},
{8 * 1024, 2},
{32 * 1024, 1},
{64 * 1024, 3},
},
.block_erase = erase_sector_jedec,
}, {
.eraseblocks = { {256 * 1024, 1} },
.block_erase = erase_chip_block_jedec,
}
},
.write = write_m29f002b, .write = write_m29f002b,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4402,10 +4537,25 @@ struct flashchip flashchips[] = { ...@@ -4402,10 +4537,25 @@ struct flashchip flashchips[] = {
.model_id = ST_M29F002T, .model_id = ST_M29F002T,
.total_size = 256, .total_size = 256,
.page_size = 64 * 1024, .page_size = 64 * 1024,
.tested = TEST_OK_PREW, .tested = TEST_OK_PRW,
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */
.erase = erase_m29f002, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = {
{64 * 1024, 3},
{32 * 1024, 1},
{8 * 1024, 2},
{16 * 1024, 1},
},
.block_erase = erase_sector_jedec,
}, {
.eraseblocks = { {256 * 1024, 1} },
.block_erase = erase_chip_block_jedec,
}
},
.write = write_m29f002t, .write = write_m29f002t,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4418,10 +4568,20 @@ struct flashchip flashchips[] = { ...@@ -4418,10 +4568,20 @@ struct flashchip flashchips[] = {
.model_id = ST_M29F040B, .model_id = ST_M29F040B,
.total_size = 512, .total_size = 512,
.page_size = 64 * 1024, .page_size = 64 * 1024,
.tested = TEST_OK_PREW, .tested = TEST_OK_PRW,
.probe = probe_29f040b, .probe = probe_29f040b,
.probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (am29f040b.c) */ .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (am29f040b.c) */
.erase = erase_29f040b, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {64 * 1024, 8}, },
.block_erase = erase_sector_29f040b,
}, {
.eraseblocks = { {512 * 1024, 1} },
.block_erase = erase_chip_29f040b,
}
},
.write = write_29f040b, .write = write_29f040b,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4437,7 +4597,22 @@ struct flashchip flashchips[] = { ...@@ -4437,7 +4597,22 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_m29f400bt, .probe = probe_m29f400bt,
.probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (m29f400bt.c) */ .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (m29f400bt.c) */
.erase = erase_m29f400bt, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = {
{64 * 1024, 7},
{32 * 1024, 1},
{8 * 1024, 2},
{16 * 1024, 1},
},
.block_erase = block_erase_m29f400bt,
}, {
.eraseblocks = { {512 * 1024, 1} },
.block_erase = block_erase_chip_m29f400bt,
}
},
.write = write_coreboot_m29f400bt, .write = write_coreboot_m29f400bt,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4453,7 +4628,17 @@ struct flashchip flashchips[] = { ...@@ -4453,7 +4628,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */
.erase = erase_chip_jedec, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {16 * 1024, 8}, },
.block_erase = erase_sector_jedec,
}, {
.eraseblocks = { {128 * 1024, 1} },
.block_erase = erase_chip_block_jedec,
}
},
.write = write_jedec, .write = write_jedec,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4469,7 +4654,17 @@ struct flashchip flashchips[] = { ...@@ -4469,7 +4654,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */
.erase = erase_chip_jedec, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {64 * 1024, 8}, },
.block_erase = erase_sector_jedec,
}, {
.eraseblocks = { {512 * 1024, 1} },
.block_erase = erase_chip_block_jedec,
}
},
.write = write_jedec, .write = write_jedec,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4486,7 +4681,17 @@ struct flashchip flashchips[] = { ...@@ -4486,7 +4681,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_FIXME, .probe_timing = TIMING_FIXME,
.erase = erase_stm50flw0x0x, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {64 * 1024, 8}, },
.block_erase = erase_block_stm50flw0x0x,
}, {
.eraseblocks = { {512 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.write = write_stm50flw0x0x, .write = write_stm50flw0x0x,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4503,7 +4708,17 @@ struct flashchip flashchips[] = { ...@@ -4503,7 +4708,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_FIXME, .probe_timing = TIMING_FIXME,
.erase = erase_stm50flw0x0x, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {64 * 1024, 8}, },
.block_erase = erase_block_stm50flw0x0x,
}, {
.eraseblocks = { {512 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.write = write_stm50flw0x0x, .write = write_stm50flw0x0x,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4517,10 +4732,20 @@ struct flashchip flashchips[] = { ...@@ -4517,10 +4732,20 @@ struct flashchip flashchips[] = {
.total_size = 1024, .total_size = 1024,
.page_size = 64 * 1024, .page_size = 64 * 1024,
.feature_bits = FEATURE_REGISTERMAP, .feature_bits = FEATURE_REGISTERMAP,
.tested = TEST_OK_PREW, .tested = TEST_OK_PRW,
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_FIXME, .probe_timing = TIMING_FIXME,
.erase = erase_stm50flw0x0x, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {64 * 1024, 16}, },
.block_erase = erase_block_stm50flw0x0x,
}, {
.eraseblocks = { {1024 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.write = write_stm50flw0x0x, .write = write_stm50flw0x0x,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4537,7 +4762,17 @@ struct flashchip flashchips[] = { ...@@ -4537,7 +4762,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_FIXME, .probe_timing = TIMING_FIXME,
.erase = erase_stm50flw0x0x, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {64 * 1024, 16}, },
.block_erase = erase_block_stm50flw0x0x,
}, {
.eraseblocks = { {1024 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.write = write_stm50flw0x0x, .write = write_stm50flw0x0x,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4554,6 +4789,21 @@ struct flashchip flashchips[] = { ...@@ -4554,6 +4789,21 @@ struct flashchip flashchips[] = {
.probe = probe_49lfxxxc, .probe = probe_49lfxxxc,
.probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sst49lfxxxc.c) */ .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sst49lfxxxc.c) */
.erase = NULL, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = {
{64 * 1024, 3},
{32 * 1024, 1},
{8 * 1024, 2},
{16 * 1024, 1},
},
.block_erase = erase_block_stm50flw0x0x,
}, {
.eraseblocks = { {256 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.write = NULL, .write = NULL,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4569,8 +4819,18 @@ struct flashchip flashchips[] = { ...@@ -4569,8 +4819,18 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_82802ab, .probe = probe_82802ab,
.probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (82802ab.c) */ .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (82802ab.c) */
.erase = erase_82802ab, .erase = NULL,
.write = write_82802ab, .block_erasers =
{
{
.eraseblocks = { {64 * 1024, 32}, },
.block_erase = erase_block_stm50flw0x0x,
}, {
.eraseblocks = { {2 * 1024 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.write = write_stm50flw0x0x,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4582,11 +4842,21 @@ struct flashchip flashchips[] = { ...@@ -4582,11 +4842,21 @@ struct flashchip flashchips[] = {
.model_id = ST_M50FW040, .model_id = ST_M50FW040,
.total_size = 512, .total_size = 512,
.page_size = 64 * 1024, .page_size = 64 * 1024,
.tested = TEST_OK_PREW, .tested = TEST_OK_PRW,
.probe = probe_82802ab, .probe = probe_82802ab,
.probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (82802ab.c) */ .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (82802ab.c) */
.erase = erase_82802ab, .erase = NULL,
.write = write_82802ab, .block_erasers =
{
{
.eraseblocks = { {64 * 1024, 8}, },
.block_erase = erase_block_stm50flw0x0x,
}, {
.eraseblocks = { {512 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.write = write_stm50flw0x0x,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4598,11 +4868,21 @@ struct flashchip flashchips[] = { ...@@ -4598,11 +4868,21 @@ struct flashchip flashchips[] = {
.model_id = ST_M50FW080, .model_id = ST_M50FW080,
.total_size = 1024, .total_size = 1024,
.page_size = 64 * 1024, .page_size = 64 * 1024,
.tested = TEST_OK_PREW, .tested = TEST_OK_PRW,
.probe = probe_82802ab, .probe = probe_82802ab,
.probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (82802ab.c) */ .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (82802ab.c) */
.erase = erase_82802ab, .erase = NULL,
.write = write_82802ab, .block_erasers =
{
{
.eraseblocks = { {64 * 1024, 16}, },
.block_erase = erase_block_stm50flw0x0x,
}, {
.eraseblocks = { {1024 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.write = write_stm50flw0x0x,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4617,7 +4897,23 @@ struct flashchip flashchips[] = { ...@@ -4617,7 +4897,23 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */
.erase = erase_chip_jedec, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = {
{4 * 1024, 16},
{64 * 1024, 30},
{32 * 1024, 1},
{8 * 1024, 2},
{16 * 1024, 1},
},
.block_erase = erase_block_stm50flw0x0x,
}, {
.eraseblocks = { {2 * 1024 * 1024, 1} },
.block_erase = erase_chip_block_jedec,
}
},
.write = write_jedec, .write = write_jedec,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4633,7 +4929,17 @@ struct flashchip flashchips[] = { ...@@ -4633,7 +4929,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */
.erase = erase_chip_jedec, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {1 * 1024, 512} },
.block_erase = erase_sector_jedec,
}, {
.eraseblocks = { {512 * 1024, 1} },
.block_erase = erase_chip_block_jedec,
},
},
.write = write_49f002, .write = write_49f002,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4649,7 +4955,17 @@ struct flashchip flashchips[] = { ...@@ -4649,7 +4955,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */
.erase = erase_chip_jedec, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {512, 256} },
.block_erase = erase_sector_jedec,
}, {
.eraseblocks = { {128 * 1024, 1} },
.block_erase = erase_chip_block_jedec,
},
},
.write = write_49f002, .write = write_49f002,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4662,10 +4978,20 @@ struct flashchip flashchips[] = { ...@@ -4662,10 +4978,20 @@ struct flashchip flashchips[] = {
.model_id = S29C51002T, .model_id = S29C51002T,
.total_size = 256, .total_size = 256,
.page_size = 128, .page_size = 128,
.tested = TEST_OK_PREW, .tested = TEST_OK_PRW,
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */
.erase = erase_chip_jedec, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {512, 512} },
.block_erase = erase_sector_jedec,
}, {
.eraseblocks = { {256 * 1024, 1} },
.block_erase = erase_chip_block_jedec,
},
},
.write = write_49f002, .write = write_49f002,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4681,7 +5007,17 @@ struct flashchip flashchips[] = { ...@@ -4681,7 +5007,17 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED, .tested = TEST_UNTESTED,
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_ZERO, .probe_timing = TIMING_ZERO,
.erase = erase_chip_jedec, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = { {1 * 1024, 496} },
.block_erase = erase_sector_jedec,
}, {
.eraseblocks = { {512 * 1024, 1} },
.block_erase = erase_chip_block_jedec,
},
},
.write = write_49f002, .write = write_49f002,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4698,6 +5034,21 @@ struct flashchip flashchips[] = { ...@@ -4698,6 +5034,21 @@ struct flashchip flashchips[] = {
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */
.erase = NULL, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = {
{16 * 1024, 1},
{8 * 1024, 2},
{32 * 1024, 1},
{64 * 1024, 3},
},
.block_erase = erase_sector_jedec,
}, {
.eraseblocks = { {256 * 1024, 1} },
.block_erase = erase_chip_block_jedec,
},
},
.write = NULL, .write = NULL,
.read = read_memmapped, .read = read_memmapped,
}, },
...@@ -4714,6 +5065,21 @@ struct flashchip flashchips[] = { ...@@ -4714,6 +5065,21 @@ struct flashchip flashchips[] = {
.probe = probe_jedec, .probe = probe_jedec,
.probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */
.erase = NULL, .erase = NULL,
.block_erasers =
{
{
.eraseblocks = {
{64 * 1024, 3},
{32 * 1024, 1},
{8 * 1024, 2},
{16 * 1024, 1},
},
.block_erase = erase_sector_jedec,
}, {
.eraseblocks = { {256 * 1024, 1} },
.block_erase = erase_chip_block_jedec,
},
},
.write = NULL, .write = NULL,
.read = read_memmapped, .read = read_memmapped,
}, },
......
stm50flw0x0x.c
View file @ 56358aae
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* This file is part of the flashrom project. * This file is part of the flashrom project.
* *
* Copyright (C) 2008 Claus Gindhart <claus.gindhart@kontron.com> * Copyright (C) 2008 Claus Gindhart <claus.gindhart@kontron.com>
* Copyright (C) 2009 Sean Nelson <audiohacked@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -99,9 +100,9 @@ int unlock_block_stm50flw0x0x(struct flashchip *flash, int offset) ...@@ -99,9 +100,9 @@ int unlock_block_stm50flw0x0x(struct flashchip *flash, int offset)
return 0; return 0;
} }
int erase_block_stm50flw0x0x(struct flashchip *flash, int offset) int erase_block_stm50flw0x0x(struct flashchip *flash, unsigned int block, unsigned int blocksize)
{ {
chipaddr bios = flash->virtual_memory + offset; chipaddr bios = flash->virtual_memory + block;
// clear status register // clear status register
chip_writeb(0x50, bios); chip_writeb(0x50, bios);
...@@ -113,11 +114,34 @@ int erase_block_stm50flw0x0x(struct flashchip *flash, int offset) ...@@ -113,11 +114,34 @@ int erase_block_stm50flw0x0x(struct flashchip *flash, int offset)
wait_stm50flw0x0x(flash->virtual_memory); wait_stm50flw0x0x(flash->virtual_memory);
if (check_erased_range(flash, offset, flash->page_size)) { if (check_erased_range(flash, block, blocksize)) {
fprintf(stderr, "ERASE FAILED!\n"); fprintf(stderr, "ERASE FAILED!\n");
return -1; return -1;
} }
printf("DONE BLOCK 0x%x\n", offset); printf("DONE BLOCK 0x%x\n", block);
return 0;
}
int erase_sector_stm50flw0x0x(struct flashchip *flash, unsigned int sector, unsigned int sectorsize)
{
chipaddr bios = flash->virtual_memory + sector;
// clear status register
chip_writeb(0x50, bios);
printf_debug("Erase at 0x%lx\n", bios);
// now start it
chip_writeb(0x32, bios);
chip_writeb(0xd0, bios);
programmer_delay(10);
wait_stm50flw0x0x(flash->virtual_memory);
if (check_erased_range(flash, sector, sectorsize)) {
fprintf(stderr, "ERASE FAILED!\n");
return -1;
}
printf("DONE BLOCK 0x%x\n", sector);
return 0; return 0;
} }
...@@ -178,7 +202,7 @@ int erase_stm50flw0x0x(struct flashchip *flash) ...@@ -178,7 +202,7 @@ int erase_stm50flw0x0x(struct flashchip *flash)
fprintf(stderr, "UNLOCK FAILED!\n"); fprintf(stderr, "UNLOCK FAILED!\n");
return -1; return -1;
} }
if (erase_block_stm50flw0x0x(flash, i * page_size)) { if (erase_block_stm50flw0x0x(flash, i * page_size, page_size)) {
fprintf(stderr, "ERASE FAILED!\n"); fprintf(stderr, "ERASE FAILED!\n");
return -1; return -1;
} }
...@@ -188,6 +212,16 @@ int erase_stm50flw0x0x(struct flashchip *flash) ...@@ -188,6 +212,16 @@ int erase_stm50flw0x0x(struct flashchip *flash)
return 0; return 0;
} }
int erase_chip_stm50flw0x0x(struct flashchip *flash, unsigned int addr, unsigned int blocklen)
{
if ((addr != 0) || (blocklen != flash->total_size * 1024)) {
msg_cerr("%s called with incorrect arguments\n",
__func__);
return -1;
}
return erase_stm50flw0x0x(flash);
}
int write_stm50flw0x0x(struct flashchip *flash, uint8_t * buf) int write_stm50flw0x0x(struct flashchip *flash, uint8_t * buf)
{ {
int i, rc = 0; int i, rc = 0;
...@@ -221,7 +255,7 @@ int write_stm50flw0x0x(struct flashchip *flash, uint8_t * buf) ...@@ -221,7 +255,7 @@ int write_stm50flw0x0x(struct flashchip *flash, uint8_t * buf)
rc = unlock_block_stm50flw0x0x(flash, i * page_size); rc = unlock_block_stm50flw0x0x(flash, i * page_size);
if (!rc) if (!rc)
rc = erase_block_stm50flw0x0x(flash, i * page_size); rc = erase_block_stm50flw0x0x(flash, i * page_size, page_size);
if (!rc) if (!rc)
write_page_stm50flw0x0x(bios, buf + i * page_size, write_page_stm50flw0x0x(bios, buf + i * page_size,
bios + i * page_size, page_size); bios + i * page_size, page_size);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Powered by Integricloud