flashrom

flashrom@flashrom.org

1 participants
9142 discussions

[PATCH] SPI autoerase before write
by Carl-Daniel Hailfinger 10 Aug '09

10 Aug '09

Some SPI chip drivers and the generic 1-byte SPI chip write functions didn't include the automatic erase present in other chip drivers. Since the majority is definitely auto-erase, change the remaining explicit-erase cases to be auto-erase as well. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-spi_autoerase_before_write/flash.h =================================================================== --- flashrom-spi_autoerase_before_write/flash.h (revision 672) +++ flashrom-spi_autoerase_before_write/flash.h (working copy) @@ -505,7 +505,6 @@ int it8716f_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len); -int it8716f_spi_chip_write_1(struct flashchip *flash, uint8_t *buf); int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf); /* sb600spi.c */ Index: flashrom-spi_autoerase_before_write/it87spi.c =================================================================== --- flashrom-spi_autoerase_before_write/it87spi.c (revision 672) +++ flashrom-spi_autoerase_before_write/it87spi.c (working copy) @@ -248,32 +248,6 @@ } /* - * Program chip using firmware cycle byte programming. (SLOW!) - * This is for chips which can only handle one byte writes - * and for chips where memory mapped programming is impossible due to - * size constraints in IT87* (over 512 kB) - */ -int it8716f_spi_chip_write_1(struct flashchip *flash, uint8_t *buf) -{ - int total_size = 1024 * flash->total_size; - int i; - int result; - - fast_spi = 0; - - spi_disable_blockprotect(); - for (i = 0; i < total_size; i++) { - result = spi_byte_program(i, buf[i]); - while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) - programmer_delay(10); - } - /* resume normal ops... */ - OUTB(0x20, it8716f_flashport); - - return 0; -} - -/* * IT8716F only allows maximum of 512 kb SPI mapped to LPC memory cycles * Need to read this big flash using firmware cycles 3 byte at a time. */ @@ -301,8 +275,16 @@ * mapped access. */ if ((programmer == PROGRAMMER_IT87SPI) || (total_size > 512 * 1024)) { - it8716f_spi_chip_write_1(flash, buf); + spi_chip_write_1(flash, buf); } else { + spi_disable_blockprotect(); + /* Erase first */ + printf("Erasing flash before programming... "); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } + printf("done.\n"); for (i = 0; i < total_size / 256; i++) { it8716f_spi_page_program(flash, i, buf); } Index: flashrom-spi_autoerase_before_write/spi.c =================================================================== --- flashrom-spi_autoerase_before_write/spi.c (revision 672) +++ flashrom-spi_autoerase_before_write/spi.c (working copy) @@ -963,6 +963,13 @@ int i; spi_disable_blockprotect(); + /* Erase first */ + printf("Erasing flash before programming... "); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } + printf("done.\n"); for (i = 0; i < total_size; i++) { spi_byte_program(i, buf[i]); while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) Index: flashrom-spi_autoerase_before_write/ft2232_spi.c =================================================================== --- flashrom-spi_autoerase_before_write/ft2232_spi.c (revision 672) +++ flashrom-spi_autoerase_before_write/ft2232_spi.c (working copy) @@ -271,6 +271,14 @@ int total_size = 1024 * flash->total_size; int i; + spi_disable_blockprotect(); + /* Erase first */ + printf("Erasing flash before programming... "); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } + printf("done.\n"); printf_debug("total_size is %d\n", total_size); for (i = 0; i < total_size; i += 256) { int l, r; @@ -281,14 +289,12 @@ if ((r = spi_nbyte_program(i, &buf[i], l))) { fprintf(stderr, "%s: write fail %d\n", __FUNCTION__, r); - // spi_write_disable(); chip does this for us return 1; } while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) /* loop */; } - // spi_write_disable(); chip does this for us return 0; } Index: flashrom-spi_autoerase_before_write/wbsio_spi.c =================================================================== --- flashrom-spi_autoerase_before_write/wbsio_spi.c (revision 672) +++ flashrom-spi_autoerase_before_write/wbsio_spi.c (working copy) @@ -183,29 +183,17 @@ return 1; } - read_memmapped(flash, buf, start, len); - return 0; + return read_memmapped(flash, buf, start, len); } int wbsio_spi_write_1(struct flashchip *flash, uint8_t *buf) { - int pos, size = flash->total_size * 1024; - int result; + int size = flash->total_size * 1024; - if (flash->total_size > 1024) { + if (size > 1024 * 1024) { fprintf(stderr, "%s: Winbond saved on 4 register bits so max chip size is 1024 KB!\n", __func__); return 1; } - if (flash->erase(flash)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - for (pos = 0; pos < size; pos++) { - result = spi_byte_program(pos, buf[pos]); - while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) - programmer_delay(10); - } - spi_write_disable(); - return 0; + return spi_chip_write_1(flash, buf); } Index: flashrom-spi_autoerase_before_write/sb600spi.c =================================================================== --- flashrom-spi_autoerase_before_write/sb600spi.c (revision 672) +++ flashrom-spi_autoerase_before_write/sb600spi.c (working copy) @@ -45,12 +45,14 @@ return spi_read_chunked(flash, buf, start, len, 8); } +/* FIXME: SB600 can write 5 bytes per transaction. */ int sb600_spi_write_1(struct flashchip *flash, uint8_t *buf) { int rc = 0, i; int total_size = flash->total_size * 1024; int result; + spi_disable_blockprotect(); /* Erase first */ printf("Erasing flash before programming... "); if (flash->erase(flash)) { @@ -61,7 +63,6 @@ printf("Programming flash"); for (i = 0; i < total_size; i++, buf++) { - spi_disable_blockprotect(); result = spi_byte_program(i, *buf); /* wait program complete. */ if (i % 0x8000 == 0) -- http://www.hailfinger.org/

2 2

[commit] r673 - trunk
by svn＠flashrom.org 10 Aug '09

10 Aug '09

Author: hailfinger Date: 2009-08-10 04:29:21 +0200 (Mon, 10 Aug 2009) New Revision: 673 Modified: trunk/flash.h trunk/ft2232_spi.c trunk/it87spi.c trunk/sb600spi.c trunk/spi.c trunk/wbsio_spi.c Log: Some SPI chip drivers and the generic 1-byte SPI chip write functions didn't include the automatic erase present in other chip drivers. Since the majority is definitely auto-erase, change the remaining explicit-erase cases to be auto-erase as well. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Carlos Arnau Perez <cemede(a)gmail.com> Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-08-09 21:50:24 UTC (rev 672) +++ trunk/flash.h 2009-08-10 02:29:21 UTC (rev 673) @@ -505,7 +505,6 @@ int it8716f_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len); -int it8716f_spi_chip_write_1(struct flashchip *flash, uint8_t *buf); int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf); /* sb600spi.c */ Modified: trunk/ft2232_spi.c =================================================================== --- trunk/ft2232_spi.c 2009-08-09 21:50:24 UTC (rev 672) +++ trunk/ft2232_spi.c 2009-08-10 02:29:21 UTC (rev 673) @@ -271,6 +271,14 @@ int total_size = 1024 * flash->total_size; int i; + spi_disable_blockprotect(); + /* Erase first */ + printf("Erasing flash before programming... "); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } + printf("done.\n"); printf_debug("total_size is %d\n", total_size); for (i = 0; i < total_size; i += 256) { int l, r; @@ -281,14 +289,12 @@ if ((r = spi_nbyte_program(i, &buf[i], l))) { fprintf(stderr, "%s: write fail %d\n", __FUNCTION__, r); - // spi_write_disable(); chip does this for us return 1; } while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) /* loop */; } - // spi_write_disable(); chip does this for us return 0; } Modified: trunk/it87spi.c =================================================================== --- trunk/it87spi.c 2009-08-09 21:50:24 UTC (rev 672) +++ trunk/it87spi.c 2009-08-10 02:29:21 UTC (rev 673) @@ -248,32 +248,6 @@ } /* - * Program chip using firmware cycle byte programming. (SLOW!) - * This is for chips which can only handle one byte writes - * and for chips where memory mapped programming is impossible due to - * size constraints in IT87* (over 512 kB) - */ -int it8716f_spi_chip_write_1(struct flashchip *flash, uint8_t *buf) -{ - int total_size = 1024 * flash->total_size; - int i; - int result; - - fast_spi = 0; - - spi_disable_blockprotect(); - for (i = 0; i < total_size; i++) { - result = spi_byte_program(i, buf[i]); - while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) - programmer_delay(10); - } - /* resume normal ops... */ - OUTB(0x20, it8716f_flashport); - - return 0; -} - -/* * IT8716F only allows maximum of 512 kb SPI mapped to LPC memory cycles * Need to read this big flash using firmware cycles 3 byte at a time. */ @@ -301,8 +275,16 @@ * mapped access. */ if ((programmer == PROGRAMMER_IT87SPI) || (total_size > 512 * 1024)) { - it8716f_spi_chip_write_1(flash, buf); + spi_chip_write_1(flash, buf); } else { + spi_disable_blockprotect(); + /* Erase first */ + printf("Erasing flash before programming... "); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } + printf("done.\n"); for (i = 0; i < total_size / 256; i++) { it8716f_spi_page_program(flash, i, buf); } Modified: trunk/sb600spi.c =================================================================== --- trunk/sb600spi.c 2009-08-09 21:50:24 UTC (rev 672) +++ trunk/sb600spi.c 2009-08-10 02:29:21 UTC (rev 673) @@ -45,12 +45,14 @@ return spi_read_chunked(flash, buf, start, len, 8); } +/* FIXME: SB600 can write 5 bytes per transaction. */ int sb600_spi_write_1(struct flashchip *flash, uint8_t *buf) { int rc = 0, i; int total_size = flash->total_size * 1024; int result; + spi_disable_blockprotect(); /* Erase first */ printf("Erasing flash before programming... "); if (flash->erase(flash)) { @@ -61,7 +63,6 @@ printf("Programming flash"); for (i = 0; i < total_size; i++, buf++) { - spi_disable_blockprotect(); result = spi_byte_program(i, *buf); /* wait program complete. */ if (i % 0x8000 == 0) Modified: trunk/spi.c =================================================================== --- trunk/spi.c 2009-08-09 21:50:24 UTC (rev 672) +++ trunk/spi.c 2009-08-10 02:29:21 UTC (rev 673) @@ -963,6 +963,13 @@ int i; spi_disable_blockprotect(); + /* Erase first */ + printf("Erasing flash before programming... "); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } + printf("done.\n"); for (i = 0; i < total_size; i++) { spi_byte_program(i, buf[i]); while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) Modified: trunk/wbsio_spi.c =================================================================== --- trunk/wbsio_spi.c 2009-08-09 21:50:24 UTC (rev 672) +++ trunk/wbsio_spi.c 2009-08-10 02:29:21 UTC (rev 673) @@ -183,29 +183,17 @@ return 1; } - read_memmapped(flash, buf, start, len); - return 0; + return read_memmapped(flash, buf, start, len); } int wbsio_spi_write_1(struct flashchip *flash, uint8_t *buf) { - int pos, size = flash->total_size * 1024; - int result; + int size = flash->total_size * 1024; - if (flash->total_size > 1024) { + if (size > 1024 * 1024) { fprintf(stderr, "%s: Winbond saved on 4 register bits so max chip size is 1024 KB!\n", __func__); return 1; } - if (flash->erase(flash)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - for (pos = 0; pos < size; pos++) { - result = spi_byte_program(pos, buf[pos]); - while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) - programmer_delay(10); - } - spi_write_disable(); - return 0; + return spi_chip_write_1(flash, buf); }

1 0

[PATCH] Fix another SB600 SPI corner case
by Carl-Daniel Hailfinger 10 Aug '09

10 Aug '09

SB600 SPI has an off-by-one error during read, and that hardware issue is not documented anywhere yet. r661 tried to work around this, but the fix had unpleasant side effects. The new workaround only triggers if readcnt is nonzero, eliminating all possible interactions with write-only commands. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-spi_sb600_offbyone_fixfix/sb600spi.c =================================================================== --- flashrom-spi_sb600_offbyone_fixfix/sb600spi.c (revision 672) +++ flashrom-spi_sb600_offbyone_fixfix/sb600spi.c (working copy) @@ -118,9 +118,13 @@ * an opcode and no additional data/address, the SPI controller will * read one byte too few from the chip. Basically, the last byte of * the chip response is discarded and will not end up in the FIFO. - * It is unclear if the CS# line is set high too early as well. + * It is unclear if the CS# line is set high too early as well, but + * it seems CS# line timing matches the bytecounts we specify, so there + * is a mismatch between FIFO content count and CS# timing. + * Only trigger this if readcnt is nonzero on the assumption that + * reading more doesn't hurt if we already read soemthing. */ - readoffby1 = (writecnt) ? 0 : 1; + readoffby1 = (!writecnt && readcnt) ? 1 : 0; mmio_writeb((readcnt + readoffby1) << 4 | (writecnt), sb600_spibar + 1); mmio_writeb(cmd, sb600_spibar + 0); -- http://www.hailfinger.org/

1 1

[PATCH] ioperm+include cleanup
by Carl-Daniel Hailfinger 09 Aug '09

09 Aug '09

Releasing IO permissions was done by hand everywhere. Use a proper abstraction. Kill unneeded #include statements. Move #include statements for serprog inside #ifdef. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-cleanup/flash.h =================================================================== --- flashrom-cleanup/flash.h (Revision 671) +++ flashrom-cleanup/flash.h (Arbeitskopie) @@ -308,6 +308,7 @@ struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, uint16_t card_vendor, uint16_t card_device); void get_io_perms(void); +void release_io_perms(void); int internal_init(void); int internal_shutdown(void); void internal_chip_writeb(uint8_t val, chipaddr addr); Index: flashrom-cleanup/serprog.c =================================================================== --- flashrom-cleanup/serprog.c (Revision 671) +++ flashrom-cleanup/serprog.c (Arbeitskopie) @@ -21,6 +21,13 @@ #include <string.h> #include <stdlib.h> +#include <stdio.h> +#include "flash.h" + +char *serprog_param = NULL; + +#if SERPROG_SUPPORT == 1 + #include <ctype.h> #include <fcntl.h> #include <sys/types.h> @@ -31,16 +38,10 @@ #include <netdb.h> #include <sys/stat.h> #include <errno.h> -#include <stdio.h> #include <unistd.h> #include <inttypes.h> #include <termios.h> -#include "flash.h" -char *serprog_param = NULL; - -#if SERPROG_SUPPORT == 1 - #define MSGHEADER "serprog:" #define S_ACK 0x06 Index: flashrom-cleanup/nic3com.c =================================================================== --- flashrom-cleanup/nic3com.c (Revision 671) +++ flashrom-cleanup/nic3com.c (Arbeitskopie) @@ -20,10 +20,7 @@ #include <stdlib.h> #include <string.h> -#include <fcntl.h> #include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" #define BIOS_ROM_ADDR 0x04 @@ -99,9 +96,7 @@ free(pcidev_bdf); pci_cleanup(pacc); -#if defined(__FreeBSD__) || defined(__DragonFly__) - close(io_fd); -#endif + release_io_perms(); return 0; } Index: flashrom-cleanup/satasii.c =================================================================== --- flashrom-cleanup/satasii.c (Revision 671) +++ flashrom-cleanup/satasii.c (Arbeitskopie) @@ -22,10 +22,6 @@ #include <stdlib.h> #include <string.h> -#include <fcntl.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" #define PCI_VENDOR_ID_SII 0x1095 @@ -77,9 +73,7 @@ { free(pcidev_bdf); pci_cleanup(pacc); -#if defined(__FreeBSD__) || defined(__DragonFly__) - close(io_fd); -#endif + release_io_perms(); return 0; } Index: flashrom-cleanup/internal.c =================================================================== --- flashrom-cleanup/internal.c (Revision 671) +++ flashrom-cleanup/internal.c (Arbeitskopie) @@ -95,6 +95,13 @@ } } +void release_io_perms(void) +{ +#if defined(__FreeBSD__) || defined(__DragonFly__) + close(io_fd); +#endif +} + int internal_init(void) { int ret = 0; @@ -128,9 +135,7 @@ int internal_shutdown(void) { -#if defined(__FreeBSD__) || defined(__DragonFly__) - close(io_fd); -#endif + release_io_perms(); return 0; } -- http://www.hailfinger.org/

2 4

[commit] r672 - trunk
by svn＠flashrom.org 09 Aug '09

09 Aug '09

Author: hailfinger Date: 2009-08-09 23:50:24 +0200 (Sun, 09 Aug 2009) New Revision: 672 Modified: trunk/flash.h trunk/internal.c trunk/nic3com.c trunk/satasii.c Log: Releasing IO permissions was done by hand everywhere. Use a proper abstraction. Kill unneeded #include statements. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-08-09 12:44:08 UTC (rev 671) +++ trunk/flash.h 2009-08-09 21:50:24 UTC (rev 672) @@ -308,6 +308,7 @@ struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, uint16_t card_vendor, uint16_t card_device); void get_io_perms(void); +void release_io_perms(void); int internal_init(void); int internal_shutdown(void); void internal_chip_writeb(uint8_t val, chipaddr addr); Modified: trunk/internal.c =================================================================== --- trunk/internal.c 2009-08-09 12:44:08 UTC (rev 671) +++ trunk/internal.c 2009-08-09 21:50:24 UTC (rev 672) @@ -95,6 +95,13 @@ } } +void release_io_perms(void) +{ +#if defined(__FreeBSD__) || defined(__DragonFly__) + close(io_fd); +#endif +} + int internal_init(void) { int ret = 0; @@ -128,9 +135,7 @@ int internal_shutdown(void) { -#if defined(__FreeBSD__) || defined(__DragonFly__) - close(io_fd); -#endif + release_io_perms(); return 0; } Modified: trunk/nic3com.c =================================================================== --- trunk/nic3com.c 2009-08-09 12:44:08 UTC (rev 671) +++ trunk/nic3com.c 2009-08-09 21:50:24 UTC (rev 672) @@ -20,10 +20,7 @@ #include <stdlib.h> #include <string.h> -#include <fcntl.h> #include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" #define BIOS_ROM_ADDR 0x04 @@ -99,9 +96,7 @@ free(pcidev_bdf); pci_cleanup(pacc); -#if defined(__FreeBSD__) || defined(__DragonFly__) - close(io_fd); -#endif + release_io_perms(); return 0; } Modified: trunk/satasii.c =================================================================== --- trunk/satasii.c 2009-08-09 12:44:08 UTC (rev 671) +++ trunk/satasii.c 2009-08-09 21:50:24 UTC (rev 672) @@ -22,10 +22,6 @@ #include <stdlib.h> #include <string.h> -#include <fcntl.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" #define PCI_VENDOR_ID_SII 0x1095 @@ -77,9 +73,7 @@ { free(pcidev_bdf); pci_cleanup(pacc); -#if defined(__FreeBSD__) || defined(__DragonFly__) - close(io_fd); -#endif + release_io_perms(); return 0; }

1 0

some questions about flashrom in windows edition
by zhou 09 Aug '09

09 Aug '09

hello, my honor! I am very interested in the program of flashrom,especially of the edition in windows,now I had worked on it for a few months,but there is some questions I couldn't understand, I wonder if you could offer me some help.The questions are showed as below: * 1,what's the use of the source code "Board_enable.c"? It looks so strange to me that I hardly understand? How I get something helpful? * 2,In order to modify the program under GNU,how can I test it? And how to debug it in details in windows? Is there any software ? * 3,As it is a complex program, where can I find out all the datasheets suitable? Are they free? I am looking forward your answers and please reply as soon as possible . My best wishes! james

2 1

[PATCH] Clean up before Windows support merge
by Carl-Daniel Hailfinger 09 Aug '09

09 Aug '09

Stefan pointed out a few issues with the current code which have to be worked around in the Windows support patch. Fix them. Remove unnecessary #include files. Serprog compilation is now controlled by a Makefile variable. Replace munmap with physunmap where appropriate. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-winprepare/pcidev.c =================================================================== --- flashrom-winprepare/pcidev.c (Revision 670) +++ flashrom-winprepare/pcidev.c (Arbeitskopie) @@ -20,10 +20,7 @@ #include <stdlib.h> #include <string.h> -#include <fcntl.h> #include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" uint32_t io_base_addr; Index: flashrom-winprepare/serprog.c =================================================================== --- flashrom-winprepare/serprog.c (Revision 670) +++ flashrom-winprepare/serprog.c (Arbeitskopie) @@ -39,8 +39,6 @@ char *serprog_param = NULL; -#define SERPROG_SUPPORT 1 - #if SERPROG_SUPPORT == 1 #define MSGHEADER "serprog:" Index: flashrom-winprepare/sst49lfxxxc.c =================================================================== --- flashrom-winprepare/sst49lfxxxc.c (Revision 670) +++ flashrom-winprepare/sst49lfxxxc.c (Arbeitskopie) @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <errno.h> -#include <fcntl.h> -#include <sys/mman.h> #include <stdlib.h> #include "flash.h" Index: flashrom-winprepare/Makefile =================================================================== --- flashrom-winprepare/Makefile (Revision 670) +++ flashrom-winprepare/Makefile (Arbeitskopie) @@ -68,6 +68,8 @@ $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS) FEATURE_CFLAGS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") +# Always enable serprog for now. Needs to be disabled on Windows. +FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1' FEATURE_LIBS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi") Index: flashrom-winprepare/dummyflasher.c =================================================================== --- flashrom-winprepare/dummyflasher.c (Revision 670) +++ flashrom-winprepare/dummyflasher.c (Arbeitskopie) @@ -21,10 +21,7 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> -#include <fcntl.h> #include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" char *dummytype = NULL; Index: flashrom-winprepare/chipset_enable.c =================================================================== --- flashrom-winprepare/chipset_enable.c (Revision 670) +++ flashrom-winprepare/chipset_enable.c (Arbeitskopie) @@ -29,7 +29,6 @@ #include <string.h> #include <sys/types.h> #include <sys/stat.h> -#include <sys/mman.h> #include <fcntl.h> #include "flash.h" @@ -968,7 +967,7 @@ } /* 4. Clean up */ - munmap(mmcr, getpagesize()); + physunmap(mmcr, getpagesize()); return 0; } Index: flashrom-winprepare/sb600spi.c =================================================================== --- flashrom-winprepare/sb600spi.c (Revision 670) +++ flashrom-winprepare/sb600spi.c (Arbeitskopie) @@ -21,7 +21,6 @@ */ #include <string.h> -#include <sys/mman.h> #include "flash.h" #include "spi.h" Index: flashrom-winprepare/ichspi.c =================================================================== --- flashrom-winprepare/ichspi.c (Revision 670) +++ flashrom-winprepare/ichspi.c (Arbeitskopie) @@ -33,7 +33,6 @@ */ #include <string.h> -#include <sys/mman.h> #include "flash.h" #include "spi.h" Index: flashrom-winprepare/cbtable.c =================================================================== --- flashrom-winprepare/cbtable.c (Revision 670) +++ flashrom-winprepare/cbtable.c (Arbeitskopie) @@ -22,11 +22,8 @@ */ #include <stdlib.h> -#include <fcntl.h> #include <sys/types.h> #include <string.h> -#include <errno.h> -#include <sys/mman.h> #include "flash.h" #include "coreboot_tables.h" -- http://www.hailfinger.org/

2 2

[commit] r671 - trunk
by svn＠flashrom.org 09 Aug '09

09 Aug '09

Author: hailfinger Date: 2009-08-09 14:44:08 +0200 (Sun, 09 Aug 2009) New Revision: 671 Modified: trunk/Makefile trunk/cbtable.c trunk/chipset_enable.c trunk/dummyflasher.c trunk/ichspi.c trunk/pcidev.c trunk/sb600spi.c trunk/serprog.c trunk/sst49lfxxxc.c Log: Remove unnecessary #include files. Serprog compilation is now controlled by a Makefile variable. Replace munmap with physunmap where appropriate. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/Makefile 2009-08-09 12:44:08 UTC (rev 671) @@ -68,6 +68,8 @@ $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS) FEATURE_CFLAGS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") +# Always enable serprog for now. Needs to be disabled on Windows. +FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1' FEATURE_LIBS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi") Modified: trunk/cbtable.c =================================================================== --- trunk/cbtable.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/cbtable.c 2009-08-09 12:44:08 UTC (rev 671) @@ -22,11 +22,8 @@ */ #include <stdlib.h> -#include <fcntl.h> #include <sys/types.h> #include <string.h> -#include <errno.h> -#include <sys/mman.h> #include "flash.h" #include "coreboot_tables.h" Modified: trunk/chipset_enable.c =================================================================== --- trunk/chipset_enable.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/chipset_enable.c 2009-08-09 12:44:08 UTC (rev 671) @@ -29,7 +29,6 @@ #include <string.h> #include <sys/types.h> #include <sys/stat.h> -#include <sys/mman.h> #include <fcntl.h> #include "flash.h" @@ -968,7 +967,7 @@ } /* 4. Clean up */ - munmap(mmcr, getpagesize()); + physunmap(mmcr, getpagesize()); return 0; } Modified: trunk/dummyflasher.c =================================================================== --- trunk/dummyflasher.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/dummyflasher.c 2009-08-09 12:44:08 UTC (rev 671) @@ -21,10 +21,7 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> -#include <fcntl.h> #include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" char *dummytype = NULL; Modified: trunk/ichspi.c =================================================================== --- trunk/ichspi.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/ichspi.c 2009-08-09 12:44:08 UTC (rev 671) @@ -33,7 +33,6 @@ */ #include <string.h> -#include <sys/mman.h> #include "flash.h" #include "spi.h" Modified: trunk/pcidev.c =================================================================== --- trunk/pcidev.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/pcidev.c 2009-08-09 12:44:08 UTC (rev 671) @@ -20,10 +20,7 @@ #include <stdlib.h> #include <string.h> -#include <fcntl.h> #include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" uint32_t io_base_addr; Modified: trunk/sb600spi.c =================================================================== --- trunk/sb600spi.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/sb600spi.c 2009-08-09 12:44:08 UTC (rev 671) @@ -21,7 +21,6 @@ */ #include <string.h> -#include <sys/mman.h> #include "flash.h" #include "spi.h" Modified: trunk/serprog.c =================================================================== --- trunk/serprog.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/serprog.c 2009-08-09 12:44:08 UTC (rev 671) @@ -39,8 +39,6 @@ char *serprog_param = NULL; -#define SERPROG_SUPPORT 1 - #if SERPROG_SUPPORT == 1 #define MSGHEADER "serprog:" Modified: trunk/sst49lfxxxc.c =================================================================== --- trunk/sst49lfxxxc.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/sst49lfxxxc.c 2009-08-09 12:44:08 UTC (rev 671) @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <errno.h> -#include <fcntl.h> -#include <sys/mman.h> #include <stdlib.h> #include "flash.h"

1 0

GSoCs Winflashrom versus r126.
by Luc Verhaegen 09 Aug '09

09 Aug '09

3 4

AMIC A290021T-70
by Helmut Adrigan 08 Aug '09

08 Aug '09

hi i found this AMIC A290021T-70 chip in my ABIT BX133-Raid V 1.01 (Intel 440BX Chipset) Mainboard. greetz

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom