Author: hailfinger Date: 2008-03-14 01:02:25 +0100 (Fri, 14 Mar 2008) New Revision: 3140
Added: trunk/util/flashrom/82802ab.c Modified: trunk/util/flashrom/flash.h trunk/util/flashrom/flashchips.c trunk/util/flashrom/flashrom.c trunk/util/flashrom/sharplhf00l04.c Log: Revert the delete of 82802ab.c in r3137.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net Acked-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Copied: trunk/util/flashrom/82802ab.c (from rev 3136, trunk/util/flashrom/82802ab.c) =================================================================== --- trunk/util/flashrom/82802ab.c (rev 0) +++ trunk/util/flashrom/82802ab.c 2008-03-14 00:02:25 UTC (rev 3140) @@ -0,0 +1,186 @@ +/* + * 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 + */ + +/* + * Datasheet: + * - Name: Intel 82802AB/82802AC Firmware Hub (FWH) + * - URL: http://www.intel.com/design/chipsets/datashts/290658.htm + * - PDF: http://download.intel.com/design/chipsets/datashts/29065804.pdf + * - Order number: 290658-004 + */ + +#include <stdio.h> +#include <stdint.h> +#include "flash.h" + +// I need that Berkeley bit-map printer +void print_82802ab_status(uint8_t status) +{ + printf("%s", status & 0x80 ? "Ready:" : "Busy:"); + printf("%s", status & 0x40 ? "BE SUSPEND:" : "BE RUN/FINISH:"); + printf("%s", status & 0x20 ? "BE ERROR:" : "BE OK:"); + printf("%s", status & 0x10 ? "PROG ERR:" : "PROG OK:"); + printf("%s", status & 0x8 ? "VP ERR:" : "VPP OK:"); + printf("%s", status & 0x4 ? "PROG SUSPEND:" : "PROG RUN/FINISH:"); + printf("%s", status & 0x2 ? "WP|TBL#|WP#,ABORT:" : "UNLOCK:"); +} + +int probe_82802ab(struct flashchip *flash) +{ + volatile uint8_t *bios = flash->virtual_memory; + uint8_t id1, id2; + +#if 0 + *(volatile uint8_t *)(bios + 0x5555) = 0xAA; + *(volatile uint8_t *)(bios + 0x2AAA) = 0x55; + *(volatile uint8_t *)(bios + 0x5555) = 0x90; +#endif + + *bios = 0xff; + myusec_delay(10); + *bios = 0x90; + myusec_delay(10); + + id1 = *(volatile uint8_t *)bios; + id2 = *(volatile uint8_t *)(bios + 0x01); + + /* Leave ID mode */ + *(volatile uint8_t *)(bios + 0x5555) = 0xAA; + *(volatile uint8_t *)(bios + 0x2AAA) = 0x55; + *(volatile uint8_t *)(bios + 0x5555) = 0xF0; + + myusec_delay(10); + + printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); + + if (id1 != flash->manufacture_id || id2 != flash->model_id) + return 0; + + map_flash_registers(flash); + + return 1; +} + +uint8_t wait_82802ab(volatile uint8_t *bios) +{ + uint8_t status; + uint8_t id1, id2; + + *bios = 0x70; + if ((*bios & 0x80) == 0) { // it's busy + while ((*bios & 0x80) == 0) ; + } + + status = *bios; + + // put another command to get out of status register mode + + *bios = 0x90; + myusec_delay(10); + + id1 = *(volatile uint8_t *)bios; + id2 = *(volatile uint8_t *)(bios + 0x01); + + // this is needed to jam it out of "read id" mode + *(volatile uint8_t *)(bios + 0x5555) = 0xAA; + *(volatile uint8_t *)(bios + 0x2AAA) = 0x55; + *(volatile uint8_t *)(bios + 0x5555) = 0xF0; + + return status; +} + +int erase_82802ab_block(struct flashchip *flash, int offset) +{ + volatile uint8_t *bios = flash->virtual_memory + offset; + volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2; + uint8_t status; + + // clear status register + *bios = 0x50; + //printf("Erase at %p\n", bios); + // clear write protect + //printf("write protect is at %p\n", (wrprotect)); + //printf("write protect is 0x%x\n", *(wrprotect)); + *(wrprotect) = 0; + //printf("write protect is 0x%x\n", *(wrprotect)); + + // now start it + *(volatile uint8_t *)(bios) = 0x20; + *(volatile uint8_t *)(bios) = 0xd0; + myusec_delay(10); + // now let's see what the register is + status = wait_82802ab(flash->virtual_memory); + //print_82802ab_status(status); + printf("DONE BLOCK 0x%x\n", offset); + + return 0; +} + +int erase_82802ab(struct flashchip *flash) +{ + int i; + unsigned int total_size = flash->total_size * 1024; + + printf("total_size is %d; flash->page_size is %d\n", + total_size, flash->page_size); + for (i = 0; i < total_size; i += flash->page_size) + erase_82802ab_block(flash, i); + printf("DONE ERASE\n"); + + return 0; +} + +void write_page_82802ab(volatile uint8_t *bios, uint8_t *src, + volatile uint8_t *dst, int page_size) +{ + int i; + + for (i = 0; i < page_size; i++) { + /* transfer data from source to destination */ + *dst = 0x40; + *dst++ = *src++; + wait_82802ab(bios); + } +} + +int write_82802ab(struct flashchip *flash, uint8_t *buf) +{ + int i; + int total_size = flash->total_size * 1024; + int page_size = flash->page_size; + volatile uint8_t *bios = flash->virtual_memory; + + erase_82802ab(flash); + if (*bios != 0xff) { + printf("ERASE FAILED\n"); + return -1; + } + printf("Programming page: "); + for (i = 0; i < total_size / page_size; i++) { + printf("%04d at address: 0x%08x", i, i * page_size); + write_page_82802ab(bios, buf + i * page_size, + bios + i * page_size, page_size); + printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); + } + printf("\n"); + protect_jedec(bios); + + return 0; +}
Modified: trunk/util/flashrom/flash.h =================================================================== --- trunk/util/flashrom/flash.h 2008-03-13 18:52:51 UTC (rev 3139) +++ trunk/util/flashrom/flash.h 2008-03-14 00:02:25 UTC (rev 3140) @@ -33,7 +33,6 @@ #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
struct flashchip { - const char *vendor; const char *name; /* With 32bit manufacture_id and model_id we can cover IDs up to * (including) the 4th bank of JEDEC JEP106W Standard Manufacturer's
Modified: trunk/util/flashrom/flashchips.c =================================================================== --- trunk/util/flashrom/flashchips.c 2008-03-13 18:52:51 UTC (rev 3139) +++ trunk/util/flashrom/flashchips.c 2008-03-14 00:02:25 UTC (rev 3140) @@ -26,107 +26,202 @@ #endif
struct flashchip flashchips[] = { - /******************************************************************************************************************************************************************************************************/ - /* Vendor Chip Vendor ID Chip ID TODO TODO Probe function Erase function Write function Read function */ - /******************************************************************************************************************************************************************************************************/ - {"AMD", "Am29F040B", AMD_ID, AM_29F040B, 512, 64 * 1024, probe_29f040b, erase_29f040b, write_29f040b}, - {"AMD", "Am29LV040B", AMD_ID, AM_29LV040B, 512, 64 * 1024, probe_29f040b, erase_29f040b, write_29f040b}, - {"AMD", "Am29F016D", AMD_ID, AM_29F016D, 2048, 64 * 1024, probe_29f040b, erase_29f040b, write_29f040b}, - {"ASD", "AE49F2008", ASD_ID, ASD_AE49F2008, 256, 128, probe_jedec, erase_chip_jedec, write_jedec}, - {"Atmel", "At29C040A", ATMEL_ID, AT_29C040A, 512, 256, probe_jedec, erase_chip_jedec, write_jedec}, - {"Atmel", "At29C020", ATMEL_ID, AT_29C020, 256, 256, probe_jedec, erase_chip_jedec, write_jedec}, - {"Atmel", "At49F002(N)", ATMEL_ID, AT_49F002N, 256, 256, probe_jedec, erase_chip_jedec, write_jedec}, - {"Atmel", "At49F002(N)T", ATMEL_ID, AT_49F002NT, 256, 256, probe_jedec, erase_chip_jedec, write_jedec}, - {"EON", "EN29F002(A)(N)T", EON_ID, EN_29F002T, 256, 256, probe_jedec, erase_chip_jedec, write_jedec}, - {"EON", "EN29F002(A)(N)B", EON_ID, EN_29F002B, 256, 256, probe_jedec, erase_chip_jedec, write_jedec}, - {"Fujitsu", "MBM29F400TC", FUJITSU_ID, MBM29F400TC_STRANGE, 512, 64 * 1024, probe_m29f400bt, erase_m29f400bt, write_coreboot_m29f400bt}, - {"Macronix", "MX29F002", MX_ID, MX_29F002, 256, 64 * 1024, probe_29f002, erase_29f002, write_29f002}, - {"Macronix", "MX25L4005", MX_ID, MX_25L4005, 512, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"Macronix", "MX25L8005", MX_ID, MX_25L8005, 1024, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"Macronix", "MX25L3205", MX_ID, MX_25L3205, 4096, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"Spansion", "S25FL016A", SPANSION_ID, SPANSION_S25FL016A, 2048, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"SST", "SST25VF040B", SST_ID, SST_25VF040B, 512, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"SST", "SST25VF016B", SST_ID, SST_25VF016B, 2048, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"SST", "SST29EE020A", SST_ID, SST_29EE020A, 256, 128, probe_jedec, erase_chip_jedec, write_jedec}, - {"SST", "SST28SF040A", SST_ID, SST_28SF040, 512, 256, probe_28sf040, erase_28sf040, write_28sf040}, - {"SST", "SST39SF010A", SST_ID, SST_39SF010, 128, 4096, probe_jedec, erase_chip_jedec, write_39sf020}, - {"SST", "SST39SF020A", SST_ID, SST_39SF020, 256, 4096, probe_jedec, erase_chip_jedec, write_39sf020}, - {"SST", "SST39SF040", SST_ID, SST_39SF040, 512, 4096, probe_jedec, erase_chip_jedec, write_39sf020}, - {"SST", "SST39VF020", SST_ID, SST_39VF020, 256, 4096, probe_jedec, erase_chip_jedec, write_39sf020}, + {"Am29F040B", AMD_ID, AM_29F040B, 512, 64 * 1024, + probe_29f040b, erase_29f040b, write_29f040b}, + {"Am29LV040B", AMD_ID, AM_29LV040B, 512, 64 * 1024, + probe_29f040b, erase_29f040b, write_29f040b}, + {"Am29F016D", AMD_ID, AM_29F016D, 2048, 64 * 1024, + probe_29f040b, erase_29f040b, write_29f040b}, + {"AE49F2008", ASD_ID, ASD_AE49F2008, 256, 128, + probe_jedec, erase_chip_jedec, write_jedec}, + {"At29C040A", ATMEL_ID, AT_29C040A, 512, 256, + probe_jedec, erase_chip_jedec, write_jedec}, + {"At29C020", ATMEL_ID, AT_29C020, 256, 256, + probe_jedec, erase_chip_jedec, write_jedec}, + {"At49F002(N)", ATMEL_ID, AT_49F002N, 256, 256, + probe_jedec, erase_chip_jedec, write_jedec}, + {"At49F002(N)T",ATMEL_ID, AT_49F002NT, 256, 256, + probe_jedec, erase_chip_jedec, write_jedec}, + {"EN29F002(A)(N)T", EON_ID, EN_29F002T, 256, 256, + probe_jedec, erase_chip_jedec, write_jedec}, + {"EN29F002(A)(N)B", EON_ID, EN_29F002B, 256, 256, + probe_jedec, erase_chip_jedec, write_jedec}, + {"MBM29F400TC", FUJITSU_ID, MBM29F400TC_STRANGE, 512, 64 * 1024, + probe_m29f400bt, erase_m29f400bt, write_coreboot_m29f400bt}, + {"MX29F002", MX_ID, MX_29F002, 256, 64 * 1024, + probe_29f002, erase_29f002, write_29f002}, + {"MX25L4005", MX_ID, MX_25L4005, 512, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"MX25L8005", MX_ID, MX_25L8005, 1024, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"MX25L3205", MX_ID, MX_25L3205, 4096, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"S25FL016A", SPANSION_ID, SPANSION_S25FL016A, 2048, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"SST25VF040B", SST_ID, SST_25VF040B, 512, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"SST25VF016B", SST_ID, SST_25VF016B, 2048, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"SST29EE020A", SST_ID, SST_29EE020A, 256, 128, + probe_jedec, erase_chip_jedec, write_jedec}, + {"SST28SF040A", SST_ID, SST_28SF040, 512, 256, + probe_28sf040, erase_28sf040, write_28sf040}, + {"SST39SF010A", SST_ID, SST_39SF010, 128, 4096, + probe_jedec, erase_chip_jedec, write_39sf020}, + {"SST39SF020A", SST_ID, SST_39SF020, 256, 4096, + probe_jedec, erase_chip_jedec, write_39sf020}, + {"SST39SF040", SST_ID, SST_39SF040, 512, 4096, + probe_jedec, erase_chip_jedec, write_39sf020}, + {"SST39VF020", SST_ID, SST_39VF020, 256, 4096, + probe_jedec, erase_chip_jedec, write_39sf020}, // assume similar to 004B, ignoring data sheet - {"SST", "SST49LF040B", SST_ID, SST_49LF040B, 512, 64 * 1024, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, - {"SST", "SST49LF040", SST_ID, SST_49LF040, 512, 4096, probe_jedec, erase_49lf040, write_49lf040}, - {"SST", "SST49LF020A", SST_ID, SST_49LF020A, 256, 16 * 1024, probe_jedec, erase_49lf040, write_49lf040}, - {"SST", "SST49LF080A", SST_ID, SST_49LF080A, 1024, 4096, probe_jedec, erase_49lf040, write_49lf040}, - {"SST", "SST49LF002A/B", SST_ID, SST_49LF002A, 256, 16 * 1024, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, - {"SST", "SST49LF003A/B", SST_ID, SST_49LF003A, 384, 64 * 1024, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, - {"SST", "SST49LF004A/B", SST_ID, SST_49LF004A, 512, 64 * 1024, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, - {"SST", "SST49LF008A", SST_ID, SST_49LF008A, 1024, 64 * 1024, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, - {"SST", "SST49LF004C", SST_ID, SST_49LF004C, 512, 4 * 1024, probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, - {"SST", "SST49LF008C", SST_ID, SST_49LF008C, 1024, 4 * 1024, probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, - {"SST", "SST49LF016C", SST_ID, SST_49LF016C, 2048, 4 * 1024, probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, - {"SST", "SST49LF160C", SST_ID, SST_49LF160C, 2048, 4 * 1024, probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, - {"PMC", "Pm49FL002", PMC_ID_NOPREFIX,PMC_49FL002, 256, 16 * 1024, probe_jedec, erase_chip_jedec, write_49fl004}, - {"PMC", "Pm49FL004", PMC_ID_NOPREFIX,PMC_49FL004, 512, 64 * 1024, probe_jedec, erase_chip_jedec, write_49fl004}, - {"PMC", "Pm25LV512", PMC_ID, PMC_25LV512, 64, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"PMC", "Pm25LV010", PMC_ID, PMC_25LV010, 128, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"PMC", "Pm25LV020", PMC_ID, PMC_25LV020, 256, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"PMC", "Pm25LV040", PMC_ID, PMC_25LV040, 512, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"PMC", "Pm25LV080B", PMC_ID, PMC_25LV080B, 1024, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"PMC", "Pm25LV016B", PMC_ID, PMC_25LV016B, 2048, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"Winbond", "W29C011", WINBOND_ID, W_29C011, 128, 128, probe_jedec, erase_chip_jedec, write_jedec}, - {"Winbond", "W29C040P", WINBOND_ID, W_29C040P, 512, 256, probe_jedec, erase_chip_jedec, write_jedec}, - {"Winbond", "W29C020C", WINBOND_ID, W_29C020C, 256, 128, probe_jedec, erase_chip_jedec, write_jedec}, - {"Winbond", "W29EE011", WINBOND_ID, W_29C011, 128, 128, probe_w29ee011, erase_chip_jedec, write_jedec}, - {"Winbond", "W49F002U", WINBOND_ID, W_49F002U, 256, 128, probe_jedec, erase_chip_jedec, write_49f002}, - {"Winbond", "W49V002A", WINBOND_ID, W_49V002A, 256, 128, probe_jedec, erase_chip_jedec, write_49f002}, - {"Winbond", "W49V002FA", WINBOND_ID, W_49V002FA, 256, 128, probe_jedec, erase_chip_jedec, write_49f002}, - {"Winbond", "W39V040FA", WINBOND_ID, W_39V040FA, 512, 64*1024, probe_jedec, erase_chip_jedec, write_39sf020}, - {"Winbond", "W39V040A", WINBOND_ID, W_39V040A, 512, 64*1024, probe_jedec, erase_chip_jedec, write_39sf020}, - {"Winbond", "W39V040B", WINBOND_ID, W_39V040B, 512, 64*1024, probe_jedec, erase_chip_jedec, write_39sf020}, - {"Winbond", "W39V080A", WINBOND_ID, W_39V080A, 1024, 64*1024, probe_jedec, erase_chip_jedec, write_39sf020}, - {"Winbond/N.", "W25x10", WINBOND_NEX_ID, W_25X10, 128, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"Winbond/N.", "W25x20", WINBOND_NEX_ID, W_25X20, 256, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"Winbond/N.", "W25x40", WINBOND_NEX_ID, W_25X40, 512, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"Winbond/N.", "W25x80", WINBOND_NEX_ID, W_25X80, 1024, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"ST", "M29F002B", ST_ID, ST_M29F002B, 256, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, - {"ST", "M50FW040", ST_ID, ST_M50FW040, 512, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, - {"ST", "M29W040B", ST_ID, ST_M29W040B, 512, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, - {"ST", "M29F002T/NT", ST_ID, ST_M29F002T, 256, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, - {"ST", "M29F400BT", ST_ID, ST_M29F400BT, 512, 64 * 1024, probe_m29f400bt, erase_m29f400bt, write_coreboot_m29f400bt}, - {"ST", "M50FLW040A", ST_ID, ST_M50FLW040A, 512, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, - {"ST", "M50FLW040B", ST_ID, ST_M50FLW040B, 512, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, - {"ST", "M50FLW080A", ST_ID, ST_M50FLW080A, 1024, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, - {"ST", "M50FLW080B", ST_ID, ST_M50FLW080B, 1024, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, - {"ST", "M50FW080", ST_ID, ST_M50FW080, 1024, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, - {"ST", "M50FW016", ST_ID, ST_M50FW016, 2048, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, - {"ST", "M50LPW116", ST_ID, ST_M50LPW116, 2048, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, - {"ST", "M29W010B", ST_ID, ST_M29W010B, 128, 16 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, - {"ST", "M29F040B", ST_ID, ST_M29F040B, 512, 64 * 1024, probe_29f040b, erase_29f040b, write_29f040b}, - {"ST", "M25P05-A", ST_ID, ST_M25P05A, 64, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"ST", "M25P10-A", ST_ID, ST_M25P10A, 128, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"ST", "M25P20", ST_ID, ST_M25P20, 256, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"ST", "M25P40", ST_ID, ST_M25P40, 512, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"ST", "M25P80", ST_ID, ST_M25P80, 1024, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"ST", "M25P16", ST_ID, ST_M25P16, 2048, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"ST", "M25P32", ST_ID, ST_M25P32, 4096, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"ST", "M25P64", ST_ID, ST_M25P64, 8192, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"ST", "M25P128", ST_ID, ST_M25P128, 16384, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"Intel", "82802ab", INTEL_ID, 173, 512, 64 * 1024, probe_lhf00l04, erase_lhf00l04, write_lhf00l04}, - {"Intel", "82802ac", INTEL_ID, 172, 1024, 64 * 1024, probe_lhf00l04, erase_lhf00l04, write_lhf00l04}, - {"EMST", "F49B002UA", EMST_ID, EMST_F49B002UA, 256, 4096, probe_jedec, erase_chip_jedec, write_49f002}, + {"SST49LF040B", SST_ID, SST_49LF040B, 512, 64 * 1024, + probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, + + {"SST49LF040", SST_ID, SST_49LF040, 512, 4096, + probe_jedec, erase_49lf040, write_49lf040}, + {"SST49LF020A", SST_ID, SST_49LF020A, 256, 16 * 1024, + probe_jedec, erase_49lf040, write_49lf040}, + {"SST49LF080A", SST_ID, SST_49LF080A, 1024, 4096, + probe_jedec, erase_49lf040, write_49lf040}, + {"SST49LF002A/B", SST_ID, SST_49LF002A, 256, 16 * 1024, + probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, + {"SST49LF003A/B", SST_ID, SST_49LF003A, 384, 64 * 1024, + probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, + {"SST49LF004A/B", SST_ID, SST_49LF004A, 512, 64 * 1024, + probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, + {"SST49LF008A", SST_ID, SST_49LF008A, 1024, 64 * 1024 , + probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, + {"SST49LF004C", SST_ID, SST_49LF004C, 512, 4 * 1024, + probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, + {"SST49LF008C", SST_ID, SST_49LF008C, 1024, 4 * 1024 , + probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, + {"SST49LF016C", SST_ID, SST_49LF016C, 2048, 4 * 1024 , + probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, + {"SST49LF160C", SST_ID, SST_49LF160C, 2048, 4 * 1024 , + probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, + {"Pm49FL002", PMC_ID_NOPREFIX, PMC_49FL002, 256, 16 * 1024, + probe_jedec, erase_chip_jedec, write_49fl004}, + {"Pm49FL004", PMC_ID_NOPREFIX, PMC_49FL004, 512, 64 * 1024, + probe_jedec, erase_chip_jedec, write_49fl004}, + {"Pm25LV512", PMC_ID, PMC_25LV512, 64, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV010", PMC_ID, PMC_25LV010, 128, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV020", PMC_ID, PMC_25LV020, 256, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV040", PMC_ID, PMC_25LV040, 512, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV080B", PMC_ID, PMC_25LV080B, 1024, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV016B", PMC_ID, PMC_25LV016B, 2048, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"W29C011", WINBOND_ID, W_29C011, 128, 128, + probe_jedec, erase_chip_jedec, write_jedec}, + {"W29C040P", WINBOND_ID, W_29C040P, 512, 256, + probe_jedec, erase_chip_jedec, write_jedec}, + {"W29C020C", WINBOND_ID, W_29C020C, 256, 128, + probe_jedec, erase_chip_jedec, write_jedec}, + {"W29EE011", WINBOND_ID, W_29C011, 128, 128, + probe_w29ee011,erase_chip_jedec, write_jedec}, + {"W49F002U", WINBOND_ID, W_49F002U, 256, 128, + probe_jedec, erase_chip_jedec, write_49f002}, + {"W49V002A", WINBOND_ID, W_49V002A, 256, 128, + probe_jedec, erase_chip_jedec, write_49f002}, + {"W49V002FA", WINBOND_ID, W_49V002FA, 256, 128, + probe_jedec, erase_chip_jedec, write_49f002}, + {"W39V040FA", WINBOND_ID, W_39V040FA, 512, 64*1024, + probe_jedec, erase_chip_jedec, write_39sf020}, + {"W39V040A", WINBOND_ID, W_39V040A, 512, 64*1024, + probe_jedec, erase_chip_jedec, write_39sf020}, + {"W39V040B", WINBOND_ID, W_39V040B, 512, 64*1024, + probe_jedec, erase_chip_jedec, write_39sf020}, + {"W39V080A", WINBOND_ID, W_39V080A, 1024, 64*1024, + probe_jedec, erase_chip_jedec, write_39sf020}, + {"W25x10", WINBOND_NEX_ID, W_25X10, 128, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"W25x20", WINBOND_NEX_ID, W_25X20, 256, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"W25x40", WINBOND_NEX_ID, W_25X40, 512, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"W25x80", WINBOND_NEX_ID, W_25X80, 1024, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"M29F002B", ST_ID, ST_M29F002B, 256, 64 * 1024, + probe_jedec, erase_chip_jedec, write_jedec}, + {"M50FW040", ST_ID, ST_M50FW040, 512, 64 * 1024, + probe_jedec, erase_chip_jedec, write_jedec}, + {"M29W040B", ST_ID, ST_M29W040B, 512, 64 * 1024, + probe_jedec, erase_chip_jedec, write_jedec}, + {"M29F002T/NT", ST_ID, ST_M29F002T, 256, 64 * 1024, + probe_jedec, erase_chip_jedec, write_jedec}, + {"M29F400BT", ST_ID, ST_M29F400BT, 512, 64 * 1024, + probe_m29f400bt, erase_m29f400bt, write_coreboot_m29f400bt}, + {"M50FLW040A", ST_ID, ST_M50FLW040A, 512, 64 * 1024, + probe_jedec, erase_chip_jedec, write_jedec}, + {"M50FLW040B", ST_ID, ST_M50FLW040B, 512, 64 * 1024, + probe_jedec, erase_chip_jedec, write_jedec}, + {"M50FLW080A", ST_ID, ST_M50FLW080A, 1024, 64 * 1024, + probe_jedec, erase_chip_jedec, write_jedec}, + {"M50FLW080B", ST_ID, ST_M50FLW080B, 1024, 64 * 1024, + probe_jedec, erase_chip_jedec, write_jedec}, + {"M50FW080", ST_ID, ST_M50FW080, 1024, 64 * 1024, + probe_jedec, erase_chip_jedec, write_jedec}, + {"M50FW016", ST_ID, ST_M50FW016, 2048, 64 * 1024, + probe_jedec, erase_chip_jedec, write_jedec}, + {"M50LPW116", ST_ID, ST_M50LPW116, 2048, 64 * 1024, + probe_jedec, erase_chip_jedec, write_jedec}, + {"M29W010B", ST_ID, ST_M29W010B, 128, 16 * 1024, + probe_jedec, erase_chip_jedec, write_jedec}, + {"M29F040B", ST_ID, ST_M29F040B, 512, 64 * 1024, + probe_29f040b, erase_29f040b, write_29f040b}, + {"M25P05-A", ST_ID, ST_M25P05A, 64, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"M25P10-A", ST_ID, ST_M25P10A, 128, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"M25P20", ST_ID, ST_M25P20, 256, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"M25P40", ST_ID, ST_M25P40, 512, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"M25P80", ST_ID, ST_M25P80, 1024, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"M25P16", ST_ID, ST_M25P16, 2048, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"M25P32", ST_ID, ST_M25P32, 4096, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"M25P64", ST_ID, ST_M25P64, 8192, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"M25P128", ST_ID, ST_M25P128, 16384, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"82802ab", INTEL_ID, 173, 512, 64 * 1024, + probe_lhf00l04, erase_lhf00l04, write_lhf00l04}, + {"82802ac", INTEL_ID, 172, 1024, 64 * 1024, + probe_lhf00l04, erase_lhf00l04, write_lhf00l04}, + {"F49B002UA", EMST_ID, EMST_F49B002UA, 256, 4096, + probe_jedec, erase_chip_jedec, write_49f002}, #ifndef DISABLE_DOC - {"M-Systems", "MD-2802", MSYSTEMS_ID, MSYSTEMS_MD2802, 8, 8 * 1024, probe_md2802, erase_md2802, write_md2802, read_md2802}, + {"MD-2802 (M-Systems DiskOnChip Millennium Module)", + MSYSTEMS_ID, MSYSTEMS_MD2802,8, 8 * 1024, + probe_md2802, erase_md2802, write_md2802, read_md2802}, #endif - {"Sharp", "LHF00L04", SHARP_ID, SHARP_LHF00L04, 1024, 64 * 1024, probe_lhf00l04, erase_lhf00l04, write_lhf00l04}, - {"SyncMOS", "S29C51001T", SYNCMOS_ID, S29C51001T, 128, 128, probe_jedec, erase_chip_jedec, write_49f002}, - {"SyncMOS", "S29C51002T", SYNCMOS_ID, S29C51002T, 256, 128, probe_jedec, erase_chip_jedec, write_49f002}, - {"SyncMOS", "S29C51004T", SYNCMOS_ID, S29C51004T, 512, 128, probe_jedec, erase_chip_jedec, write_49f002}, - {"SyncMOS", "S29C31004T", SYNCMOS_ID, S29C31004T, 512, 128, probe_jedec, erase_chip_jedec, write_49f002}, - {"EON", "unknown SPI chip", EON_ID_NOPREFIX,GENERIC_DEVICE_ID, 0, 0, probe_spi, NULL, NULL}, - {"Macronix", "unknown SPI chip", MX_ID, GENERIC_DEVICE_ID, 0, 0, probe_spi, NULL, NULL}, - {"PMC", "unknown SPI chip", PMC_ID, GENERIC_DEVICE_ID, 0, 0, probe_spi, NULL, NULL}, - {"SST", "unknown SPI chip", SST_ID, GENERIC_DEVICE_ID, 0, 0, probe_spi, NULL, NULL}, - {"ST", "unknown SPI chip", ST_ID, GENERIC_DEVICE_ID, 0, 0, probe_spi, NULL, NULL}, + {"LHF00L04", SHARP_ID, SHARP_LHF00L04, 1024, 64 * 1024, + probe_lhf00l04, erase_lhf00l04, write_lhf00l04}, + {"S29C51001T", SYNCMOS_ID, S29C51001T, 128, 128, + probe_jedec, erase_chip_jedec, write_49f002}, + {"S29C51002T", SYNCMOS_ID, S29C51002T, 256, 128, + probe_jedec, erase_chip_jedec, write_49f002}, + {"S29C51004T", SYNCMOS_ID, S29C51004T, 512, 128, + probe_jedec, erase_chip_jedec, write_49f002}, + {"S29C31004T", SYNCMOS_ID, S29C31004T, 512, 128, + probe_jedec, erase_chip_jedec, write_49f002}, + {"EON unknown SPI chip", EON_ID_NOPREFIX, GENERIC_DEVICE_ID, 0, 0, + probe_spi, NULL, NULL}, + {"MX unknown SPI chip", MX_ID, GENERIC_DEVICE_ID, 0, 0, + probe_spi, NULL, NULL}, + {"PMC unknown SPI chip", PMC_ID, GENERIC_DEVICE_ID, 0, 0, + probe_spi, NULL, NULL}, + {"SST unknown SPI chip", SST_ID, GENERIC_DEVICE_ID, 0, 0, + probe_spi, NULL, NULL}, + {"ST unknown SPI chip", ST_ID, GENERIC_DEVICE_ID, 0, 0, + probe_spi, NULL, NULL}, {NULL,} };
Modified: trunk/util/flashrom/flashrom.c =================================================================== --- trunk/util/flashrom/flashrom.c 2008-03-13 18:52:51 UTC (rev 3139) +++ trunk/util/flashrom/flashrom.c 2008-03-14 00:02:25 UTC (rev 3140) @@ -200,7 +200,7 @@ printf("Supported ROM chips:\n\n");
for (i = 0; flashchips[i].name != NULL; i++) - printf("%s %s\n", flashchips[i].vendor, flashchips[i].name); + printf("%s\n", flashchips[i].name); }
void usage(const char *name)
Modified: trunk/util/flashrom/sharplhf00l04.c =================================================================== --- trunk/util/flashrom/sharplhf00l04.c 2008-03-13 18:52:51 UTC (rev 3139) +++ trunk/util/flashrom/sharplhf00l04.c 2008-03-14 00:02:25 UTC (rev 3140) @@ -18,14 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-/* - * Datasheet: - * - Name: Intel 82802AB/82802AC Firmware Hub (FWH) - * - URL: http://www.intel.com/design/chipsets/datashts/290658.htm - * - PDF: http://download.intel.com/design/chipsets/datashts/29065804.pdf - * - Order number: 290658-004 - */ - #include <stdio.h> #include <stdlib.h> #include "flash.h"