On 1/18/10 3:47 PM, Michael Karcher wrote:
Am Montag, den 18.01.2010, 15:31 -0800 schrieb Sean Nelson:
Signed-off-by: Sean Nelson <[email protected]>
Acked-by: Michael Karcher <[email protected]>

I'm going to do one last patch, some of the ST chips use 82802ab functions and I'm going to change them to stm50flw0x0x but keep probe_82802ab; They are functionally the same.

Convert ST to block erasers:
ST M25P05-A
ST M25P05.RES
ST M25P10-A
ST M25P10.RES
ST M25P20
ST M25P40
ST M25P40-old
ST M25P80
ST M25P16
ST M25P32
ST M25P64
ST M25P128
ST M29F002B
ST M29F002T/NT
ST M29F040B
ST M29F400BT
ST M29W010B
ST M29W040B
ST M50FLW040A
ST M50FLW040B
ST M50FLW080A
ST M50FLW080B
ST M50FW002
ST M50FW016
ST M50FW040
ST M50FW080
ST M50LPW116

Add erase_chip_stm50flw0x0x to stm50flw0x0x.c
Add copyright to stm50flw0x0x.c
Fix block sizes and counts
Omit M50FLW0x0x mixed sector/block eraser
Convert the used 82802ab functions to their stm50flw0x0x equivalents

Signed-off-by: Sean Nelson <[email protected]>


diff --git a/chipdrivers.h b/chipdrivers.h
index e7261e0..3e519a7 100644
--- a/chipdrivers.h
+++ b/chipdrivers.h
@@ -166,6 +166,9 @@ int write_49f002(struct flashchip *flash, uint8_t *buf);
 /* stm50flw0x0x.c */
 int probe_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);
 
 #endif /* !__CHIPDRIVERS_H__ */
diff --git a/flashchips.c b/flashchips.c
index 933682d..c3f63b6 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -3977,7 +3977,17 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_spi_rdid,
                .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,
                .read           = spi_chip_read,
        },
@@ -3998,7 +4008,17 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_spi_res,
                .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 */
                .read           = spi_chip_read,
        },
@@ -4014,7 +4034,17 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_spi_rdid,
                .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,
                .read           = spi_chip_read,
        },
@@ -4031,7 +4061,17 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_spi_res,
                .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 */
                .read           = spi_chip_read,
        },
@@ -4047,7 +4087,17 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_spi_rdid,
                .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,
                .read           = spi_chip_read,
        },
@@ -4060,10 +4110,20 @@ struct flashchip flashchips[] = {
                .model_id       = ST_M25P40,
                .total_size     = 512,
                .page_size      = 256,
-               .tested         = TEST_OK_PREW,
+               .tested         = TEST_OK_PRW,
                .probe          = probe_spi_rdid,
                .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,
                .read           = spi_chip_read,
        },
@@ -4079,7 +4139,17 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_spi_res,
                .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,
                .read           = spi_chip_read,
        },
@@ -4092,10 +4162,20 @@ struct flashchip flashchips[] = {
                .model_id       = ST_M25P80,
                .total_size     = 1024,
                .page_size      = 256,
-               .tested         = TEST_OK_PREW,
+               .tested         = TEST_OK_PRW,
                .probe          = probe_spi_rdid,
                .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,
                .read           = spi_chip_read,
        },
@@ -4108,10 +4188,20 @@ struct flashchip flashchips[] = {
                .model_id       = ST_M25P16,
                .total_size     = 2048,
                .page_size      = 256,
-               .tested         = TEST_OK_PREW,
+               .tested         = TEST_OK_PRW,
                .probe          = probe_spi_rdid,
                .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,
                .read           = spi_chip_read,
        },
@@ -4124,10 +4214,20 @@ struct flashchip flashchips[] = {
                .model_id       = ST_M25P32,
                .total_size     = 4096,
                .page_size      = 256,
-               .tested         = TEST_OK_PREW,
+               .tested         = TEST_OK_PRW,
                .probe          = probe_spi_rdid,
                .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,
                .read           = spi_chip_read,
        },
@@ -4143,7 +4243,17 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_spi_rdid,
                .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,
                .read           = spi_chip_read,
        },
@@ -4159,7 +4269,17 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_spi_rdid,
                .probe_timing   = TIMING_ZERO,
-               .erase          = spi_chip_erase_c7,
+               .erase          = NULL,
+               .block_erasers  =
+               {
+                       {
+                               .eraseblocks = { {256 * 1024, 128} },
+                               .block_erase = spi_block_erase_d8,
+                       }, {
+                               .eraseblocks = { {16 * 1024 * 1024, 1} },
+                               .block_erase = spi_block_erase_c7,
+                       }
+               },
                .write          = spi_chip_write_256,
                .read           = spi_chip_read,
        },
@@ -4175,7 +4295,22 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_jedec,
                .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,
                .read           = read_memmapped,
        },
@@ -4188,10 +4323,25 @@ struct flashchip flashchips[] = {
                .model_id       = ST_M29F002T,
                .total_size     = 256,
                .page_size      = 64 * 1024,
-               .tested         = TEST_OK_PREW,
+               .tested         = TEST_OK_PRW,
                .probe          = probe_jedec,
                .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,
                .read           = read_memmapped,
        },
@@ -4204,10 +4354,20 @@ struct flashchip flashchips[] = {
                .model_id       = ST_M29F040B,
                .total_size     = 512,
                .page_size      = 64 * 1024,
-               .tested         = TEST_OK_PREW,
+               .tested         = TEST_OK_PRW,
                .probe          = probe_29f040b,
                .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,
                .read           = read_memmapped,
        },
@@ -4223,7 +4383,22 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_m29f400bt,
                .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,
                .read           = read_memmapped,
        },
@@ -4239,7 +4414,17 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_jedec,
                .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,
                .read           = read_memmapped,
        },
@@ -4255,7 +4440,17 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_jedec,
                .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,
                .read           = read_memmapped,
        },
@@ -4272,7 +4467,17 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_jedec,
                .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,
                .read           = read_memmapped,
        },
@@ -4289,7 +4494,17 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_jedec,
                .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,
                .read           = read_memmapped,
        },
@@ -4303,10 +4518,20 @@ struct flashchip flashchips[] = {
                .total_size     = 1024,
                .page_size      = 64 * 1024,
                .feature_bits   = FEATURE_REGISTERMAP,
-               .tested         = TEST_OK_PREW,
+               .tested         = TEST_OK_PRW,
                .probe          = probe_jedec,
                .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,
                .read           = read_memmapped,
        },
@@ -4323,7 +4548,17 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_jedec,
                .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,
                .read           = read_memmapped,
        },
@@ -4340,6 +4575,21 @@ struct flashchip flashchips[] = {
                .probe          = probe_49lfxxxc,
                .probe_timing   = TIMING_IGNORED, /* routine don't use 
probe_timing (sst49lfxxxc.c) */
                .erase          = NULL,
+               .block_erasers  =
+               {
+                       {
+                               .eraseblocks = {
+                                       {64 * 1024, 3},
+                                       {32 * 1024, 1},
+                                       {8 * 1024, 2},
+                                       {16 * 1024, 1},
+                               },
+                               .block_erase = erase_block_stm50flw0x0x,
+                       }, {
+                               .eraseblocks = { {1024 * 1024, 1} },
+                               .block_erase = erase_chip_stm50flw0x0x,
+                       }
+               },
                .write          = NULL,
                .read           = read_memmapped,
        },
@@ -4355,8 +4605,18 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_82802ab,
                .probe_timing   = TIMING_IGNORED, /* routine don't use 
probe_timing (82802ab.c) */
-               .erase          = erase_82802ab,
-               .write          = write_82802ab,
+               .erase          = NULL,
+               .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,
        },
 
@@ -4368,11 +4628,21 @@ struct flashchip flashchips[] = {
                .model_id       = ST_M50FW040,
                .total_size     = 512,
                .page_size      = 64 * 1024,
-               .tested         = TEST_OK_PREW,
+               .tested         = TEST_OK_PRW,
                .probe          = probe_82802ab,
                .probe_timing   = TIMING_IGNORED, /* routine don't use 
probe_timing (82802ab.c) */
-               .erase          = erase_82802ab,
-               .write          = write_82802ab,
+               .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,
                .read           = read_memmapped,
        },
 
@@ -4384,11 +4654,21 @@ struct flashchip flashchips[] = {
                .model_id       = ST_M50FW080,
                .total_size     = 1024,
                .page_size      = 64 * 1024,
-               .tested         = TEST_OK_PREW,
+               .tested         = TEST_OK_PRW,
                .probe          = probe_82802ab,
                .probe_timing   = TIMING_IGNORED, /* routine don't use 
probe_timing (82802ab.c) */
-               .erase          = erase_82802ab,
-               .write          = write_82802ab,
+               .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,
                .read           = read_memmapped,
        },
 
@@ -4403,7 +4683,23 @@ struct flashchip flashchips[] = {
                .tested         = TEST_UNTESTED,
                .probe          = probe_jedec,
                .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,
                .read           = read_memmapped,
        },
diff --git a/stm50flw0x0x.c b/stm50flw0x0x.c
index e90bbd2..3b56436 100644
--- a/stm50flw0x0x.c
+++ b/stm50flw0x0x.c
@@ -2,6 +2,7 @@
  * This file is part of the flashrom project.
  *
  * Copyright (C) 2008 Claus Gindhart <[email protected]>
+ * Copyright (C) 2009 Sean Nelson <[email protected]>
  *
  * 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
@@ -99,9 +100,9 @@ int unlock_block_stm50flw0x0x(struct flashchip *flash, int 
offset)
        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
        chip_writeb(0x50, bios);
@@ -113,11 +114,34 @@ int erase_block_stm50flw0x0x(struct flashchip *flash, int 
offset)
 
        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");
                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;
 }
@@ -178,7 +202,7 @@ int erase_stm50flw0x0x(struct flashchip *flash)
                        fprintf(stderr, "UNLOCK FAILED!\n");
                        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");
                        return -1;
                }
@@ -188,6 +212,16 @@ int erase_stm50flw0x0x(struct flashchip *flash)
        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 i, rc = 0;
@@ -221,7 +255,7 @@ int write_stm50flw0x0x(struct flashchip *flash, uint8_t * 
buf)
 
                rc = unlock_block_stm50flw0x0x(flash, i * page_size);
                if (!rc)
-                       rc = erase_block_stm50flw0x0x(flash, i * page_size);
+                       rc = erase_block_stm50flw0x0x(flash, i * page_size, 
page_size);
                if (!rc)
                        write_page_stm50flw0x0x(bios, buf + i * page_size,
                                        bios + i * page_size, page_size);
_______________________________________________
flashrom mailing list
[email protected]
http://www.flashrom.org/mailman/listinfo/flashrom

Reply via email to