flashrom

flashrom@flashrom.org

8 participants
9164 discussions

flashrom with HP XW9300
by Jürgen Trapp 26 Feb '12

26 Feb '12

Hi, i have a problem with flash writing under HP XW9300. I will use coreboot.rom with the board and i have a error (see attachments: output_flashrom_write) Thank you for help. Jürgen

1 0

Re: [flashrom] [PATCH 1/2] revert flashctx to flashchip in block_eraser helper functions
by Carl-Daniel Hailfinger 25 Feb '12

25 Feb '12

Am 28.12.2011 01:57 schrieb Stefan Tauner: > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Sorry, Nack. Quoting from your other mail: > it is easier to "upcast" some flashctx > "objects" to flashchip (which is safe) AFAICS this violates the C standard. http://stackoverflow.com/questions/98650/what-is-the-strict-aliasing-rule The offending hunks are below: > diff --git a/flashrom.c b/flashrom.c > index f1a6165..68b6d97 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -1313,7 +1313,7 @@ int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, > int k, ret = 1; > uint8_t *curcontents; > unsigned long size = flash->total_size * 1024; > - unsigned int usable_erasefunctions = count_usable_erasers(flash); > + unsigned int usable_erasefunctions = count_usable_erasers((struct flashchip*) flash); > > msg_cinfo("Erasing and writing flash chip... "); > curcontents = malloc(size); > @@ -1332,7 +1332,7 @@ int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, > break; > } > msg_cdbg("Trying erase function %i... ", k); > - if (check_block_eraser(flash, k, 1)) > + if (check_block_eraser((struct flashchip*) flash, k, 1)) > continue; > usable_erasefunctions--; > ret = walk_eraseregions(flash, k, &erase_and_write_block_helper, > @@ -1680,7 +1680,7 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it, > int ret = 0; > unsigned long size = flash->total_size * 1024; > > - if (chip_safety_check(flash, force, read_it, write_it, erase_it, verify_it)) { > + if (chip_safety_check((struct flashchip*) flash, force, read_it, write_it, erase_it, verify_it)) { > msg_cerr("Aborting.\n"); > ret = 1; > goto out_nofree; -- http://www.hailfinger.org/

2 1

[PATCH] flashrom 0.9.5.1
by Carl-Daniel Hailfinger 25 Feb '12

25 Feb '12

Increase flashrom release number to 0.9.5.1 Informal ack by Stefan Tauner on IRC: 01:03 <stefanct> with the kfreebsd patch in, 0.9.5.1 is acked by me too in case i am not around tomorrow... Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Index: flashrom-0.9.5.1-release/Makefile =================================================================== --- flashrom-0.9.5.1-release/Makefile (Revision 1507) +++ flashrom-0.9.5.1-release/Makefile (Arbeitskopie) @@ -277,7 +277,7 @@ # will not require subversion. The downloadable snapshots are already exported. SVNVERSION := $(shell LC_ALL=C svnversion -cn . 2>/dev/null | sed -e "s/.*://" -e "s/$[0-9]*$.*/\1/" | grep "[0-9]" || LC_ALL=C svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || LC_ALL=C git svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || echo unknown) -RELEASE := 0.9.5 +RELEASE := 0.9.5.1 VERSION := $(RELEASE)-r$(SVNVERSION) RELEASENAME ?= $(VERSION) -- http://www.hailfinger.org/

1 1

[commit] r1509 - tags/flashrom-0.9.5.1
by repository service 25 Feb '12

25 Feb '12

Author: hailfinger Date: Sun Feb 26 00:40:16 2012 New Revision: 1509 URL: http://flashrom.org/trac/flashrom/changeset/1509 Log: Tag flashrom 0.9.5.1 Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Added: tags/flashrom-0.9.5.1/ - copied from r1508, trunk/

1 0

[commit] r1508 - trunk
by repository service 25 Feb '12

25 Feb '12

Author: hailfinger Date: Sun Feb 26 00:39:29 2012 New Revision: 1508 URL: http://flashrom.org/trac/flashrom/changeset/1508 Log: Increase flashrom release number to 0.9.5.1 Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Feb 25 23:50:21 2012 (r1507) +++ trunk/Makefile Sun Feb 26 00:39:29 2012 (r1508) @@ -277,7 +277,7 @@ # will not require subversion. The downloadable snapshots are already exported. SVNVERSION := $(shell LC_ALL=C svnversion -cn . 2>/dev/null | sed -e "s/.*://" -e "s/$[0-9]*$.*/\1/" | grep "[0-9]" || LC_ALL=C svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || LC_ALL=C git svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || echo unknown) -RELEASE := 0.9.5 +RELEASE := 0.9.5.1 VERSION := $(RELEASE)-r$(SVNVERSION) RELEASENAME ?= $(VERSION)

1 0

[PATCH] Support Debian/kFreeBSD
by Carl-Daniel Hailfinger 25 Feb '12

25 Feb '12

Apparently compilation worked before I introduced the target OS check during compilation, but it seems the generated binaries back then might have been incorrect for Debian/kFreeBSD. This stuff should compile and run well. Output of flashrom -V on a desktop PC (not a laptop) would be appreciated. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-kfreebsd_glibc/hwaccess.c =================================================================== --- flashrom-kfreebsd_glibc/hwaccess.c (Revision 1504) +++ flashrom-kfreebsd_glibc/hwaccess.c (Arbeitskopie) @@ -40,7 +40,7 @@ { } -#if defined(__FreeBSD__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) int io_fd; #endif @@ -52,7 +52,7 @@ #else #if defined (__sun) && (defined(__i386) || defined(__amd64)) if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) != 0) { -#elif defined(__FreeBSD__) || defined (__DragonFly__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined (__DragonFly__) if ((io_fd = open("/dev/io", O_RDWR)) < 0) { #else if (iopl(3) != 0) { @@ -71,7 +71,7 @@ void release_io_perms(void) { -#if defined(__FreeBSD__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) close(io_fd); #endif } Index: flashrom-kfreebsd_glibc/hwaccess.h =================================================================== --- flashrom-kfreebsd_glibc/hwaccess.h (Revision 1504) +++ flashrom-kfreebsd_glibc/hwaccess.h (Arbeitskopie) @@ -189,6 +189,7 @@ */ #if defined(__FreeBSD__) || defined(__DragonFly__) + /* Note that FreeBSD kernel with glibc does not have machine/cpufunc.h. */ #include <machine/cpufunc.h> #define off64_t off_t #define lseek64 lseek @@ -228,7 +229,7 @@ #define INL inportl #else - + /* This is the usual glibc interface. */ #define OUTB outb #define OUTW outw #define OUTL outl @@ -299,12 +300,12 @@ #endif #endif -#if !defined(__DARWIN__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__LIBPAYLOAD__) +#if !defined(__DARWIN__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__DragonFly__) && !defined(__LIBPAYLOAD__) typedef struct { uint32_t hi, lo; } msr_t; msr_t rdmsr(int addr); int wrmsr(int addr, msr_t msr); #endif -#if defined(__FreeBSD__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) /* FreeBSD already has conflicting definitions for wrmsr/rdmsr. */ #undef rdmsr #undef wrmsr Index: flashrom-kfreebsd_glibc/os.h =================================================================== --- flashrom-kfreebsd_glibc/os.h (Revision 1504) +++ flashrom-kfreebsd_glibc/os.h (Arbeitskopie) @@ -30,6 +30,9 @@ // FreeBSD #elif defined(__FreeBSD__) #define __FLASHROM_OS__ "FreeBSD" +// FreeBSD with glibc-based userspace (e.g. Debian/kFreeBSD) +#elif defined(__FreeBSD_kernel__) && defined(__GLIBC__) +#define __FLASHROM_OS__ "FreeBSD-glibc" // DragonFlyBSD #elif defined(__DragonFly__) #define __FLASHROM_OS__ "DragonFlyBSD" Index: flashrom-kfreebsd_glibc/physmap.c =================================================================== --- flashrom-kfreebsd_glibc/physmap.c (Revision 1504) +++ flashrom-kfreebsd_glibc/physmap.c (Arbeitskopie) @@ -382,7 +382,7 @@ fd_msr = -1; } #else -#if defined(__FreeBSD__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include <sys/ioctl.h> typedef struct { -- http://www.hailfinger.org/

1 1

[commit] r1507 - trunk
by repository service 25 Feb '12

25 Feb '12

Author: hailfinger Date: Sat Feb 25 23:50:21 2012 New Revision: 1507 URL: http://flashrom.org/trac/flashrom/changeset/1507 Log: Support Debian/kFreeBSD Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Tested-by: Robert Millan <rmh(a)debian.org> Tested-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/hwaccess.c trunk/hwaccess.h trunk/os.h trunk/physmap.c Modified: trunk/hwaccess.c ============================================================================== --- trunk/hwaccess.c Sat Feb 25 00:49:30 2012 (r1506) +++ trunk/hwaccess.c Sat Feb 25 23:50:21 2012 (r1507) @@ -40,7 +40,7 @@ { } -#if defined(__FreeBSD__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) int io_fd; #endif @@ -52,7 +52,7 @@ #else #if defined (__sun) && (defined(__i386) || defined(__amd64)) if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) != 0) { -#elif defined(__FreeBSD__) || defined (__DragonFly__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined (__DragonFly__) if ((io_fd = open("/dev/io", O_RDWR)) < 0) { #else if (iopl(3) != 0) { @@ -71,7 +71,7 @@ void release_io_perms(void) { -#if defined(__FreeBSD__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) close(io_fd); #endif } Modified: trunk/hwaccess.h ============================================================================== --- trunk/hwaccess.h Sat Feb 25 00:49:30 2012 (r1506) +++ trunk/hwaccess.h Sat Feb 25 23:50:21 2012 (r1507) @@ -189,6 +189,10 @@ */ #if defined(__FreeBSD__) || defined(__DragonFly__) + /* Note that Debian/kFreeBSD (FreeBSD kernel with glibc) has conflicting + * out[bwl] definitions in machine/cpufunc.h and sys/io.h at least in some + * versions. Use machine/cpufunc.h only for plain FreeBSD/DragonFlyBSD. + */ #include <machine/cpufunc.h> #define off64_t off_t #define lseek64 lseek @@ -228,7 +232,7 @@ #define INL inportl #else - + /* This is the usual glibc interface. */ #define OUTB outb #define OUTW outw #define OUTL outl @@ -299,12 +303,12 @@ #endif #endif -#if !defined(__DARWIN__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__LIBPAYLOAD__) +#if !defined(__DARWIN__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__DragonFly__) && !defined(__LIBPAYLOAD__) typedef struct { uint32_t hi, lo; } msr_t; msr_t rdmsr(int addr); int wrmsr(int addr, msr_t msr); #endif -#if defined(__FreeBSD__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) /* FreeBSD already has conflicting definitions for wrmsr/rdmsr. */ #undef rdmsr #undef wrmsr Modified: trunk/os.h ============================================================================== --- trunk/os.h Sat Feb 25 00:49:30 2012 (r1506) +++ trunk/os.h Sat Feb 25 23:50:21 2012 (r1507) @@ -30,6 +30,9 @@ // FreeBSD #elif defined(__FreeBSD__) #define __FLASHROM_OS__ "FreeBSD" +// FreeBSD with glibc-based userspace (e.g. Debian/kFreeBSD) +#elif defined(__FreeBSD_kernel__) && defined(__GLIBC__) +#define __FLASHROM_OS__ "FreeBSD-glibc" // DragonFlyBSD #elif defined(__DragonFly__) #define __FLASHROM_OS__ "DragonFlyBSD" Modified: trunk/physmap.c ============================================================================== --- trunk/physmap.c Sat Feb 25 00:49:30 2012 (r1506) +++ trunk/physmap.c Sat Feb 25 23:50:21 2012 (r1507) @@ -382,7 +382,7 @@ fd_msr = -1; } #else -#if defined(__FreeBSD__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include <sys/ioctl.h> typedef struct {

1 0

[PATCH] Postpone layout file reading
by Carl-Daniel Hailfinger 25 Feb '12

25 Feb '12

Layout file reading should happen after option parsing like all other file accesses. Guard against multiple --layout parameters. Side note: This fixes an inconsistency which impacts the log file patch. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-postpone_layoutfile_reading/cli_classic.c =================================================================== --- flashrom-postpone_layoutfile_reading/cli_classic.c (Revision 1482) +++ flashrom-postpone_layoutfile_reading/cli_classic.c (Arbeitskopie) @@ -204,6 +204,7 @@ }; char *filename = NULL; + char *layoutfile = NULL; char *tempstr = NULL; char *pparam = NULL; @@ -290,9 +291,12 @@ force = 1; break; case 'l': - tempstr = strdup(optarg); - if (read_romlayout(tempstr)) + if (layoutfile) { + fprintf(stderr, "Error: --layout specified " + "more than once. Aborting.\n"); cli_classic_abort_usage(); + } + layoutfile = strdup(optarg); break; case 'i': tempstr = strdup(optarg); @@ -390,9 +394,6 @@ cli_classic_abort_usage(); } - if (process_include_args()) - cli_classic_abort_usage(); - /* FIXME: Print the actions flashrom will take. */ if (list_supported) { @@ -407,6 +408,11 @@ } #endif + if (layoutfile && read_romlayout(layoutfile)) + cli_classic_abort_usage(); + if (process_include_args()) + cli_classic_abort_usage(); + /* Does a chip with the requested name exist in the flashchips array? */ if (chip_to_probe) { for (flash = flashchips; flash && flash->name; flash++) -- http://www.hailfinger.org/

2 6

[PATCH 5/5] squash! print_wiki.c fix columns calculations
by Stefan Tauner 25 Feb '12

25 Feb '12

- chips Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- print_wiki.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/print_wiki.c b/print_wiki.c index d55563c..43fab47 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -224,6 +224,7 @@ static void print_supported_chips_wiki(int cols) { int i = 0, c = 1, chipcount = 0; const struct flashchip *f, *old = NULL; + unsigned int lines_per_col; uint32_t t; char *s; char vmax[6]; @@ -238,21 +239,28 @@ static void print_supported_chips_wiki(int cols) chipcount++; } + /* +1 to force the resulting number of columns to be < cols */ + lines_per_col = chipcount / cols + ((chipcount%cols) > 0 ? 1 : 0); + printf("\n== Supported chips ==\n\nTotal amount of supported " - "chips: '''%d'''\n\n{| border=\"0\" valign=\"top\"\n" - "| valign=\"top\"|\n\n%s", chipcount, chip_th); + "chips: '''%d'''\n\n{| border=\"0\" valign=\"top\"\n", + chipcount); - for (f = flashchips; f->name != NULL; f++, i++) { + for (f = flashchips; f->name != NULL; f++) { /* Don't print generic entries. */ if (!strncmp(f->vendor, "Unknown", 7) || !strncmp(f->vendor, "Programmer", 10) || !strncmp(f->name, "unknown", 7)) continue; + if ((i % lines_per_col) == 0) + printf("| valign=\"top\"|\n\n%s", chip_th); + /* Alternate colors if the vendor changes. */ if (old != NULL && strcmp(old->vendor, f->vendor)) c = !c; + old = f; t = f->tested; s = flashbuses_to_text(f->bustype); sprintf(vmin, "%0.03f", f->voltage.min / (double)1000); @@ -276,16 +284,14 @@ static void print_supported_chips_wiki(int cols) f->voltage.min ? vmax : "N/A"); free(s); - /* Split table into 'cols' columns. */ - if (i >= (chipcount / cols + 1)) { - printf("\n|}\n\n| valign=\"top\"|\n\n%s", chip_th); - i = 0; - } - - old = f; + if (((i % lines_per_col) + 1) == lines_per_col) + printf("\n|}\n\n"); + i++; } - - printf("\n|}\n\n|}\n"); + /* end inner table if it did not fill the last column fully */ + if (((i % lines_per_col)) > 0) + printf("\n|}\n\n"); + printf("|}\n\n"); } /* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */ -- 1.7.1

1 0

[PATCH 4/5] squash! print_wiki.c fix columns calculations
by Stefan Tauner 25 Feb '12

25 Feb '12

- boards Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- print_wiki.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/print_wiki.c b/print_wiki.c index e0b5ff3..d55563c 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -134,11 +134,12 @@ static void print_supported_chipsets_wiki(int cols) static void print_supported_boards_wiki_helper(const char *devicetype, int cols, const struct board_info boards[]) { - int i, j, k = 0, color = 1; + int i, k = 0, color = 1; int num_notes = 0; char *notes = calloc(1, 1); const struct board_match *b = board_matches; unsigned int boardcount = 0, boardcount_good = 0, boardcount_bad = 0; + unsigned int lines_per_col; char tmp[900 + 1]; for (i = 0; boards[i].vendor != NULL; i++) { @@ -149,12 +150,17 @@ static void print_supported_boards_wiki_helper(const char *devicetype, int cols, boardcount++; } + /* +1 to force the resulting number of columns to be < cols */ + lines_per_col = boardcount / cols + ((boardcount%cols) > 0 ? 1 : 0); + printf("\n\nTotal amount of supported %s: '''%d'''. " "Not yet supported (i.e., known-bad): '''%d'''.\n\n" - "{| border=\"0\" valign=\"top\"\n| valign=\"top\"|\n\n%s", - devicetype, boardcount_good, boardcount_bad, board_th); + "{| border=\"0\" valign=\"top\"\n", + devicetype, boardcount_good, boardcount_bad); - for (i = 0, j = 0; boards[i].vendor != NULL; i++, j++) { + for (i = 0; boards[i].vendor != NULL; i++) { + if ((i % lines_per_col) == 0) + printf("| valign=\"top\"|\n\n%s", board_th); /* Alternate colors if the vendor changes. */ if (i > 0 && strcmp(boards[i].vendor, boards[i - 1].vendor)) @@ -190,14 +196,14 @@ static void print_supported_boards_wiki_helper(const char *devicetype, int cols, printf("\n"); } - /* Split table in 'cols' columns. */ - if (j >= (boardcount / cols + 1)) { - printf("\n|}\n\n| valign=\"top\"|\n\n%s", board_th); - j = 0; - } + if (((i % lines_per_col) + 1) == lines_per_col) + printf("\n|}\n\n"); } - printf("\n|}\n\n|}\n"); + /* end inner table if it did not fill the last column fully */ + if (((i % lines_per_col)) > 0) + printf("\n|}\n\n"); + printf("\n\n|}\n"); if (num_notes > 0) printf("\n<small>\n%s</small>\n", notes); -- 1.7.1

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom