openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 14:11:15 +02:00
Code Issues Releases Wiki Activity

Remove erase_chip_stm50flw0x0x

Browse Source 
As the comment indicates, that function is not a chip erase function
at all, but a function calling a block eraser in a loop. So it adds
no extra value to what we already have in the block_eraser
infrastructure.

Furthermore, that function assumes a uniform sector size layout, but
is referenced from flash chip with non-uniform sector size layout, which
is just wrong.

Corresponding to flashrom svn r1287.

Signed-off-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
This commit is contained in:
Michael Karcher
2011-04-14 23:43:19 +00:00
parent 2842db315d
commit 4b17736985
3 changed files with 0 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
chipdrivers.h
View File

@ -128,7 +128,6 @@ int probe_w29ee011(struct flashchip *flash);
/* stm50flw0x0x.c */
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 unlock_stm50flw0x0x(struct flashchip *flash);
#endif /* !__CHIPDRIVERS_H__ */

27
flashchips.c
View File

@ -6852,9 +6852,6 @@ struct flashchip flashchips[] = {
}, {
.eraseblocks = { {64 * 1024, 8}, },
.block_erase = erase_block_82802ab,
}, {
.eraseblocks = { {512 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.unlock = unlock_stm50flw0x0x,
@ -6887,9 +6884,6 @@ struct flashchip flashchips[] = {
}, {
.eraseblocks = { {64 * 1024, 8}, },
.block_erase = erase_block_82802ab,
}, {
.eraseblocks = { {512 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.unlock = unlock_stm50flw0x0x,
@ -6922,9 +6916,6 @@ struct flashchip flashchips[] = {
}, {
.eraseblocks = { {64 * 1024, 16}, },
.block_erase = erase_block_82802ab,
}, {
.eraseblocks = { {1024 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.unlock = unlock_stm50flw0x0x,
@ -6957,9 +6948,6 @@ struct flashchip flashchips[] = {
}, {
.eraseblocks = { {64 * 1024, 16}, },
.block_erase = erase_block_82802ab,
}, {
.eraseblocks = { {1024 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.unlock = unlock_stm50flw0x0x,
@ -6989,9 +6977,6 @@ struct flashchip flashchips[] = {
{16 * 1024, 1},
},
.block_erase = erase_block_82802ab,
}, {
.eraseblocks = { {256 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.unlock = unlock_stm50flw0x0x,
@ -7016,9 +7001,6 @@ struct flashchip flashchips[] = {
{
.eraseblocks = { {64 * 1024, 32}, },
.block_erase = erase_block_82802ab,
}, {
.eraseblocks = { {2 * 1024 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.unlock = unlock_stm50flw0x0x,
@ -7043,9 +7025,6 @@ struct flashchip flashchips[] = {
{
.eraseblocks = { {64 * 1024, 8}, },
.block_erase = erase_block_82802ab,
}, {
.eraseblocks = { {512 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.unlock = unlock_stm50flw0x0x,
@ -7070,9 +7049,6 @@ struct flashchip flashchips[] = {
{
.eraseblocks = { {64 * 1024, 16}, },
.block_erase = erase_block_82802ab,
}, {
.eraseblocks = { {1024 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.unlock = unlock_stm50flw0x0x,
@ -7103,9 +7079,6 @@ struct flashchip flashchips[] = {
{16 * 1024, 1},
},
.block_erase = erase_block_82802ab,
}, {
.eraseblocks = { {2 * 1024 * 1024, 1} },
.block_erase = erase_chip_stm50flw0x0x,
}
},
.unlock = unlock_stm50flw0x0x,

27
stm50flw0x0x.c
View File

@ -114,30 +114,3 @@ int erase_sector_stm50flw0x0x(struct flashchip *flash, unsigned int sector, unsi
return 0;
}
/* FIXME: This function is not a real chip erase function. */
int erase_chip_stm50flw0x0x(struct flashchip *flash, unsigned int addr, unsigned int blocklen)
{
int i;
int total_size = flash->total_size * 1024;
int page_size = flash->page_size;
if ((addr != 0) || (blocklen != flash->total_size * 1024)) {
msg_cerr("%s called with incorrect arguments\n",
__func__);
return -1;
}
for (i = 0; i < total_size / page_size; i++) {
//if (unlock_block_stm50flw0x0x(flash, i * page_size)) {
// msg_cerr("UNLOCK FAILED!\n");
// return -1;
//}
if (erase_block_82802ab(flash, i * page_size, page_size)) {
msg_cerr("ERASE FAILED!\n");
return -1;
}
}
return 0;
}