spi25: Merge remainder of spi4ba in
Change-Id: If581e24347e45cbb27002ea99ffd70e334c110cf
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/22388
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/flashchips.c b/flashchips.c
index 439c05f..c8ea5eb 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -9923,10 +9923,10 @@
.block_erasers = {
{
.eraseblocks = { {4 * 1024, 8192} },
- .block_erase = spi_block_erase_21_4ba_direct,
+ .block_erase = spi_block_erase_21,
}, {
.eraseblocks = { {64 * 1024, 512} },
- .block_erase = spi_block_erase_dc_4ba_direct,
+ .block_erase = spi_block_erase_dc,
}, {
.eraseblocks = { {32768 * 1024, 1} },
.block_erase = spi_block_erase_c7,
@@ -9956,10 +9956,10 @@
.block_erasers = {
{
.eraseblocks = { {4 * 1024, 16384} },
- .block_erase = spi_block_erase_21_4ba_direct,
+ .block_erase = spi_block_erase_21,
}, {
.eraseblocks = { {64 * 1024, 1024} },
- .block_erase = spi_block_erase_dc_4ba_direct,
+ .block_erase = spi_block_erase_dc,
}, {
.eraseblocks = { {65536 * 1024, 1} },
.block_erase = spi_block_erase_c7,