From a8cf3620a42ca5927253822a813e3fbae1d6e7bf Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Fri, 8 Aug 2014 08:33:01 +0000 Subject: Unify non-shifted and shifted JEDEC access Some Parallel bus chips have a 16-bit mode and an 8-bit mode. They use normal JEDEC addresses for 16-bit mode and shifted addresses (by 1 bit) for 8-bit mode. Some programmers can access them in 16-bit mode, but on all flashrom-supported programmers so far, we access them in 8-bit mode. This means we have to shift the addresses but apart from the addresses we can share the code. This patch makes this possible by checking the chip's FEATURE_ADDR_SHIFTED flag in common JEDEC functions and applying the right addresses respectively. Corresponding to flashrom svn r1840. Signed-off-by: Carl-Daniel Hailfinger Signed-off-by: Stefan Tauner Acked-by: Carl-Daniel Hailfinger --- m29f400bt.c | 87 ------------------------------------------------------------- 1 file changed, 87 deletions(-) delete mode 100644 m29f400bt.c (limited to 'm29f400bt.c') diff --git a/m29f400bt.c b/m29f400bt.c deleted file mode 100644 index 399a7e0..0000000 --- a/m29f400bt.c +++ /dev/null @@ -1,87 +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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#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) -{ - int 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; -} -- cgit v1.1