From bf002f61950d07ee9353205c83b3451d63ad3cba Mon Sep 17 00:00:00 2001
From: stefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>
Date: Sun, 1 Jun 2014 02:21:02 +0000
Subject: Combine block_erase*_en29lv640b and block_erase*_m29f400bt
 respectively.

This patch combines two identical block and chip erase functions respectively:
 - Merge block_erase_m29f400bt and block_erase_en29lv640b into
   erase_block_shifted_jedec.
 - Merge block_erase_chip_m29f400bt and block_erase_chip_en29lv640b into
   erase_chip_block_shifted_jedec.

Leave their implementations in en29lv640b.c for now.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>

git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1808 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 flashchips.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'flashchips.c')

diff --git a/flashchips.c b/flashchips.c
index c830436..353575d 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -4730,10 +4730,10 @@ const struct flashchip flashchips[] = {
 					{8 * 1024, 8},
 					{64 * 1024, 127},
 				},
-				.block_erase = block_erase_en29lv640b,
+				.block_erase = erase_block_shifted_jedec,
 			}, {
 				.eraseblocks = { {8 * 1024 * 1024, 1} },
-				.block_erase = block_erase_chip_en29lv640b,
+				.block_erase = erase_chip_block_shifted_jedec,
 			},
 		},
 		.write		= write_en29lv640b,
@@ -4827,10 +4827,10 @@ const struct flashchip flashchips[] = {
 					{32 * 1024, 1},
 					{64 * 1024, 7},
 				},
-				.block_erase = block_erase_m29f400bt,
+				.block_erase = erase_block_shifted_jedec,
 			}, {
 				.eraseblocks = { {512 * 1024, 1} },
-				.block_erase = block_erase_chip_m29f400bt,
+				.block_erase = erase_chip_block_shifted_jedec,
 			},
 		},
 		.write		= write_m29f400bt,
@@ -4859,10 +4859,10 @@ const struct flashchip flashchips[] = {
 					{8 * 1024, 2},
 					{16 * 1024, 1},
 				},
-				.block_erase = block_erase_m29f400bt,
+				.block_erase = erase_block_shifted_jedec,
 			}, {
 				.eraseblocks = { {512 * 1024, 1} },
-				.block_erase = block_erase_chip_m29f400bt,
+				.block_erase = erase_chip_block_shifted_jedec,
 			},
 		},
 		.write		= write_m29f400bt,
@@ -4891,10 +4891,10 @@ const struct flashchip flashchips[] = {
 					{32 * 1024, 1},
 					{64 * 1024, 31},
 				},
-				.block_erase = block_erase_m29f400bt,
+				.block_erase = erase_block_shifted_jedec,
 			}, {
 				.eraseblocks = { {2048 * 1024, 1} },
-				.block_erase = block_erase_chip_m29f400bt,
+				.block_erase = erase_chip_block_shifted_jedec,
 			},
 		},
 		.write		= write_m29f400bt, /* Supports a fast mode too */
@@ -4923,10 +4923,10 @@ const struct flashchip flashchips[] = {
 					{8 * 1024, 2},
 					{16 * 1024, 1},
 				},
-				.block_erase = block_erase_m29f400bt,
+				.block_erase = erase_block_shifted_jedec,
 			}, {
 				.eraseblocks = { {2048 * 1024, 1} },
-				.block_erase = block_erase_chip_m29f400bt,
+				.block_erase = erase_chip_block_shifted_jedec,
 			},
 		},
 		.write		= write_m29f400bt, /* Supports a fast mode too */
@@ -11292,10 +11292,10 @@ const struct flashchip flashchips[] = {
 					{32 * 1024, 1},
 					{64 * 1024, 7},
 				},
-				.block_erase = block_erase_m29f400bt,
+				.block_erase = erase_block_shifted_jedec,
 			}, {
 				.eraseblocks = { {512 * 1024, 1} },
-				.block_erase = block_erase_chip_m29f400bt,
+				.block_erase = erase_chip_block_shifted_jedec,
 			}
 		},
 		.write		= write_m29f400bt,
@@ -11324,10 +11324,10 @@ const struct flashchip flashchips[] = {
 					{8 * 1024, 2},
 					{16 * 1024, 1},
 				},
-				.block_erase = block_erase_m29f400bt,
+				.block_erase = erase_block_shifted_jedec,
 			}, {
 				.eraseblocks = { {512 * 1024, 1} },
-				.block_erase = block_erase_chip_m29f400bt,
+				.block_erase = erase_chip_block_shifted_jedec,
 			}
 		},
 		.write		= write_m29f400bt,
-- 
cgit v1.2.1