From 329bde7725819ffcb6c074a453c3e2ae63bb0bc4 Mon Sep 17 00:00:00 2001
From: Sean Nelson <audiohacked@gmail.com>
Date: Tue, 19 Jan 2010 16:39:19 +0000
Subject: [PATCH] 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
Fix incorrect sizes as found by Carl-Daniel.
Add back M50FLW0x0x mixed sector/block eraser sans function pointer.

Corresponding to flashrom svn r872.

Signed-off-by: Sean Nelson <audiohacked@gmail.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
---
 flashchips.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/flashchips.c b/flashchips.c
index 68f2b9b4c..421927eaf 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -4685,6 +4685,14 @@ struct flashchip flashchips[] = {
 		.block_erasers	=
 		{
 			{
+				.eraseblocks = {
+					{4 * 1024, 16},  /* sector */
+					{64 * 1024, 5}, /* block */
+					{4 * 1024, 16}, /* sector */
+					{4 * 1024, 16}, /* sector */
+				},
+				.block_erase = NULL,
+			}, {
 				.eraseblocks = { {64 * 1024, 8}, },
 				.block_erase = erase_block_stm50flw0x0x,
 			}, {
@@ -4712,6 +4720,14 @@ struct flashchip flashchips[] = {
 		.block_erasers	=
 		{
 			{
+				.eraseblocks = {
+					{4 * 1024, 16},  /* sector */
+					{4 * 1024, 16}, /* sector */
+					{64 * 1024, 5}, /* block */
+					{4 * 1024, 16}, /* sector */
+				},
+				.block_erase = NULL,
+			}, {
 				.eraseblocks = { {64 * 1024, 8}, },
 				.block_erase = erase_block_stm50flw0x0x,
 			}, {
@@ -4739,6 +4755,14 @@ struct flashchip flashchips[] = {
 		.block_erasers	=
 		{
 			{
+				.eraseblocks = {
+					{4 * 1024, 16},  /* sector */
+					{64 * 1024, 13}, /* block */
+					{4 * 1024, 16}, /* sector */
+					{4 * 1024, 16}, /* sector */
+				},
+				.block_erase = NULL,
+			}, {
 				.eraseblocks = { {64 * 1024, 16}, },
 				.block_erase = erase_block_stm50flw0x0x,
 			}, {
@@ -4766,6 +4790,14 @@ struct flashchip flashchips[] = {
 		.block_erasers	=
 		{
 			{
+				.eraseblocks = {
+					{4 * 1024, 16},  /* sector */
+					{4 * 1024, 16}, /* sector */
+					{64 * 1024, 13}, /* block */
+					{4 * 1024, 16}, /* sector */
+				},
+				.block_erase = NULL,
+			}, {
 				.eraseblocks = { {64 * 1024, 16}, },
 				.block_erase = erase_block_stm50flw0x0x,
 			}, {