flashrom July 2013

flashrom@flashrom.org

31 participants
142 discussions

Re: [flashrom] [PATCH 08/10] print.c: Fix multiline support.
by Carl-Daniel Hailfinger 17 Jul '13

17 Jul '13

Am 10.07.2013 21:17 schrieb Stefan Tauner: > - Use the reentrant tokenizer version strtok_r to break up vendor and model > names in print.c > - Add implementation of strtok_r for mingw (posix only) > - Free allocated temporary memory again. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > print.c | 49 ++++++++++++++++++++++++++++++++++++------------- > 1 file changed, 36 insertions(+), 13 deletions(-) > > diff --git a/print.c b/print.c > index 6ca2a57..b163cbf 100644 > --- a/print.c > +++ b/print.c > @@ -25,6 +25,26 @@ > #include "flash.h" > #include "programmer.h" > > +#ifdef __MINGW32__ > +static char* strtok_r(char *str, const char *delim, char **nextp) > +{ > + if (str == NULL) > + str = *nextp; > + > + str += strspn(str, delim); /* Skip leading delimiters */ > + if (*str == '\0') > + return NULL; > + > + char *ret = str; > + str += strcspn(str, delim); /* Find end of token */ > + if (*str != '\0') > + *str++ = '\0'; > + > + *nextp = str; > + return ret; > +} > +#endif OK. In the future, we may want to make strtok_r a wrapper around strtok_s (which is in C11). It might take some time for the C library on various platforms to catch up on this, though. > + > /* > * Return a string corresponding to the bustype parameter. > * Memory is obtained with malloc() and must be freed with free() by the caller. > @@ -69,7 +89,8 @@ static int print_supported_chips(void) > int maxtypelen = strlen("Type") + 1; > const struct flashchip *chip; > char *s; > - char *tmpven, *tmpdev; > + char *ven, *dev; > + char *tmpven, *tmpdev, *tmpven_save, *tmpdev_save; > int tmpvenlen, tmpdevlen, curvenlen, curdevlen; > > /* calculate maximum column widths and by iterating over all chips */ > @@ -179,17 +200,17 @@ static int print_supported_chips(void) > * - after all other values are printed print the surplus tokens > * on fresh lines > */ > - tmpven = malloc(strlen(chip->vendor) + 1); > - if (tmpven == NULL) { > + ven = malloc(strlen(chip->vendor) + 1); > + if (ven == NULL) { > msg_gerr("Out of memory!\n"); > return 1; > } > - strcpy(tmpven, chip->vendor); > + strcpy(ven, chip->vendor); > > - tmpven = strtok(tmpven, delim); > + tmpven = strtok_r(ven, delim, &tmpven_save); > msg_ginfo("%s", tmpven); > curvenlen = strlen(tmpven); > - while ((tmpven = strtok(NULL, delim)) != NULL) { > + while ((tmpven = strtok_r(NULL, delim, &tmpven_save)) != NULL) { > msg_ginfo("%s", delim); > curvenlen++; > tmpvenlen = strlen(tmpven); > @@ -203,17 +224,17 @@ static int print_supported_chips(void) > msg_ginfo(" "); > > /* support for multiline device names as above */ > - tmpdev = malloc(strlen(chip->name) + 1); > - if (tmpdev == NULL) { > + dev = malloc(strlen(chip->name) + 1); > + if (dev == NULL) { > msg_gerr("Out of memory!\n"); > return 1; > } > - strcpy(tmpdev, chip->name); > + strcpy(dev, chip->name); > > - tmpdev = strtok(tmpdev, delim); > + tmpdev = strtok_r(dev, delim, &tmpdev_save); > msg_ginfo("%s", tmpdev); > curdevlen = strlen(tmpdev); > - while ((tmpdev = strtok(NULL, delim)) != NULL) { > + while ((tmpdev = strtok_r(NULL, delim, &tmpdev_save)) != NULL) { > msg_ginfo("%s", delim); > curdevlen++; > tmpdevlen = strlen(tmpdev); > @@ -287,7 +308,7 @@ static int print_supported_chips(void) > if (tmpven != NULL){ > msg_ginfo("%s", tmpven); > curvenlen = strlen(tmpven); > - while ((tmpven = strtok(NULL, delim)) != NULL) { > + while ((tmpven = strtok_r(NULL, delim, &tmpven_save)) != NULL) { > msg_ginfo("%s", delim); > curvenlen++; > tmpvenlen = strlen(tmpven); > @@ -306,7 +327,7 @@ static int print_supported_chips(void) > if (tmpdev != NULL){ > msg_ginfo("%s", tmpdev); > curdevlen = strlen(tmpdev); > - while ((tmpdev = strtok(NULL, delim)) != NULL) { > + while ((tmpdev = strtok_r(NULL, delim, &tmpdev_save)) != NULL) { > msg_ginfo("%s", delim); > curdevlen++; > tmpdevlen = strlen(tmpdev); > @@ -319,6 +340,8 @@ static int print_supported_chips(void) > } > } > msg_ginfo("\n"); > + free(ven); > + free(dev); > } > > return 0; Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Thanks for fixing this! Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1700 - trunk
by repository service 17 Jul '13

17 Jul '13

Author: stefanct Date: Wed Jul 17 11:28:00 2013 New Revision: 1700 URL: http://flashrom.org/trac/flashrom/changeset/1700 Log: print.c: Fix multiline support. - Use the reentrant tokenizer version strtok_r to break up vendor and model names in print.c. - Add implementation of strtok_r for mingw (strtok_r is POSIX only). - Free allocated temporary memory again. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/print.c Modified: trunk/print.c ============================================================================== --- trunk/print.c Mon Jul 15 12:47:53 2013 (r1699) +++ trunk/print.c Wed Jul 17 11:28:00 2013 (r1700) @@ -3,6 +3,7 @@ * * Copyright (C) 2009 Uwe Hermann <uwe(a)hermann-uwe.de> * Copyright (C) 2009 Carl-Daniel Hailfinger + * Copyright (C) 2011-2013 Stefan Tauner * * 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 @@ -25,6 +26,27 @@ #include "flash.h" #include "programmer.h" +/* FIXME: Find a better solution for MinGW. Maybe wrap strtok_s (C11) below if it becomes available */ +#ifdef __MINGW32__ +static char* strtok_r(char *str, const char *delim, char **nextp) +{ + if (str == NULL) + str = *nextp; + + str += strspn(str, delim); /* Skip leading delimiters */ + if (*str == '\0') + return NULL; + + char *ret = str; + str += strcspn(str, delim); /* Find end of token */ + if (*str != '\0') + *str++ = '\0'; + + *nextp = str; + return ret; +} +#endif + /* * Return a string corresponding to the bustype parameter. * Memory is obtained with malloc() and must be freed with free() by the caller. @@ -69,7 +91,8 @@ int maxtypelen = strlen("Type") + 1; const struct flashchip *chip; char *s; - char *tmpven, *tmpdev; + char *ven, *dev; + char *tmpven, *tmpdev, *tmpven_save, *tmpdev_save; int tmpvenlen, tmpdevlen, curvenlen, curdevlen; /* calculate maximum column widths and by iterating over all chips */ @@ -179,17 +202,17 @@ * - after all other values are printed print the surplus tokens * on fresh lines */ - tmpven = malloc(strlen(chip->vendor) + 1); - if (tmpven == NULL) { + ven = malloc(strlen(chip->vendor) + 1); + if (ven == NULL) { msg_gerr("Out of memory!\n"); return 1; } - strcpy(tmpven, chip->vendor); + strcpy(ven, chip->vendor); - tmpven = strtok(tmpven, delim); + tmpven = strtok_r(ven, delim, &tmpven_save); msg_ginfo("%s", tmpven); curvenlen = strlen(tmpven); - while ((tmpven = strtok(NULL, delim)) != NULL) { + while ((tmpven = strtok_r(NULL, delim, &tmpven_save)) != NULL) { msg_ginfo("%s", delim); curvenlen++; tmpvenlen = strlen(tmpven); @@ -203,17 +226,17 @@ msg_ginfo(" "); /* support for multiline device names as above */ - tmpdev = malloc(strlen(chip->name) + 1); - if (tmpdev == NULL) { + dev = malloc(strlen(chip->name) + 1); + if (dev == NULL) { msg_gerr("Out of memory!\n"); return 1; } - strcpy(tmpdev, chip->name); + strcpy(dev, chip->name); - tmpdev = strtok(tmpdev, delim); + tmpdev = strtok_r(dev, delim, &tmpdev_save); msg_ginfo("%s", tmpdev); curdevlen = strlen(tmpdev); - while ((tmpdev = strtok(NULL, delim)) != NULL) { + while ((tmpdev = strtok_r(NULL, delim, &tmpdev_save)) != NULL) { msg_ginfo("%s", delim); curdevlen++; tmpdevlen = strlen(tmpdev); @@ -287,7 +310,7 @@ if (tmpven != NULL){ msg_ginfo("%s", tmpven); curvenlen = strlen(tmpven); - while ((tmpven = strtok(NULL, delim)) != NULL) { + while ((tmpven = strtok_r(NULL, delim, &tmpven_save)) != NULL) { msg_ginfo("%s", delim); curvenlen++; tmpvenlen = strlen(tmpven); @@ -306,7 +329,7 @@ if (tmpdev != NULL){ msg_ginfo("%s", tmpdev); curdevlen = strlen(tmpdev); - while ((tmpdev = strtok(NULL, delim)) != NULL) { + while ((tmpdev = strtok_r(NULL, delim, &tmpdev_save)) != NULL) { msg_ginfo("%s", delim); curdevlen++; tmpdevlen = strlen(tmpdev); @@ -319,6 +342,8 @@ } } msg_ginfo("\n"); + free(ven); + free(dev); } return 0;

1 0

Windows and flashrom
by CJ HUDSON 15 Jul '13

15 Jul '13

Hi, I have successfully used flashrom before and donated to the project. However, I have stopped using Ubuntu because I was experimenting with overclocking and am now building a new PC and have to do a lot of restarts which was a pain with dual boot Windows/ Ubuntu. Hence I am now trying to get flashrom working with windows 7. Please can you help? I get the error message described in the attached .jpg file and cannot seem to install flashrom, despite downloading WinZip and Open Freely (http://www.winzip.com/win/en/index.htm and http://www.openfreely.com/ respectively.) Chris Hudson Esq. A non-text attachment has been stripped. Its content was: flashrom.exe - System Error The program can't start because libusb0.dll is missing from your computer. Try reinstalling the program to fix this problem.

2 2

Re: [flashrom] [PATCH 10/10] Differentiate ultimate error messages depending on programmer used.
by Carl-Daniel Hailfinger 15 Jul '13

15 Jul '13

Am 10.07.2013 21:17 schrieb Stefan Tauner: > With every newly supported programmer the information regarding reboots > on failures becomes more ridiculous. With this patch it is only shown when > the internal programmer module was selected. > > Example outputs for external programmers: > 1) non-fatal: > […] > Reading current flash chip contents... done. FAILED at 0x00000000! Expected=0xff, Found=0x28, failed byte count from 0x00000000-0x0001ffff: 0x1fde7 > ERASE FAILED! > FAILED! > Uh oh. Erase/write failed. Checking if anything changed. > Good. It seems nothing was changed. > Writing to the flash chip apparently didn't do anything. > Please check the connections (especially those to write protection pins) between > the programmer and the flash chip. If you think the error is caused by flashrom > please report this on IRC at chat.freenode.net (channel #flashrom) or > mail flashrom(a)flashrom.org, thanks! > > 2) fatal: > […] > Verifying flash... FAILED at 0x00000000! Expected=0x0f, Found=0xff, failed byte count from 0x00000000-0x0001ffff: 0x1fde6 > Your flash chip is in an unknown state. > Please report this on IRC at chat.freenode.net (channel #flashrom) or > mail flashrom(a)flashrom.org, thanks! > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > Acked-by: David Hendricks <dhendrix(a)google.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1699 - trunk
by repository service 15 Jul '13

15 Jul '13

Author: stefanct Date: Mon Jul 15 12:47:53 2013 New Revision: 1699 URL: http://flashrom.org/trac/flashrom/changeset/1699 Log: Differentiate ultimate error messages depending on programmer used. With every newly supported programmer the information regarding reboots on failures becomes more ridiculous. With this patch it is only shown when the internal programmer module was selected. Example outputs for external programmers: 1) non-fatal: […] Reading current flash chip contents... done. FAILED at 0x00000000! Expected=0xff, Found=0x28, failed byte count from 0x00000000-0x0001ffff: 0x1fde7 ERASE FAILED! FAILED! Uh oh. Erase/write failed. Checking if anything changed. Good. It seems nothing was changed. Writing to the flash chip apparently didn't do anything. Please check the connections (especially those to write protection pins) between the programmer and the flash chip. If you think the error is caused by flashrom please report this on IRC at chat.freenode.net (channel #flashrom) or mail flashrom(a)flashrom.org, thanks! 2) fatal: […] Verifying flash... FAILED at 0x00000000! Expected=0x0f, Found=0xff, failed byte count from 0x00000000-0x0001ffff: 0x1fde6 Your flash chip is in an unknown state. Please report this on IRC at chat.freenode.net (channel #flashrom) or mail flashrom(a)flashrom.org, thanks! Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: David Hendricks <dhendrix(a)google.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flashrom.c Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sun Jul 14 01:31:37 2013 (r1698) +++ trunk/flashrom.c Mon Jul 15 12:47:53 2013 (r1699) @@ -1493,26 +1493,37 @@ return ret; } -void nonfatal_help_message(void) +static void nonfatal_help_message(void) { - msg_gerr("Writing to the flash chip apparently didn't do anything.\n" - "This means we have to add special support for your board, " - "programmer or flash chip.\n" - "Please report this on IRC at irc.freenode.net (channel " - "#flashrom) or\n" - "mail flashrom(a)flashrom.org!\n" - "-------------------------------------------------------------" - "------------------\n" - "You may now reboot or simply leave the machine running.\n"); -} - -void emergency_help_message(void) -{ - msg_gerr("Your flash chip is in an unknown state.\n" - "Get help on IRC at chat.freenode.net (channel #flashrom) or\n" - "mail flashrom(a)flashrom.org with the subject \"FAILED: <your board name>\"!\n" - "-------------------------------------------------------------------------------\n" - "DO NOT REBOOT OR POWEROFF!\n"); + msg_gerr("Writing to the flash chip apparently didn't do anything.\n"); +#if CONFIG_INTERNAL == 1 + if (programmer == PROGRAMMER_INTERNAL) + msg_gerr("This means we have to add special support for your board, programmer or flash\n" + "chip. Please report this on IRC at chat.freenode.net (channel #flashrom) or\n" + "mail flashrom(a)flashrom.org, thanks!\n" + "-------------------------------------------------------------------------------\n" + "You may now reboot or simply leave the machine running.\n"); + else +#endif + msg_gerr("Please check the connections (especially those to write protection pins) between\n" + "the programmer and the flash chip. If you think the error is caused by flashrom\n" + "please report this on IRC at chat.freenode.net (channel #flashrom) or\n" + "mail flashrom(a)flashrom.org, thanks!\n"); +} + +static void emergency_help_message(void) +{ + msg_gerr("Your flash chip is in an unknown state.\n"); +#if CONFIG_INTERNAL == 1 + if (programmer == PROGRAMMER_INTERNAL) + msg_gerr("Get help on IRC at chat.freenode.net (channel #flashrom) or\n" + "mail flashrom(a)flashrom.org with the subject \"FAILED: <your board name>\"!\n" + "-------------------------------------------------------------------------------\n" + "DO NOT REBOOT OR POWEROFF!\n"); + else +#endif + msg_gerr("Please report this on IRC at chat.freenode.net (channel #flashrom) or\n" + "mail flashrom(a)flashrom.org, thanks!\n"); } /* The way to go if you want a delimited list of programmers */ @@ -1973,8 +1984,7 @@ "anything changed.\n"); if (!flash->chip->read(flash, newcontents, 0, size)) { if (!memcmp(oldcontents, newcontents, size)) { - msg_cinfo("Good. It seems nothing was " - "changed.\n"); + msg_cinfo("Good. It seems nothing was changed.\n"); nonfatal_help_message(); ret = 1; goto out;

1 0

Re: [flashrom] [PATCH 08/10] print.c: Fix multiline support.
by Carl-Daniel Hailfinger 15 Jul '13

15 Jul '13

Am 10.07.2013 21:17 schrieb Stefan Tauner: > - Use the reentrant tokenizer version strtok_r to break up vendor and model > names in print.c > - Add implementation of strtok_r for mingw (posix only) Self-written or copied from a place with comptaible license? > - Free allocated temporary memory again. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

Re: [flashrom] [PATCH 05/10] Use uintptr_t for chipaddr instead of unsigned long.
by Carl-Daniel Hailfinger 14 Jul '13

14 Jul '13

Am 10.07.2013 21:17 schrieb Stefan Tauner: > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > > diff --git a/flash.h b/flash.h > index ba93245..9e787c0 100644 > --- a/flash.h > +++ b/flash.h > @@ -41,7 +41,8 @@ > #define ERROR_OOM -100 > #define TIMEOUT_ERROR -101 > > -typedef unsigned long chipaddr; > +/* TODO: check using code for correct usage of types */ > +typedef uintptr_t chipaddr; This looks too good to be viable. I have a bad feeling about this in the context of 64-bit resources on x86 (32bit), but drivers accessing resources shouldn't be using chipaddr anyway.. That said, it should not result in any breakage on 32bit platforms. We may see pretty explosions once we start supporting the x32 pseudo-arch. But that will need an audit of the codebase anyway. Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 2

[commit] r1698 - trunk
by repository service 14 Jul '13

14 Jul '13

Author: stefanct Date: Sun Jul 14 01:31:37 2013 New Revision: 1698 URL: http://flashrom.org/trac/flashrom/changeset/1698 Log: Use uintptr_t for chipaddr instead of unsigned long. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/dummyflasher.c trunk/flash.h trunk/jedec.c trunk/serprog.c trunk/sst49lfxxxc.c Modified: trunk/dummyflasher.c ============================================================================== --- trunk/dummyflasher.c Sun Jul 14 01:21:05 2013 (r1697) +++ trunk/dummyflasher.c Sun Jul 14 01:31:37 2013 (r1698) @@ -428,26 +428,26 @@ static void dummy_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr) { - msg_pspew("%s: addr=0x%lx, val=0x%02x\n", __func__, addr, val); + msg_pspew("%s: addr=0x%" PRIxPTR ", val=0x%02x\n", __func__, addr, val); } static void dummy_chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr) { - msg_pspew("%s: addr=0x%lx, val=0x%04x\n", __func__, addr, val); + msg_pspew("%s: addr=0x%" PRIxPTR ", val=0x%04x\n", __func__, addr, val); } static void dummy_chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr) { - msg_pspew("%s: addr=0x%lx, val=0x%08x\n", __func__, addr, val); + msg_pspew("%s: addr=0x%" PRIxPTR ", val=0x%08x\n", __func__, addr, val); } static void dummy_chip_writen(const struct flashctx *flash, uint8_t *buf, chipaddr addr, size_t len) { size_t i; - msg_pspew("%s: addr=0x%lx, len=0x%08lx, writing data (hex):", + msg_pspew("%s: addr=0x%" PRIxPTR ", len=0x%08lx, writing data (hex):", __func__, addr, (unsigned long)len); for (i = 0; i < len; i++) { if ((i % 16) == 0) @@ -459,28 +459,28 @@ static uint8_t dummy_chip_readb(const struct flashctx *flash, const chipaddr addr) { - msg_pspew("%s: addr=0x%lx, returning 0xff\n", __func__, addr); + msg_pspew("%s: addr=0x%" PRIxPTR ", returning 0xff\n", __func__, addr); return 0xff; } static uint16_t dummy_chip_readw(const struct flashctx *flash, const chipaddr addr) { - msg_pspew("%s: addr=0x%lx, returning 0xffff\n", __func__, addr); + msg_pspew("%s: addr=0x%" PRIxPTR ", returning 0xffff\n", __func__, addr); return 0xffff; } static uint32_t dummy_chip_readl(const struct flashctx *flash, const chipaddr addr) { - msg_pspew("%s: addr=0x%lx, returning 0xffffffff\n", __func__, addr); + msg_pspew("%s: addr=0x%" PRIxPTR ", returning 0xffffffff\n", __func__, addr); return 0xffffffff; } static void dummy_chip_readn(const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len) { - msg_pspew("%s: addr=0x%lx, len=0x%lx, returning array of 0xff\n", + msg_pspew("%s: addr=0x%" PRIxPTR ", len=0x%lx, returning array of 0xff\n", __func__, addr, (unsigned long)len); memset(buf, 0xff, len); return; Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sun Jul 14 01:21:05 2013 (r1697) +++ trunk/flash.h Sun Jul 14 01:31:37 2013 (r1698) @@ -41,7 +41,8 @@ #define ERROR_OOM -100 #define TIMEOUT_ERROR -101 -typedef unsigned long chipaddr; +/* TODO: check using code for correct usage of types */ +typedef uintptr_t chipaddr; int register_shutdown(int (*function) (void *data), void *data); void *programmer_map_flash_region(const char *descr, unsigned long phys_addr, Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Sun Jul 14 01:21:05 2013 (r1697) +++ trunk/jedec.c Sun Jul 14 01:31:37 2013 (r1698) @@ -376,7 +376,7 @@ dst++, src++; } if (failed) - msg_cerr(" writing sector at 0x%lx failed!\n", olddst); + msg_cerr(" writing sector at 0x%" PRIxPTR " failed!\n", olddst); return failed; } @@ -417,8 +417,7 @@ goto retry; } if (failed) { - msg_cerr(" page 0x%lx failed!\n", - (d - bios) / page_size); + msg_cerr(" page 0x%" PRIxPTR " failed!\n", (d - bios) / page_size); } return failed; } Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Sun Jul 14 01:21:05 2013 (r1697) +++ trunk/serprog.c Sun Jul 14 01:31:37 2013 (r1698) @@ -789,7 +789,7 @@ sp_flush_stream(); if (serialport_read(&c, 1) != 0) sp_die("readb byteread"); - msg_pspew("%s addr=0x%lx returning 0x%02X\n", __func__, addr, c); + msg_pspew("%s addr=0x%" PRIxPTR " returning 0x%02X\n", __func__, addr, c); return c; } @@ -797,7 +797,7 @@ static void sp_do_read_n(uint8_t * buf, const chipaddr addr, size_t len) { unsigned char sbuf[6]; - msg_pspew("%s: addr=0x%lx len=%lu\n", __func__, addr, (unsigned long)len); + msg_pspew("%s: addr=0x%" PRIxPTR " len=%lu\n", __func__, addr, (unsigned long)len); /* Stream the read-n -- as above. */ if ((sp_opbuf_usage) || (sp_max_write_n && sp_write_n_bytes)) sp_execute_opbuf_noflush(); Modified: trunk/sst49lfxxxc.c ============================================================================== --- trunk/sst49lfxxxc.c Sun Jul 14 01:21:05 2013 (r1697) +++ trunk/sst49lfxxxc.c Sun Jul 14 01:31:37 2013 (r1698) @@ -41,7 +41,7 @@ unsigned int i, left = flash->chip->total_size * 1024; unsigned long address; - msg_cdbg("\nbios=0x%08lx\n", registers); + msg_cdbg("\nbios=0x%08" PRIxPTR "\n", registers); for (i = 0; left > 65536; i++, left -= 65536) { write_lockbits_block_49lfxxxc(flash, i * 65536, bits); }

1 0

Re: [flashrom] [PATCH 03/10] Various cross-platform fixes.
by Carl-Daniel Hailfinger 14 Jul '13

14 Jul '13

Am 10.07.2013 21:17 schrieb Stefan Tauner: > Improve compilation with libpayload (compiling flashrom.c and > linking is still broken): > - disable Ponyprog (which enforced serial.c compilation) > - make errno available where it is needed > > Fix internal.c for non-x86 and enable cb parsing on ARM. > > Fix mingw builds by using its __USE_MINGW_ANSI_STDIO macro > and gnu_printf definition for printf format style checking. > See http://sourceforge.net/apps/trac/mingw-w64/wiki/gnu%20printf > This requires inclusion of stdio.h in flash.h. > > Fix order of libraries in the Makefile: > FEATURE_LIBS needs to come *after* PCILIBS in case ZLIB is needed by it. > > Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Apart from the library order, I'm happy with it. > > diff --git a/Makefile b/Makefile > index 805290c..34bbab8 100644 > --- a/Makefile > +++ b/Makefile > @@ -632,7 +641,7 @@ ifeq ($(ARCH), x86) > endif > > $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) > - $(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(FEATURE_LIBS) $(LIBS) $(PCILIBS) $(USBLIBS) > + $(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LIBS) $(PCILIBS) $(USBLIBS) $(FEATURE_LIBS) I believe this is partially wrong. AFAICS the order should be: LIBS, PCILIBS, FEATURE_LIBS, USBLIBS. Explanation: The linker doesn't remember defined symbols if they were not on its list of needed symbols. This means you have to first specify a library and then its dependencies. LIBS is a misnomer (not generic libraries needed for everything, but rather stuff like getopt and socket for some OS). This confused me initially. The place of LIBS can be pretty much anywhere because it is not needed by any other library. FEATURE_LIBS can contain libftdi (so it needs to come before USBLIBS which satisifies libftdi dependencies), but it also can contain libz (so it needs to come after PCILIBS which may have libz as dependency). To really get this in good shape, we should move libz into LIBS instead of FEATURE_LIBS, but that breaks other parts of the Makefile. I really really want a separate configure script to solve this. > > libflashrom.a: $(LIBFLASHROM_OBJS) > $(AR) rcs $@ $^ > diff --git a/physmap.c b/physmap.c > index 524f558..644ee35 100644 > --- a/physmap.c > +++ b/physmap.c > @@ -120,15 +120,6 @@ void *sys_physmap(unsigned long phys_addr, size_t len) > void physunmap(void *virt_addr, size_t len) > { > } > - > -int setup_cpu_msr(int cpu) > -{ > - return 0; > -} > - > -void cleanup_cpu_msr(void) > -{ > -} > #elif defined(__MACH__) && defined(__APPLE__) > > #define MEM_DEV "DirectHW" > @@ -568,6 +559,15 @@ int libpayload_wrmsr(int addr, msr_t msr) > _wrmsr(addr, msr.lo | ((unsigned long long)msr.hi << 32)); > return 0; > } > + > +int setup_cpu_msr(int cpu) > +{ > + return 0; > +} > + > +void cleanup_cpu_msr(void) > +{ > +} > #else > /* default MSR implementation */ > msr_t rdmsr(int addr) The two hunks above are what I wanted in patch 2 of this series. They fit a lot better here, though, so don't change it. Sorry. With the library order fixed, this is Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1697 - trunk
by repository service 14 Jul '13

14 Jul '13

Author: stefanct Date: Sun Jul 14 01:21:05 2013 New Revision: 1697 URL: http://flashrom.org/trac/flashrom/changeset/1697 Log: Various cross-platform fixes. Improve compilation with libpayload (compiling flashrom.c and linking is still broken): - disable Ponyprog (which enforced serial.c compilation) - make errno available where it is needed Fix internal.c for non-x86 and enable cb parsing on ARM. Fix mingw builds by using its __USE_MINGW_ANSI_STDIO macro and gnu_printf definition for printf format style checking. See http://sourceforge.net/apps/trac/mingw-w64/wiki/gnu%20printf This requires inclusion of stdio.h in flash.h. Fix order of libraries in the Makefile: FEATURE_LIBS needs to come *after* PCILIBS in case ZLIB is needed by it. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/Makefile trunk/flash.h trunk/flashrom.c trunk/hwaccess.c trunk/internal.c trunk/physmap.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Jul 13 23:18:32 2013 (r1696) +++ trunk/Makefile Sun Jul 14 01:21:05 2013 (r1697) @@ -140,6 +140,9 @@ EXEC_SUFFIX := .exe # MinGW doesn't have the ffs() function, but we can use gcc's __builtin_ffs(). FLASHROM_CFLAGS += -Dffs=__builtin_ffs +# Some functions provided by Microsoft do not work as described in C99 specifications. This macro fixes that +# for MinGW. See http://sourceforge.net/apps/trac/mingw-w64/wiki/printf%20and%20scanf%20fami… */ +FLASHROM_CFLAGS += -D__USE_MINGW_ANSI_STDIO=1 # libusb-win32/libftdi stuff is usually installed in /usr/local. CPPFLAGS += -I/usr/local/include LDFLAGS += -L/usr/local/lib @@ -218,6 +221,7 @@ else override CONFIG_DUMMY = no endif +# Bus Pirate, Serprog and PonyProg are not supported with libpayload (missing serial support). ifeq ($(CONFIG_BUSPIRATE_SPI), yes) UNSUPPORTED_FEATURES += CONFIG_BUSPIRATE_SPI=yes else @@ -228,6 +232,11 @@ else override CONFIG_SERPROG = no endif +ifeq ($(CONFIG_PONY_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_PONY_SPI=yes +else +override CONFIG_PONY_SPI = no +endif # Dediprog and FT2232 are not supported with libpayload (missing libusb support) ifeq ($(CONFIG_DEDIPROG), yes) UNSUPPORTED_FEATURES += CONFIG_DEDIPROG=yes @@ -632,7 +641,7 @@ endif $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) - $(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(FEATURE_LIBS) $(LIBS) $(PCILIBS) $(USBLIBS) + $(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) libflashrom.a: $(LIBFLASHROM_OBJS) $(AR) rcs $@ $^ Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sat Jul 13 23:18:32 2013 (r1696) +++ trunk/flash.h Sun Jul 14 01:21:05 2013 (r1697) @@ -25,6 +25,7 @@ #define __FLASH_H__ 1 #include <inttypes.h> +#include <stdio.h> #include <stdint.h> #include <stddef.h> #include <stdbool.h> @@ -286,7 +287,12 @@ MSG_SPEW = 5, }; /* Let gcc and clang check for correct printf-style format strings. */ -int print(enum msglevel level, const char *fmt, ...) __attribute__((format(printf, 2, 3))); +int print(enum msglevel level, const char *fmt, ...) +#ifdef __MINGW32__ +__attribute__((format(gnu_printf, 2, 3))); +#else +__attribute__((format(printf, 2, 3))); +#endif #define msg_gerr(...) print(MSG_ERROR, __VA_ARGS__) /* general errors */ #define msg_perr(...) print(MSG_ERROR, __VA_ARGS__) /* programmer errors */ #define msg_cerr(...) print(MSG_ERROR, __VA_ARGS__) /* chip errors */ Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sat Jul 13 23:18:32 2013 (r1696) +++ trunk/flashrom.c Sun Jul 14 01:21:05 2013 (r1697) @@ -1168,7 +1168,7 @@ return 1; } if (image_stat.st_size != size) { - msg_gerr("Error: Image size (%jd B) doesn't match the flash chip's size (%ld B)!\n", + msg_gerr("Error: Image size (%jd B) doesn't match the flash chip's size (%lu B)!\n", (intmax_t)image_stat.st_size, size); fclose(image); return 1; Modified: trunk/hwaccess.c ============================================================================== --- trunk/hwaccess.c Sat Jul 13 23:18:32 2013 (r1696) +++ trunk/hwaccess.c Sun Jul 14 01:21:05 2013 (r1697) @@ -35,14 +35,13 @@ #include <stdint.h> #include <string.h> #include <stdlib.h> +#include <errno.h> #include <sys/types.h> #if !defined (__DJGPP__) && !defined(__LIBPAYLOAD__) +/* No file access needed/possible to get hardware access permissions. */ #include <unistd.h> #include <fcntl.h> #endif -#if !defined (__DJGPP__) -#include <errno.h> -#endif #include "flash.h" #include "hwaccess.h" Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Sat Jul 13 23:18:32 2013 (r1696) +++ trunk/internal.c Sun Jul 14 01:21:05 2013 (r1697) @@ -172,8 +172,10 @@ int not_a_laptop = 0; const char *board_vendor = NULL; const char *board_model = NULL; +#if defined (__i386__) || defined (__x86_64__) || defined (__arm__) const char *cb_vendor = NULL; const char *cb_model = NULL; +#endif char *arg; arg = extract_programmer_param("boardenable"); @@ -254,7 +256,7 @@ return 1; } -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__) || defined (__arm__) if ((cb_parse_table(&cb_vendor, &cb_model) == 0) && (board_vendor != NULL) && (board_model != NULL)) { if (strcasecmp(board_vendor, cb_vendor) || strcasecmp(board_model, cb_model)) { msg_pwarn("Warning: The mainboard IDs set by -p internal:mainboard (%s:%s) do not\n" @@ -265,7 +267,9 @@ msg_pinfo("Continuing anyway.\n"); } } +#endif +#if defined(__i386__) || defined(__x86_64__) dmi_init(); /* In case Super I/O probing would cause pretty explosions. */ Modified: trunk/physmap.c ============================================================================== --- trunk/physmap.c Sat Jul 13 23:18:32 2013 (r1696) +++ trunk/physmap.c Sun Jul 14 01:21:05 2013 (r1697) @@ -24,14 +24,14 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <errno.h> #include "flash.h" #include "hwaccess.h" -/* Do we need any file access or ioctl for physmap or MSR? */ #if !defined(__DJGPP__) && !defined(__LIBPAYLOAD__) +/* No file access needed/possible to get mmap access permissions or access MSR. */ #include <sys/stat.h> #include <fcntl.h> -#include <errno.h> #endif #ifdef __DJGPP__ @@ -120,15 +120,6 @@ void physunmap(void *virt_addr, size_t len) { } - -int setup_cpu_msr(int cpu) -{ - return 0; -} - -void cleanup_cpu_msr(void) -{ -} #elif defined(__MACH__) && defined(__APPLE__) #define MEM_DEV "DirectHW" @@ -569,6 +560,15 @@ _wrmsr(addr, msr.lo | ((unsigned long long)msr.hi << 32)); return 0; } + +int setup_cpu_msr(int cpu) +{ + return 0; +} + +void cleanup_cpu_msr(void) +{ +} #else /* default MSR implementation */ msr_t rdmsr(int addr)

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom July 2013