m29f400bt: delete unused chipdriver functions
Reduces diff with upstream.
BUG=b:166294558
BRANCH=none
TEST=builds
Signed-off-by: Nikolai Artemiev <nartemiev@google.com>
Change-Id: I2e0fb8df0e974a01962d2dcd81c8ffdd71d82c29
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+/2653435
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
diff --git a/Makefile b/Makefile
index b022371..db7ebef 100644
--- a/Makefile
+++ b/Makefile
@@ -650,7 +650,7 @@
sst28sf040.o 82802ab.o \
sst49lfxxxc.o sst_fwhub.o edi.o flashchips.o spi.o spi25.o spi25_statusreg.o \
spi95.o opaque.o sfdp.o en29lv640b.o at45db.o writeprotect.o s25f.o \
- stm50flw0x0x.o m29f400bt.o
+ stm50flw0x0x.o
###############################################################################
# Library code.
diff --git a/chipdrivers.h b/chipdrivers.h
index b5eaa85..ec3ff5f 100644
--- a/chipdrivers.h
+++ b/chipdrivers.h
@@ -160,13 +160,6 @@
int printlock_regspace2_block_eraser_0(struct flashctx *flash);
int printlock_regspace2_block_eraser_1(struct flashctx *flash);
-/* m29f400bt.c */
-int probe_m29f400bt(struct flashctx *flash);
-int block_erase_m29f400bt(struct flashctx *flash, unsigned int start, unsigned int len);
-int block_erase_chip_m29f400bt(struct flashctx *flash, unsigned int start, unsigned int len);
-int write_m29f400bt(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
-void protect_m29f400bt(struct flashctx *flash, chipaddr bios);
-
/* sst28sf040.c */
int erase_chip_28sf040(struct flashctx *flash, unsigned int addr, unsigned int blocklen);
int erase_sector_28sf040(struct flashctx *flash, unsigned int address, unsigned int sector_size);
diff --git a/m29f400bt.c b/m29f400bt.c
deleted file mode 100644
index 86a0408..0000000
--- a/m29f400bt.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * This file is part of the flashrom project.
- *
- * Copyright (C) 2000 Silicon Integrated System Corporation
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-#include "flash.h"
-#include "chipdrivers.h"
-
-/* WARNING!
- This chip uses the standard JEDEC Addresses in 16-bit mode as word
- addresses. In byte mode, 0xAAA has to be used instead of 0x555 and
- 0x555 instead of 0x2AA. Do *not* blindly replace with standard JEDEC
- functions. */
-
-/* chunksize is 1 */
-int write_m29f400bt(struct flashctx *flash, const uint8_t *src, unsigned int start, unsigned int len)
-{
- unsigned i;
- chipaddr bios = flash->virtual_memory;
- chipaddr dst = flash->virtual_memory + start;
-
- for (i = 0; i < len; i++) {
- chip_writeb(flash, 0xAA, bios + 0xAAA);
- chip_writeb(flash, 0x55, bios + 0x555);
- chip_writeb(flash, 0xA0, bios + 0xAAA);
-
- /* transfer data from source to destination */
- chip_writeb(flash, *src, dst);
- toggle_ready_jedec(flash, dst);
-#if 0
- /* We only want to print something in the error case. */
- msg_cerr("Value in the flash at address 0x%lx = %#x, want %#x\n",
- (dst - bios), chip_readb(flash, dst), *src);
-#endif
- dst++;
- src++;
- }
-
- /* FIXME: Ignore errors for now. */
- return 0;
-}
-
-int probe_m29f400bt(struct flashctx *flash)
-{
- chipaddr bios = flash->virtual_memory;
- uint8_t id1, id2;
-
- chip_writeb(flash, 0xAA, bios + 0xAAA);
- chip_writeb(flash, 0x55, bios + 0x555);
- chip_writeb(flash, 0x90, bios + 0xAAA);
-
- programmer_delay(10);
-
- id1 = chip_readb(flash, bios);
- /* The data sheet says id2 is at (bios + 0x01) and id2 listed in
- * flash.h does not match. It should be possible to use JEDEC probe.
- */
- id2 = chip_readb(flash, bios + 0x02);
-
- chip_writeb(flash, 0xAA, bios + 0xAAA);
- chip_writeb(flash, 0x55, bios + 0x555);
- chip_writeb(flash, 0xF0, bios + 0xAAA);
-
- programmer_delay(10);
-
- msg_cdbg("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2);
-
- if (id1 == flash->chip->manufacture_id && id2 == flash->chip->model_id)
- return 1;
-
- return 0;
-}
-
-static int erase_m29f400bt(struct flashctx *flash)
-{
- chipaddr bios = flash->virtual_memory;
-
- chip_writeb(flash, 0xAA, bios + 0xAAA);
- chip_writeb(flash, 0x55, bios + 0x555);
- chip_writeb(flash, 0x80, bios + 0xAAA);
-
- chip_writeb(flash, 0xAA, bios + 0xAAA);
- chip_writeb(flash, 0x55, bios + 0x555);
- chip_writeb(flash, 0x10, bios + 0xAAA);
-
- programmer_delay(10);
- toggle_ready_jedec(flash, bios);
-
- /* FIXME: Check the status register for errors. */
- return 0;
-}
-
-int block_erase_m29f400bt(struct flashctx *flash, unsigned int start, unsigned int len)
-{
- chipaddr bios = flash->virtual_memory;
- chipaddr dst = bios + start;
-
- chip_writeb(flash, 0xAA, bios + 0xAAA);
- chip_writeb(flash, 0x55, bios + 0x555);
- chip_writeb(flash, 0x80, bios + 0xAAA);
-
- chip_writeb(flash, 0xAA, bios + 0xAAA);
- chip_writeb(flash, 0x55, bios + 0x555);
- chip_writeb(flash, 0x30, dst);
-
- programmer_delay(10);
- toggle_ready_jedec(flash, bios);
-
- /* FIXME: Check the status register for errors. */
- return 0;
-}
-
-int block_erase_chip_m29f400bt(struct flashctx *flash, unsigned int address, unsigned int blocklen)
-{
- if ((address != 0) || (blocklen != flash->chip->total_size * 1024)) {
- msg_cerr("%s called with incorrect arguments\n",
- __func__);
- return -1;
- }
- return erase_m29f400bt(flash);
-}
diff --git a/meson.build b/meson.build
index eefb17f..83b0107 100644
--- a/meson.build
+++ b/meson.build
@@ -348,7 +348,6 @@
srcs += 'power.c'
srcs += 'search.c'
srcs += 'file.c'
-srcs += 'm29f400bt.c'
srcs += 'stm50flw0x0x.c'
srcs += 'action_descriptor.c'
