flashrom June 2011

flashrom@flashrom.org

50 participants
297 discussions

Re: [flashrom] [PATCH 1/3] fix probe_flash to report new values set by probing functions
by Carl-Daniel Hailfinger 25 Jun '11

25 Jun '11

Am 24.06.2011 16:53 schrieb Stefan Tauner: > This is needed if the probing function changes its fill_flash parameter like in the pattern > used to support Intel Hardware Sequencing and SFDP. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > Back when I converted that code to the const flashchip array, I assumed flash chip sizes would be immutable and other programmer types wouldn't be supported anyway. With your ICH hardware sequencing patches, that assumption is no longer valid. Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

Re: [flashrom] [PATCH 1/4] change all occurrences of printf to msg_ginfo in print.c
by Carl-Daniel Hailfinger 25 Jun '11

25 Jun '11

Am 18.06.2011 22:53 schrieb Stefan Tauner: > 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> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1351 - trunk
by repository service 25 Jun '11

25 Jun '11

Author: stefanct Date: Sat Jun 25 19:36:25 2011 New Revision: 1351 URL: http://flashrom.org/trac/flashrom/changeset/1351 Log: print.c: change all occurrences of printf to msg_ginfo 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 Sat Jun 25 19:04:26 2011 (r1350) +++ trunk/print.c Sat Jun 25 19:36:25 2011 (r1351) @@ -59,7 +59,7 @@ return ret; } -#define POS_PRINT(x) do { pos += strlen(x); printf(x); } while (0) +#define POS_PRINT(x) do { pos += strlen(x); msg_ginfo(x); } while (0) static int digits(int n) { @@ -93,31 +93,31 @@ maxchiplen++; okcol = maxvendorlen + maxchiplen; - printf("Supported flash chips (total: %d):\n\n", chipcount); - printf("Vendor"); + msg_ginfo("Supported flash chips (total: %d):\n\n", chipcount); + msg_ginfo("Vendor"); for (i = strlen("Vendor"); i < maxvendorlen; i++) - printf(" "); - printf("Device"); + msg_ginfo(" "); + msg_ginfo("Device"); for (i = strlen("Device"); i < maxchiplen; i++) - printf(" "); + msg_ginfo(" "); - printf("Tested Known Size/kB: Type:\n"); + msg_ginfo("Tested Known Size/kB: Type:\n"); for (i = 0; i < okcol; i++) - printf(" "); - printf("OK Broken\n\n"); - printf("(P = PROBE, R = READ, E = ERASE, W = WRITE)\n\n"); + msg_ginfo(" "); + msg_ginfo("OK Broken\n\n"); + msg_ginfo("(P = PROBE, R = READ, E = ERASE, W = WRITE)\n\n"); for (f = flashchips; f->name != NULL; f++) { /* Don't print "unknown XXXX SPI chip" entries. */ if (!strncmp(f->name, "unknown", 7)) continue; - printf("%s", f->vendor); + msg_ginfo("%s", f->vendor); for (i = strlen(f->vendor); i < maxvendorlen; i++) - printf(" "); - printf("%s", f->name); + msg_ginfo(" "); + msg_ginfo("%s", f->name); for (i = strlen(f->name); i < maxchiplen; i++) - printf(" "); + msg_ginfo(" "); pos = maxvendorlen + maxchiplen; if ((f->tested & TEST_OK_MASK)) { @@ -131,7 +131,7 @@ POS_PRINT("W "); } while (pos < okcol + 9) { - printf(" "); + msg_ginfo(" "); pos++; } if ((f->tested & TEST_BAD_MASK)) { @@ -146,13 +146,13 @@ } while (pos < okcol + 18) { - printf(" "); + msg_ginfo(" "); pos++; } - printf("%d", f->total_size); + msg_ginfo("%d", f->total_size); for (i = 0; i < 10 - digits(f->total_size); i++) - printf(" "); - printf("%s\n", flashbuses_to_text(f->bustype)); + msg_ginfo(" "); + msg_ginfo("%s\n", flashbuses_to_text(f->bustype)); } } @@ -172,26 +172,26 @@ maxvendorlen++; maxchipsetlen++; - printf("Supported chipsets (total: %d):\n\n", chipsetcount); + msg_ginfo("Supported chipsets (total: %d):\n\n", chipsetcount); - printf("Vendor"); + msg_ginfo("Vendor"); for (i = strlen("Vendor"); i < maxvendorlen; i++) - printf(" "); + msg_ginfo(" "); - printf("Chipset"); + msg_ginfo("Chipset"); for (i = strlen("Chipset"); i < maxchipsetlen; i++) - printf(" "); + msg_ginfo(" "); - printf("PCI IDs State\n\n"); + msg_ginfo("PCI IDs State\n\n"); for (c = chipset_enables; c->vendor_name != NULL; c++) { - printf("%s", c->vendor_name); + msg_ginfo("%s", c->vendor_name); for (i = 0; i < maxvendorlen - strlen(c->vendor_name); i++) - printf(" "); - printf("%s", c->device_name); + msg_ginfo(" "); + msg_ginfo("%s", c->device_name); for (i = 0; i < maxchipsetlen - strlen(c->device_name); i++) - printf(" "); - printf("%04x:%04x%s\n", c->vendor_id, c->device_id, + msg_ginfo(" "); + msg_ginfo("%04x:%04x%s\n", c->vendor_id, c->device_id, (c->status == OK) ? "" : " (untested)"); } } @@ -216,39 +216,39 @@ maxvendorlen++; maxboardlen++; - printf("Known %s (good: %d, bad: %d):\n\n", + msg_ginfo("Known %s (good: %d, bad: %d):\n\n", devicetype, boardcount_good, boardcount_bad); - printf("Vendor"); + msg_ginfo("Vendor"); for (i = strlen("Vendor"); i < maxvendorlen; i++) - printf(" "); + msg_ginfo(" "); - printf("Board"); + msg_ginfo("Board"); for (i = strlen("Board"); i < maxboardlen; i++) - printf(" "); + msg_ginfo(" "); - printf("Status Required option\n\n"); + msg_ginfo("Status Required option\n\n"); for (b = boards; b->vendor != NULL; b++) { - printf("%s", b->vendor); + msg_ginfo("%s", b->vendor); for (i = 0; i < maxvendorlen - strlen(b->vendor); i++) - printf(" "); - printf("%s", b->name); + msg_ginfo(" "); + msg_ginfo("%s", b->name); for (i = 0; i < maxboardlen - strlen(b->name); i++) - printf(" "); - printf((b->working) ? "OK " : "BAD "); + msg_ginfo(" "); + msg_ginfo((b->working) ? "OK " : "BAD "); for (e = board_pciid_enables; e->vendor_name != NULL; e++) { if (strcmp(e->vendor_name, b->vendor) || strcmp(e->board_name, b->name)) continue; if (e->lb_vendor == NULL) - printf("(autodetected)"); + msg_ginfo("(autodetected)"); else - printf("-m %s:%s", e->lb_vendor, + msg_ginfo("-m %s:%s", e->lb_vendor, e->lb_part); } - printf("\n"); + msg_ginfo("\n"); } } #endif @@ -257,104 +257,104 @@ { print_supported_chips(); - printf("\nSupported programmers:\n"); + msg_ginfo("\nSupported programmers:\n"); list_programmers_linebreak(0, 80, 0); #if CONFIG_INTERNAL == 1 - printf("\nSupported devices for the %s programmer:\n\n", + msg_ginfo("\nSupported devices for the %s programmer:\n\n", programmer_table[PROGRAMMER_INTERNAL].name); print_supported_chipsets(); - printf("\n"); + msg_ginfo("\n"); print_supported_boards_helper(boards_known, "boards"); - printf("\n"); + msg_ginfo("\n"); print_supported_boards_helper(laptops_known, "laptops"); #endif #if CONFIG_DUMMY == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_DUMMY].name); /* FIXME */ - printf("Dummy device, does nothing and logs all accesses\n"); + msg_ginfo("Dummy device, does nothing and logs all accesses\n"); #endif #if CONFIG_NIC3COM == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_NIC3COM].name); print_supported_pcidevs(nics_3com); #endif #if CONFIG_NICREALTEK == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_NICREALTEK].name); print_supported_pcidevs(nics_realtek); #endif #if CONFIG_NICNATSEMI == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_NICNATSEMI].name); print_supported_pcidevs(nics_natsemi); #endif #if CONFIG_GFXNVIDIA == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_GFXNVIDIA].name); print_supported_pcidevs(gfx_nvidia); #endif #if CONFIG_DRKAISER == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_DRKAISER].name); print_supported_pcidevs(drkaiser_pcidev); #endif #if CONFIG_SATASII == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_SATASII].name); print_supported_pcidevs(satas_sii); #endif #if CONFIG_ATAHPT == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_ATAHPT].name); print_supported_pcidevs(ata_hpt); #endif #if CONFIG_FT2232_SPI == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_FT2232_SPI].name); print_supported_usbdevs(devs_ft2232spi); #endif #if CONFIG_SERPROG == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_SERPROG].name); /* FIXME */ - printf("All programmer devices speaking the serprog protocol\n"); + msg_ginfo("All programmer devices speaking the serprog protocol\n"); #endif #if CONFIG_BUSPIRATE_SPI == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_BUSPIRATE_SPI].name); /* FIXME */ - printf("Dangerous Prototypes Bus Pirate\n"); + msg_ginfo("Dangerous Prototypes Bus Pirate\n"); #endif #if CONFIG_DEDIPROG == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_DEDIPROG].name); /* FIXME */ - printf("Dediprog SF100\n"); + msg_ginfo("Dediprog SF100\n"); #endif #if CONFIG_RAYER_SPI == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_RAYER_SPI].name); /* FIXME */ - printf("RayeR parallel port programmer\n"); + msg_ginfo("RayeR parallel port programmer\n"); #endif #if CONFIG_NICINTEL == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_NICINTEL].name); print_supported_pcidevs(nics_intel); #endif #if CONFIG_NICINTEL_SPI == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_NICINTEL_SPI].name); print_supported_pcidevs(nics_intel_spi); #endif #if CONFIG_OGP_SPI == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_OGP_SPI].name); print_supported_pcidevs(ogp_spi); #endif #if CONFIG_SATAMV == 1 - printf("\nSupported devices for the %s programmer:\n", + msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_SATAMV].name); print_supported_pcidevs(satas_mv); #endif

1 0

[commit] r1350 - trunk
by repository service 25 Jun '11

25 Jun '11

Author: stefanct Date: Sat Jun 25 19:04:26 2011 New Revision: 1350 URL: http://flashrom.org/trac/flashrom/changeset/1350 Log: fix probe_flash to report new values set by probing functions This is needed if the probing function changes its fill_flash parameter like in the pattern used to support Intel Hardware Sequencing and SFDP. 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/flashrom.c Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sun Jun 19 19:27:57 2011 (r1349) +++ trunk/flashrom.c Sat Jun 25 19:04:26 2011 (r1350) @@ -1188,8 +1188,8 @@ msg_cinfo("%s chip \"%s %s\" (%d kB, %s) %s.\n", force ? "Assuming" : "Found", - flash->vendor, flash->name, flash->total_size, - flashbuses_to_text(flash->bustype), location); + fill_flash->vendor, fill_flash->name, fill_flash->total_size, + flashbuses_to_text(fill_flash->bustype), location); /* Flash registers will not be mapped if the chip was forced. Lock info * may be stored in registers, so avoid lock info printing.

1 0

[PATCH 3/3] proof of concept patch for calculating and printing of MD5 hashes of flash and file contents
by Stefan Tauner 25 Jun '11

25 Jun '11

This patch is not for merge. It uses libmhash to calculate the MD5 hashes of the files read before write/validate and of the flash contents read to ease debugging and emergency recovery. open question: decide on which library to use - or if we want to just copy an implementation verbatim. if no one can think of a realistic use case for more advanced/crypto hashers or cryptography (like signing/verifying images), i think just copying a md5 implementation is fine. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- Makefile | 2 +- flashrom.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6e6e2de..3f32349 100644 --- a/Makefile +++ b/Makefile @@ -361,7 +361,7 @@ ifeq ($(OS_ARCH), DOS) # FIXME There needs to be a better way to do this LIBS += ../libpci/lib/libpci.a else -LIBS += -lpci +LIBS += -lpci -lmhash ifeq ($(OS_ARCH), OpenBSD) # For (i386|amd64)_iopl(2). LIBS += -l$(shell uname -m) diff --git a/flashrom.c b/flashrom.c index c664a50..787bddb 100644 --- a/flashrom.c +++ b/flashrom.c @@ -34,6 +34,7 @@ #if HAVE_UTSNAME == 1 #include <sys/utsname.h> #endif +#include "mhash.h" #include "flash.h" #include "flashchips.h" #include "programmer.h" @@ -727,6 +728,32 @@ int check_erased_range(struct flashchip *flash, int start, int len) return ret; } +int md5_get_hash(const void *plaintext, unsigned int size, unsigned char *hash) +{ + MHASH td = mhash_init(MHASH_MD5); + if (td == MHASH_FAILED) + return 1; + + mhash(td, plaintext, size); + mhash_deinit(td, hash); + if (hash == NULL) + return 1; + return 0; +} + +/* Calculates and prints the MD5 hash of the given plaintext. */ +void md5_print_hash(const void *plaintext, unsigned int size, const char *text) +{ + unsigned char md5[16]; + int i; + if (md5_get_hash(plaintext, size, md5) == 0) { + msg_cinfo("MD5 hash of %s is ", text); + for (i = 0; i < 16; i++) + msg_cinfo("%02x", md5[i]); + msg_cinfo(".\n"); + } +} + /* * @cmpbuf buffer to compare against, cmpbuf[0] is expected to match the flash content at location start @@ -1299,8 +1326,9 @@ int read_flash_to_file(struct flashchip *flash, const char *filename) ret = write_buf_to_file(buf, size, filename); out_free: - free(buf); msg_cinfo("%s.\n", ret ? "FAILED" : "done"); + md5_print_hash(buf, size, "the flash content read"); + free(buf); return ret; } @@ -1898,6 +1926,8 @@ int doit(struct flashchip *flash, int force, const char *filename, int read_it, goto out; } + md5_print_hash(newcontents, size, filename); + #if CONFIG_INTERNAL == 1 if (programmer == PROGRAMMER_INTERNAL) show_id(newcontents, size, force); @@ -1918,6 +1948,8 @@ int doit(struct flashchip *flash, int force, const char *filename, int read_it, } msg_cdbg("done.\n"); + md5_print_hash(oldcontents, size, "the old flash chip contents"); + // This should be moved into each flash part's code to do it // cleanly. This does the job. handle_romentries(flash, oldcontents, newcontents); @@ -1929,6 +1961,8 @@ int doit(struct flashchip *flash, int force, const char *filename, int read_it, msg_cerr("Uh oh. Erase/write failed. Checking if " "anything changed.\n"); if (!flash->read(flash, newcontents, 0, size)) { + md5_print_hash(newcontents, size, + "the current flash chip contents"); if (!memcmp(oldcontents, newcontents, size)) { msg_cinfo("Good. It seems nothing was " "changed.\n"); -- 1.7.1

1 0

[PATCH 2/3] add a success indicator to the "Reading old flash chip contents..." message
by Stefan Tauner 25 Jun '11

25 Jun '11

Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- flashrom.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/flashrom.c b/flashrom.c index 6dc6fb8..c664a50 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1910,11 +1910,13 @@ int doit(struct flashchip *flash, int force, const char *filename, int read_it, * preserved, but in that case we might perform unneeded erase which * takes time as well. */ - msg_cdbg("Reading old flash chip contents...\n"); + msg_cdbg("Reading old flash chip contents... "); if (flash->read(flash, oldcontents, 0, size)) { ret = 1; + msg_cdbg("FAILED.\n"); goto out; } + msg_cdbg("done.\n"); // This should be moved into each flash part's code to do it // cleanly. This does the job. -- 1.7.1

1 0

[PATCH 1/3] constify (a few) parameters in flashrom.c where possible
by Stefan Tauner 25 Jun '11

25 Jun '11

Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- flash.h | 12 ++++++------ flashrom.c | 16 ++++++++-------- programmer.h | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/flash.h b/flash.h index f875102..0630421 100644 --- a/flash.h +++ b/flash.h @@ -205,22 +205,22 @@ void map_flash_registers(struct flashchip *flash); int read_memmapped(struct flashchip *flash, uint8_t *buf, int start, int len); int erase_flash(struct flashchip *flash); int probe_flash(int startchip, struct flashchip *fill_flash, int force); -int read_flash_to_file(struct flashchip *flash, char *filename); +int read_flash_to_file(struct flashchip *flash, const char *filename); int min(int a, int b); int max(int a, int b); void tolower_string(char *str); -char *extract_param(char **haystack, char *needle, char *delim); +char *extract_param(char **haystack, const char *needle, const char *delim); int check_erased_range(struct flashchip *flash, int start, int len); -int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message); +int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, const char *message); int need_erase(uint8_t *have, uint8_t *want, int len, enum write_granularity gran); char *strcat_realloc(char *dest, const char *src); void print_version(void); void print_banner(void); void list_programmers_linebreak(int startcol, int cols, int paren); int selfcheck(void); -int doit(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it); -int read_buf_from_file(unsigned char *buf, unsigned long size, char *filename); -int write_buf_to_file(unsigned char *buf, unsigned long size, char *filename); +int doit(struct flashchip *flash, int force, const char *filename, int read_it, int write_it, int erase_it, int verify_it); +int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename); +int write_buf_to_file(unsigned char *buf, unsigned long size, const char *filename); #define OK 0 #define NT 1 /* Not tested */ diff --git a/flashrom.c b/flashrom.c index cfee1a1..6dc6fb8 100644 --- a/flashrom.c +++ b/flashrom.c @@ -649,7 +649,7 @@ char *strcat_realloc(char *dest, const char *src) * needle and remove everything from the first occurrence of needle to the next * delimiter from haystack. */ -char *extract_param(char **haystack, char *needle, char *delim) +char *extract_param(char **haystack, const char *needle, const char *delim) { char *param_pos, *opt_pos, *rest; char *opt = NULL; @@ -706,7 +706,7 @@ char *extract_param(char **haystack, char *needle, char *delim) return opt; } -char *extract_programmer_param(char *param_name) +char *extract_programmer_param(const char *param_name) { return extract_param(&programmer_param, param_name, ","); } @@ -735,7 +735,7 @@ int check_erased_range(struct flashchip *flash, int start, int len) * @message string to print in the "FAILED" message * @return 0 for success, -1 for failure */ -int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message) +int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, const char *message) { int i, ret = 0; uint8_t *readbuf = malloc(len); @@ -1217,7 +1217,7 @@ int verify_flash(struct flashchip *flash, uint8_t *buf) return ret; } -int read_buf_from_file(unsigned char *buf, unsigned long size, char *filename) +int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename) { unsigned long numbytes; FILE *image; @@ -1250,7 +1250,7 @@ int read_buf_from_file(unsigned char *buf, unsigned long size, char *filename) return 0; } -int write_buf_to_file(unsigned char *buf, unsigned long size, char *filename) +int write_buf_to_file(unsigned char *buf, unsigned long size, const char *filename) { unsigned long numbytes; FILE *image; @@ -1274,7 +1274,7 @@ int write_buf_to_file(unsigned char *buf, unsigned long size, char *filename) return 0; } -int read_flash_to_file(struct flashchip *flash, char *filename) +int read_flash_to_file(struct flashchip *flash, const char *filename) { unsigned long size = flash->total_size * 1024; unsigned char *buf = calloc(size, sizeof(char)); @@ -1573,7 +1573,7 @@ void emergency_help_message(void) } /* The way to go if you want a delimited list of programmers*/ -void list_programmers(char *delim) +void list_programmers(const char *delim) { enum programmer p; for (p = 0; p < PROGRAMMER_INVALID; p++) { @@ -1842,7 +1842,7 @@ int chip_safety_check(struct flashchip *flash, int force, int read_it, int write * but right now it allows us to split off the CLI code. * Besides that, the function itself is a textbook example of abysmal code flow. */ -int doit(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it) +int doit(struct flashchip *flash, int force, const char *filename, int read_it, int write_it, int erase_it, int verify_it) { uint8_t *oldcontents; uint8_t *newcontents; diff --git a/programmer.h b/programmer.h index ce0ffa1..cd82dcb 100644 --- a/programmer.h +++ b/programmer.h @@ -505,7 +505,7 @@ extern int programmer_may_write; extern unsigned long flashbase; void check_chip_supported(const struct flashchip *flash); int check_max_decode(enum chipbustype buses, uint32_t size); -char *extract_programmer_param(char *param_name); +char *extract_programmer_param(const char *param_name); /* layout.c */ int show_id(uint8_t *bios, int size, int force); -- 1.7.1

1 0

[PATCH] make Makefile's test programs (more) -W safe
by Stefan Tauner 24 Jun '11

24 Jun '11

Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3dda8c2..5cbe034 100644 --- a/Makefile +++ b/Makefile @@ -413,7 +413,7 @@ strip: $(PROGRAM)$(EXEC_SUFFIX) compiler: featuresavailable @printf "Checking for a C compiler... " @$(shell ( echo "int main(int argc, char **argv)"; \ - echo "{ return 0; }"; ) > .test.c ) + echo "{ (void) argc; (void) argv; return 0; }"; ) > .test.c ) @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .test.c -o .test$(EXEC_SUFFIX) >/dev/null && \ echo "found." || ( echo "not found."; \ rm -f .test.c .test$(EXEC_SUFFIX); exit 1) @@ -427,7 +427,7 @@ pciutils: compiler echo "#include <pci/pci.h>"; \ echo "struct pci_access *pacc;"; \ echo "int main(int argc, char **argv)"; \ - echo "{ pacc = pci_alloc(); return 0; }"; ) > .test.c ) + echo "{ (void) argc; (void) argv; pacc = pci_alloc(); return 0; }"; ) > .test.c ) @$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >/dev/null 2>&1 && \ echo "found." || ( echo "not found."; echo; \ echo "Please install libpci headers (package pciutils-devel)."; \ -- 1.7.1

1 0

[PATCH] fix output for multiple found flash chips
by Stefan Tauner 24 Jun '11

24 Jun '11

- missing quotes - missing commas Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- cli_classic.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cli_classic.c b/cli_classic.c index 59096a0..aba6edf 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -373,9 +373,10 @@ int cli_classic(int argc, char *argv[]) } if (chipcount > 1) { - printf("Multiple flash chips were detected:"); - for (i = 0; i < chipcount; i++) - printf(" %s", flashes[i].name); + printf("Multiple flash chips were detected: \"%s\"", + flashes[0].name); + for (i = 1; i < chipcount; i++) + printf(", \"%s\"", flashes[i].name); printf("\nPlease specify which chip to use with the -c <chipname> option.\n"); programmer_shutdown(); exit(1); -- 1.7.1

1 0

Intel MBD question
by Ian Whitfield 24 Jun '11

24 Jun '11

Hi I have recently built a new Computer with an Intel DG41WV MBD. This has an 82G41 BIOS chip and a GMA X4500 video chip. My Operating System is Linux Mint 10 KDE. I have problems with the screen display not refreshing correctly leaving part of the old screen still showing. Forcing a refresh by moving the window off screen and back again cures this. Therefore I am wanting to update the BIOS to see if this will correct the problem. From recommendations on the Ubuntu Form it has been recommended that I use Flashrom to do this. However I can find no reference to either this Intel MBD or the Chipsets on your site. Can you please advise me on whether these are supported with Flashrom and if necessary recommend the correct method to do this. Thanks a lot. -- */_Ian Whitfield_/*/ *Pretoria, South Africa* *Tel* - +27 (0)12 817 2001 *Cell* - +27 (0)82 573 9142 *Fax* - +27 (0)86 651 4844 *Skype* - ianzs6cdx *SnailMail* - PO Box 72226, Lynnwood Ridge 0040 South Africa. /(No trees were harmed in the production of this message, however a large number of re-cycled electrons were temporarily inconvenienced) ////

3 8

← Newer
1
...
11
12
13
14
15
16
17
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom June 2011