March 2010 - flashrom - mail.coreboot.org

Unused functions...
by Carl-Daniel Hailfinger March 27, 2010

March 27, 2010

We have a few unused functions in our codebase. Should we - mark then static (may cause gcc to complain if -Wunused-function is enabled) - put them inside #if 0 (code will bitrot) - remove them from the source base entirely (some may be used in the future) jedec.c: data_polling_jedec (maybe some chip in the future won't support toggle_jedec) stm50flw0x0x.c: erase_sector_stm50flw0x0x (keep?) m29f400bt.c: write_m29f400bt (hm, probably kill) 82802ab.c: erase_82802ab (kill, old-style erase) pm49fl00x.c: lock_49fl00x (for the future) sst49lfxxxc.c: unlock_block_49lfxxxc (strange, don't we use that?) spi.c: default_spi_send_command (if one chip driver ever supports only multicommand) spi25.c: spi_write_status_enable (we should use it, some chips require that) spi_write_disable (does that make sense?) spi_aai_write (need some write infrastructure changes for this) spi_chip_erase_d8 (kill) flashrom.c: chip_writel (will we ever need it?) chip_writen (this one might be usable for a few chip drivers) chip_readl (will we ever need it?) list_programmers (no idea) register_shutdown (needed for ECs) need_erase (needed for partial write) internal.c: pci_dev_find_filter (hmmm) Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[patch] add version information similar to 'uname -mrs'
by Idwer Vollering March 27, 2010

March 27, 2010

Include detailed versioning information in the binary (--version). Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> --- Future thoughts: include the used version of libpci.

4 16

[commit] r987 - trunk
by repository service March 27, 2010

March 27, 2010

Author: hailfinger Date: Sat Mar 27 17:36:40 2010 New Revision: 987 URL: http://flashrom.org/trac/coreboot/changeset/987 Log: Add runtime and build environment info to the flashrom version message. This patch uses code from Idwer Vollering and Maciej Pijanka. I've added Makefile support and compiler version printing and restructured the code heavily. The code prints runtime system information and buildtime libpci information (I couldn't find any runtime libpci version function). Due to our ability to cross-compile flashrom, buildtime system information from "uname -mrs" doesn't help diagnosing any problems. That's why only libpci and gcc are buildtime info, and the rest is runtime info. Examples: openSUSE 10.3, i686, gcc 4.2.1, with PCI support: flashrom v0.9.1-r971 on Linux 2.6.22.19-0.2-default (i686), built with libpci 2.2.6, GCC 4.2.1 (SUSE Linux) openSUSE 10.3, i686, llvm-clang-2.6.99svn97231, with PCI support: flashrom v0.9.1-r971 on Linux 2.6.22.19-0.2-default (i686), built with libpci 2.2.6, LLVM 1/clang 1 openSUSE 11.1, x86_64, gcc 4.3.2, with PCI support: flashrom v0.9.1-r972 on Linux 2.6.27.29-0.1-default (x86_64), built with libpci 3.0.1, GCC 4.3.2 [gcc-4_3-branch revision 141291] openSUSE 10.3, i686, gcc 4.2.1, without PCI support: flashrom v0.9.1-r971 on Linux 2.6.22.19-0.2-default (i686), built with GCC 4.2.1 (SUSE Linux) Windows/cygwin, i686, gcc 4.3.4, without PCI support: flashrom v0.9.1-r973 on CYGWIN_NT-5.1 1.7.1(0.218/5/3) (i686), built with GCC 4.3.4 20090804 (release) 1 FreeBSD 8.0, i386, gcc 4.2.1, with PCI support: flashrom v0.9.1-r973 on FreeBSD 8.0-RELEASE-p2 (i386), built with libpci 3.1.7, GCC 4.2.1 20070719 [FreeBSD] Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> Acked-by: Maciej Pijanka <maciej.pijanka(a)gmail.com> Modified: trunk/Makefile trunk/flashrom.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Mar 27 17:16:01 2010 (r986) +++ trunk/Makefile Sat Mar 27 17:36:40 2010 (r987) @@ -230,6 +230,8 @@ CLI_OBJS += print_wiki.o endif +FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "UTSNAME := yes" .features && printf "%s" "-D'HAVE_UTSNAME=1'") + # We could use PULLED_IN_LIBS, but that would be ugly. FEATURE_LIBS += $(shell LC_ALL=C grep -q "NEEDLIBZ := yes" .libdeps && printf "%s" "-lz") @@ -308,12 +310,29 @@ @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest $(FTDILIBS) $(LIBS) >/dev/null 2>&1 && \ ( echo "found."; echo "FTDISUPPORT := yes" >> .features.tmp ) || \ ( echo "not found."; echo "FTDISUPPORT := no" >> .features.tmp ) + @printf "Checking for utsname support... " + @$(shell ( echo "#include <sys/utsname.h>"; \ + echo "struct utsname osinfo;"; \ + echo "int main(int argc, char **argv)"; \ + echo "{ uname (&osinfo); return 0; }"; ) > .featuretest.c ) + @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest >/dev/null 2>&1 && \ + ( echo "found."; echo "UTSNAME := yes" >> .features.tmp ) || \ + ( echo "not found."; echo "UTSNAME := no" >> .features.tmp ) @$(DIFF) -q .features.tmp .features >/dev/null 2>&1 && rm .features.tmp || mv .features.tmp .features @rm -f .featuretest.c .featuretest else features: compiler @echo "FEATURES := yes" > .features.tmp + @printf "Checking for utsname support... " + @$(shell ( echo "#include <sys/utsname.h>"; \ + echo "struct utsname osinfo;"; \ + echo "int main(int argc, char **argv)"; \ + echo "{ uname (&osinfo); return 0; }"; ) > .featuretest.c ) + @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest >/dev/null 2>&1 && \ + ( echo "found."; echo "UTSNAME := yes" >> .features.tmp ) || \ + ( echo "not found."; echo "UTSNAME := no" >> .features.tmp ) @$(DIFF) -q .features.tmp .features >/dev/null 2>&1 && rm .features.tmp || mv .features.tmp .features + @rm -f .featuretest.c .featuretest endif install: $(PROGRAM) Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sat Mar 27 17:16:01 2010 (r986) +++ trunk/flashrom.c Sat Mar 27 17:36:40 2010 (r987) @@ -27,6 +27,9 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> +#if HAVE_UTSNAME == 1 +#include <sys/utsname.h> +#endif #include "flash.h" #include "flashchips.h" @@ -1133,9 +1136,44 @@ printf("\n"); } +void print_sysinfo(void) +{ +#if HAVE_UTSNAME == 1 + struct utsname osinfo; + uname(&osinfo); + + msg_ginfo(" on %s %s (%s)", osinfo.sysname, osinfo.release, + osinfo.machine); +#else + msg_ginfo(" on unknown machine"); +#endif + msg_ginfo(", built with"); +#if NEED_PCI == 1 +#ifdef PCILIB_VERSION + msg_ginfo(" libpci %s,", PCILIB_VERSION); +#else + msg_ginfo(" unknown PCI library,"); +#endif +#endif +#ifdef __clang__ + msg_ginfo(" LLVM %i/clang %i", __llvm__, __clang__); +#elif defined(__GNUC__) + msg_ginfo(" GCC"); +#ifdef __VERSION__ + msg_ginfo(" %s", __VERSION__); +#else + msg_ginfo(" unknown version"); +#endif +#else + msg_ginfo(" unknown compiler"); +#endif + msg_ginfo("\n"); +} + void print_version(void) { - printf("flashrom v%s\n", flashrom_version); + printf("flashrom v%s", flashrom_version); + print_sysinfo(); } int selfcheck(void)

1 0

[PATCH] Clean up delay loop calibration
by Carl-Daniel Hailfinger March 27, 2010

March 27, 2010

Note: This patch is the first step towards a better delay loop calibration which will work regardless of how smart the C compiler is. The delay loop is probably one of the oldest pieces of code in flashrom and it shows. Clean up code duplication and measure timing of 10/100/1000/10000 us delays. Add copyright notices for my past and current work on this file. If possible, please run the following command a few times and mail the output to flashrom(a)flashrom.org flashrom -V|grep delay Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-delayloop/udelay.c =================================================================== --- flashrom-delayloop/udelay.c (Revision 921) +++ flashrom-delayloop/udelay.c (Arbeitskopie) @@ -2,6 +2,7 @@ * This file is part of the flashrom project. * * Copyright (C) 2000 Silicon Integrated System Corporation + * Copyright (C) 2009,2010 Carl-Daniel Hailfinger * * 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 @@ -19,6 +20,8 @@ */ #include <sys/time.h> +#include <stdlib.h> +#include <limits.h> #include "flash.h" // count to a billion. Time it. If it's < 1 sec, count to 10B, etc. @@ -30,21 +33,30 @@ for (i = 0; i < usecs * micro; i++) ; } +unsigned long measure_delay(int usecs) +{ + unsigned long timeusec; + struct timeval start, end; + + gettimeofday(&start, 0); + myusec_delay(usecs); + gettimeofday(&end, 0); + timeusec = 1000000 * (end.tv_sec - start.tv_sec) + + (end.tv_usec - start.tv_usec); + + return timeusec; +} + void myusec_calibrate_delay(void) { int count = 1000; unsigned long timeusec; - struct timeval start, end; int ok = 0; printf("Calibrating delay loop... "); while (!ok) { - gettimeofday(&start, 0); - myusec_delay(count); - gettimeofday(&end, 0); - timeusec = 1000000 * (end.tv_sec - start.tv_sec) + - (end.tv_usec - start.tv_usec); + timeusec = measure_delay(count); count *= 2; if (timeusec < 1000000 / 4) continue; @@ -53,14 +65,18 @@ // compute one microsecond. That will be count / time micro = count / timeusec; + msg_pdbg("%ldM loops per second, ", micro); - gettimeofday(&start, 0); - myusec_delay(100); - gettimeofday(&end, 0); - timeusec = 1000000 * (end.tv_sec - start.tv_sec) + - (end.tv_usec - start.tv_usec); - printf_debug("%ldM loops per second, 100 myus = %ld us. ", - (unsigned long)micro, timeusec); + /* We're interested in the actual precision. */ + timeusec = measure_delay(10); + msg_pdbg("10 myus = %ld us, ", timeusec); + timeusec = measure_delay(100); + msg_pdbg("100 myus = %ld us, ", timeusec); + timeusec = measure_delay(1000); + msg_pdbg("1000 myus = %ld us, ", timeusec); + timeusec = measure_delay(10000); + msg_pdbg("10000 myus = %ld us, ", timeusec); + printf("OK.\n"); } -- "I do consider assignment statements and pointer variables to be among computer science's most valuable treasures." -- Donald E. Knuth

2 3

[commit] r986 - trunk
by repository service March 27, 2010

March 27, 2010

Author: hailfinger Date: Sat Mar 27 17:16:01 2010 New Revision: 986 URL: http://flashrom.org/trac/coreboot/changeset/986 Log: The delay loop is probably one of the oldest pieces of code in flashrom. Clean up code duplication and measure timing of 10/100/1000/10000 us delays. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Maciej Pijanka <maciej.pijanka(a)gmail.com> Modified: trunk/udelay.c Modified: trunk/udelay.c ============================================================================== --- trunk/udelay.c Fri Mar 26 00:18:41 2010 (r985) +++ trunk/udelay.c Sat Mar 27 17:16:01 2010 (r986) @@ -2,6 +2,7 @@ * This file is part of the flashrom project. * * Copyright (C) 2000 Silicon Integrated System Corporation + * Copyright (C) 2009,2010 Carl-Daniel Hailfinger * * 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 @@ -19,6 +20,8 @@ */ #include <sys/time.h> +#include <stdlib.h> +#include <limits.h> #include "flash.h" // count to a billion. Time it. If it's < 1 sec, count to 10B, etc. @@ -30,21 +33,30 @@ for (i = 0; i < usecs * micro; i++) ; } +unsigned long measure_delay(int usecs) +{ + unsigned long timeusec; + struct timeval start, end; + + gettimeofday(&start, 0); + myusec_delay(usecs); + gettimeofday(&end, 0); + timeusec = 1000000 * (end.tv_sec - start.tv_sec) + + (end.tv_usec - start.tv_usec); + + return timeusec; +} + void myusec_calibrate_delay(void) { int count = 1000; unsigned long timeusec; - struct timeval start, end; int ok = 0; printf("Calibrating delay loop... "); while (!ok) { - gettimeofday(&start, 0); - myusec_delay(count); - gettimeofday(&end, 0); - timeusec = 1000000 * (end.tv_sec - start.tv_sec) + - (end.tv_usec - start.tv_usec); + timeusec = measure_delay(count); count *= 2; if (timeusec < 1000000 / 4) continue; @@ -53,14 +65,18 @@ // compute one microsecond. That will be count / time micro = count / timeusec; + msg_pdbg("%ldM loops per second, ", micro); + + /* We're interested in the actual precision. */ + timeusec = measure_delay(10); + msg_pdbg("10 myus = %ld us, ", timeusec); + timeusec = measure_delay(100); + msg_pdbg("100 myus = %ld us, ", timeusec); + timeusec = measure_delay(1000); + msg_pdbg("1000 myus = %ld us, ", timeusec); + timeusec = measure_delay(10000); + msg_pdbg("10000 myus = %ld us, ", timeusec); - gettimeofday(&start, 0); - myusec_delay(100); - gettimeofday(&end, 0); - timeusec = 1000000 * (end.tv_sec - start.tv_sec) + - (end.tv_usec - start.tv_usec); - printf_debug("%ldM loops per second, 100 myus = %ld us. ", - (unsigned long)micro, timeusec); printf("OK.\n"); }

1 0

GIGABYTE - GA-8IPE1000MK - ERASE FAILED!
by af＠localmta.zone4web.com March 26, 2010

March 26, 2010

Hello, First - Great tool - Great job - Thanks ! Please excuse my _great_ english. Atleast it should be understandable enough. Here is my problem: I'm trying to update the bios of GA-8IPE1000MK board from GIGABYTE. Here is the output of flashrom which explains the problem: --------------> # flashrom -w pe1000mk.f14 flashrom v0.9.1-r710 No coreboot table found. Found chipset "Intel ICH5/ICH5R", enabling flash write... OK. This chipset supports the following protocols: Non-SPI. Calibrating delay loop... OK. Found chip "SST SST49LF002A/B" (256 KB, FWH) at physical address 0xfffc0000. Flash image seems to be a legacy BIOS. Disabling checks. Writing flash chip... ERASE FAILED at 0x00000000! Expected=0xff, Read=0x25, failed byte count from 0x00000000-0x00003fff: 0x3fb6 ERASE FAILED! ERASE FAILED! ERASE FAILED! ERASE FAILED! FAILED! Your flash chip is in an unknown state. Get help on IRC at irc.freenode.net channel #flashrom or mail flashrom(a)flashrom.org ------------------------------------------------------------ DO NOT REBOOT OR POWEROFF! <----------------- After that I verified if flashrom actually changed something. I have a backup of the original bios and used it for the verify procedure. Rebooted and everything works normal with the old bios. Here is a link to bios update: http://download.gigabyte.eu/FileList/BIOS/motherboard_bios_ga-8ipe1000mk_f1… The .exe file can be extracted under linux with p7zip. I'm attaching the output of 'flashrom -V', 'lspci -nnvvvxxx', 'superiotool -deV' I hope this information is something to start. Thanks for your time!

1 0

Re: [flashrom] [PATCH] [DEMO] Merge print/print_wiki tables
by Carl-Daniel Hailfinger March 25, 2010

March 25, 2010

On 14.03.2010 16:42, Michael Karcher wrote: > No merge of boards_need_enable and the board enable table as I would never > get that patch past Luc Verhaegen. But a consistency check for these two > tables can be added to the flashrom selftest. > > Note, this DEMO patch is broken in that it does not print "-m" parameters anymore. > > Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Hm. I'm not exactly thrilled about this patch (not your fault). Yes, it reduces a sizable amount of duplication. Yes, it reduces the amount of consistency checking we have to do. Yes, it will probably reduce the number of mismatch bugs each time someone adds a new board. Still, the original reason I didn't want URLs and board names in the same master table is that I personally think URLs are ugly and should not be in flashrom at all. print_wiki.c allowed me to ignore that stuff without having to sacrifice working on any board lists. I can just pretend print_wiki doesn't exist and be happy. ;-) I won't veto the patch for two reasons: 1. You create most board enables and add most supported boards nowadays, so this is much more "your" turf than mine, and it should be in a state that makes development easier for you. 2. Uwe created most of the printing (and IIRC all of the wiki) code, so he will know if this patch is a good idea or not. If Uwe acks this, go ahead. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 3

[PATCH] Pre-release polishing
by Uwe Hermann March 25, 2010

March 25, 2010

See patch. Uwe. -- http://www.hermann-uwe.de | http://www.randomprojects.org http://www.crazy-hacks.org | http://www.unmaintained-free-software.org

2 2

[commit] r985 - trunk
by repository service March 25, 2010

March 25, 2010

Author: uwe Date: Fri Mar 26 00:18:41 2010 New Revision: 985 URL: http://flashrom.org/trac/coreboot/changeset/985 Log: Polish the flashrom code comments and outputs a bit. - Fix a number of typos (found via ispell). - Use correct vendor names (as per their websites) consistently. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/README trunk/board_enable.c trunk/coreboot_tables.h trunk/flashchips.c trunk/flashrom.8 trunk/ichspi.c trunk/jedec.c trunk/serprog-protocol.txt trunk/serprog.c trunk/stm50flw0x0x.c Modified: trunk/README ============================================================================== --- trunk/README Thu Mar 25 10:23:46 2010 (r984) +++ trunk/README Fri Mar 26 00:18:41 2010 (r985) @@ -121,6 +121,6 @@ #flashrom at irc.freenode.net -The Mailing list addess is +The mailing list address is flashrom(a)flashrom.org Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Thu Mar 25 10:23:46 2010 (r984) +++ trunk/board_enable.c Fri Mar 26 00:18:41 2010 (r985) @@ -341,7 +341,7 @@ } /** - * Suited for Asus M2V-MX: VIA K8M890 + VT8237A + IT8716F + * Suited for ASUS M2V-MX: VIA K8M890 + VT8237A + IT8716F */ static int via_vt823x_gpio5_raise(const char *name) { @@ -350,7 +350,7 @@ } /** - * Suited for VIAs EPIA N & NL. + * Suited for VIA EPIA N & NL. */ static int via_vt823x_gpio9_raise(const char *name) { @@ -358,7 +358,7 @@ } /** - * Suited for VIAs EPIA M and MII, and maybe other CLE266 based EPIAs. + * Suited for VIA EPIA M and MII, and maybe other CLE266 based EPIAs. * * We don't need to do this for EPIA M when using coreboot, GPIO15 is never * lowered there. @@ -484,7 +484,7 @@ } /** - * Suited for Shuttle FN25 (SN25P): AMD S939 + Nvidia CK804 (nForce4). + * Suited for Shuttle FN25 (SN25P): AMD S939 + NVIDIA CK804 (nForce4). */ static int board_shuttle_fn25(const char *name) { @@ -532,7 +532,7 @@ break; default: fprintf(stderr, - "\nERROR: no nVidia LPC/SMBus controller found.\n"); + "\nERROR: no NVIDIA LPC/SMBus controller found.\n"); return -1; } break; @@ -553,7 +553,7 @@ /** * Suited for ASUS A8N-LA: nVidia MCP51. - * Suited for ASUS M2NBP-VM CSM: nVidia MCP51. + * Suited for ASUS M2NBP-VM CSM: NVIDIA MCP51. */ static int nvidia_mcp_gpio0_raise(const char *name) { @@ -569,8 +569,8 @@ } /** - * Suited for MSI K8N Neo4: nVidia CK804. - * Suited for MSI K8N GM2-L: nVidia MCP51. + * Suited for MSI K8N Neo4: NVIDIA CK804. + * Suited for MSI K8N GM2-L: NVIDIA MCP51. */ static int nvidia_mcp_gpio2_raise(const char *name) { @@ -643,7 +643,7 @@ } /** - * Helper function to raise/drop a given gpo line on intel PIIX4{,E,M} + * Helper function to raise/drop a given gpo line on Intel PIIX4{,E,M}. */ static int intel_piix4_gpo_set(unsigned int gpo, int raise) { @@ -731,11 +731,11 @@ } /** - * Set a GPIO line on a given intel ICH LPC controller. + * Set a GPIO line on a given Intel ICH LPC controller. */ static int intel_ich_gpio_set(int gpio, int raise) { - /* table mapping the different intel ICH LPC chipsets. */ + /* Table mapping the different Intel ICH LPC chipsets. */ static struct { uint16_t id; uint8_t base_reg; @@ -801,8 +801,8 @@ return -1; } - /* According to the datasheets, all intel ICHs have the gpio bar 5:1 - strapped to zero. From some mobile ich9 version on, this becomes + /* According to the datasheets, all Intel ICHs have the GPIO bar 5:1 + strapped to zero. From some mobile ICH9 version on, this becomes 6:1. The mask below catches all. */ base = pci_read_word(dev, intel_ich_gpio_table[i].base_reg) & 0xFFC0; @@ -949,9 +949,9 @@ /** * Suited for: - * - Asus P4B266LM (Sony Vaio PCV-RX650): socket478 + 845D + ICH2. - * - Asus P4C800-E Deluxe: socket478 + 875P + ICH5. - * - Asus P4P800-E Deluxe: Intel socket478 + 865PE + ICH5R. + * - ASUS P4B266LM (Sony Vaio PCV-RX650): socket478 + 845D + ICH2. + * - ASUS P4C800-E Deluxe: socket478 + 875P + ICH5. + * - ASUS P4P800-E Deluxe: Intel socket478 + 865PE + ICH5R. */ static int intel_ich_gpio21_raise(const char *name) { @@ -960,9 +960,9 @@ /** * Suited for: - * - Asus P4B266: socket478 + intel 845D + ICH2. - * - Asus P4B533-E: socket478 + 845E + ICH4 - * - Asus P4B-MX variant in HP Vectra VL420 SFF: socket478 + 845D + ICH2 + * - ASUS P4B266: socket478 + Intel 845D + ICH2. + * - ASUS P4B533-E: socket478 + 845E + ICH4 + * - ASUS P4B-MX variant in HP Vectra VL420 SFF: socket478 + 845D + ICH2 */ static int intel_ich_gpio22_raise(const char *name) { @@ -986,7 +986,7 @@ /** * Suited for: - * - Dell Poweredge 1850: Intel PPGA604 + E7520 + ICH5R. + * - Dell PowerEdge 1850: Intel PPGA604 + E7520 + ICH5R. * - ASRock P4i65GV: Intel Socket478 + 865GV + ICH5R. */ static int intel_ich_gpio23_raise(const char *name) @@ -1197,7 +1197,7 @@ } /** - * Suited for Asus A7V8X: VIA KT400 + VT8235 + IT8703F-A + * Suited for ASUS A7V8X: VIA KT400 + VT8235 + IT8703F-A */ static int board_asus_a7v8x(const char *name) { @@ -1291,8 +1291,8 @@ /** * Suited for: - * - Asus A7V600-X: VIA KT600 + VT8237 + IT8712F - * - Asus A7V8X-X: VIA KT400 + VT8235 + IT8712F + * - ASUS A7V600-X: VIA KT600 + VT8237 + IT8712F + * - ASUS A7V8X-X: VIA KT400 + VT8235 + IT8712F */ static int it8712f_gpio3_1_raise(const char *name) { @@ -1319,7 +1319,7 @@ * * If PCI IDs are not sufficient for board matching, the match can be further * constrained by a string that has to be present in the DMI database for - * the baseboard or the system entry. The pattern is matched by case sensitve + * the baseboard or the system entry. The pattern is matched by case sensitive * substring match, unless it is anchored to the beginning (with a ^ in front) * or the end (with a $ at the end). Both anchors may be specified at the * same time to match the full field. Modified: trunk/coreboot_tables.h ============================================================================== --- trunk/coreboot_tables.h Thu Mar 25 10:23:46 2010 (r984) +++ trunk/coreboot_tables.h Fri Mar 26 00:18:41 2010 (r985) @@ -27,11 +27,11 @@ /* The coreboot table information is for conveying information * from the firmware to the loaded OS image. Primarily this * is expected to be information that cannot be discovered by - * other means, such as quering the hardware directly. + * other means, such as querying the hardware directly. * * All of the information should be Position Independent Data. * That is it should be safe to relocated any of the information - * without it's meaning/correctnes changing. For table that + * without it's meaning/correctness changing. For table that * can reasonably be used on multiple architectures the data * size should be fixed. This should ease the transition between * 32 bit and 64 bit architectures etc. @@ -48,7 +48,7 @@ * table entry is required or not. This should remove much of the * long term compatibility burden as table entries which are * irrelevant or have been replaced by better alternatives may be - * dropped. Of course it is polite and expidite to include extra + * dropped. Of course it is polite and expedite to include extra * table entries and be backwards compatible, but it is not required. */ @@ -78,10 +78,10 @@ uint32_t table_entries; }; -/* Every entry in the boot enviroment list will correspond to a boot +/* Every entry in the boot environment list will correspond to a boot * info record. Encoding both type and size. The type is obviously * so you can tell what it is. The size allows you to skip that - * boot enviroment record if you don't know what it easy. This allows + * boot environment record if you don't know what it easy. This allows * forward compatibility with records not yet defined. */ struct lb_record { Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Thu Mar 25 10:23:46 2010 (r984) +++ trunk/flashchips.c Fri Mar 26 00:18:41 2010 (r985) @@ -1133,7 +1133,7 @@ }, /* The next two chip definitions have top/bottom boot blocks, but has no - device differenciation between the two */ + device differentiation between the two */ { .vendor = "AMIC", .name = "A25L40PT", Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Thu Mar 25 10:23:46 2010 (r984) +++ trunk/flashrom.8 Fri Mar 26 00:18:41 2010 (r985) @@ -174,7 +174,7 @@ Show version information and exit. .SH PROGRAMMER SPECIFIC INFO Some programmer drivers accept further parameters to set programmer-specific -parameters. These parameters are seperated from the programmer name by a +parameters. These parameters are separated from the programmer name by a colon. While some programmers take arguments at fixed positions, other programmers use a key/value interface in which the key and value is separated by an equal sign and different pairs are separated by a comma or a colon. @@ -298,8 +298,8 @@ the source distribution. .TP .BR "buspiratespi " programmer -A required dev parameter specifyies the Bus Pirate device node and an optional -spispeed parameter specifyies the frequency of the SPI bus. The parameter +A required dev parameter specifies the Bus Pirate device node and an optional +spispeed parameter specifies the frequency of the SPI bus. The parameter delimiter is a comma. Syntax is .sp .B "flashrom -p buspiratespi:dev=/dev/device,spispeed=frequency" Modified: trunk/ichspi.c ============================================================================== --- trunk/ichspi.c Thu Mar 25 10:23:46 2010 (r984) +++ trunk/ichspi.c Fri Mar 26 00:18:41 2010 (r985) @@ -536,7 +536,7 @@ /* clear error status registers */ temp32 |= (SSFS_CDS + SSFS_FCERR); - /* USE 20 MhZ */ + /* Use 20 MHz */ temp32 |= SSFC_SCF_20MHZ; if (datalength != 0) { Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Thu Mar 25 10:23:46 2010 (r984) +++ trunk/jedec.c Fri Mar 26 00:18:41 2010 (r985) @@ -345,7 +345,7 @@ chipaddr d = dst; retry: - /* Issue JEDEC Start Program comand */ + /* Issue JEDEC Start Program command */ start_program_jedec_common(flash, mask); /* transfer data from source to destination */ Modified: trunk/serprog-protocol.txt ============================================================================== --- trunk/serprog-protocol.txt Thu Mar 25 10:23:46 2010 (r984) +++ trunk/serprog-protocol.txt Fri Mar 26 00:18:41 2010 (r985) @@ -46,14 +46,14 @@ cmd 7 support: byte 0 bit 7 cmd 8 support: byte 1 bit 0, and so on. 0x04 (Q_SERBUF): - If the programmer has guaranteedly working flow control, + If the programmer has a guaranteed working flow control, it should return a big bogus value - eg 0xFFFF. 0x05 (Q_BUSTYPE): The bit's are defined as follows: bit 0: PARALLEL, bit 1: LPC, bit 2: FWH, bit 3: SPI (if ever supported). 0x06 (Q_CHIPSIZE): Only applicable to parallel programmers. - An LPC/FHW/SPI-programmer can report this as not supported in the command bitmap. + An LPC/FWH/SPI-programmer can report this as not supported in the command bitmap. 0x08 (Q_WRNMAXLEN): If a programmer reports a bigger maximum write-n length than the serial buffer size, it is assumed that the programmer can process the data fast enough to take in the Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Thu Mar 25 10:23:46 2010 (r984) +++ trunk/serprog.c Fri Mar 26 00:18:41 2010 (r985) @@ -66,7 +66,7 @@ /* Bitmap of supported commands */ static uint8_t sp_cmdmap[32]; -/* sp_prev_was_write used to detect writes with continouous addresses +/* sp_prev_was_write used to detect writes with contiguous addresses and combine them to write-n's */ static int sp_prev_was_write = 0; /* sp_write_n_addr used as the starting addr of the currently @@ -138,7 +138,7 @@ return -1; } -/* Synchronize: a bit tricky algorhytm that tries to (and in my tests has * +/* Synchronize: a bit tricky algorithm that tries to (and in my tests has * * always succeeded in) bring the serial protocol to known waiting-for- * * command state - uses nonblocking read - rest of the driver uses * * blocking read - TODO: add an alarm() timer for the rest of the app on * @@ -534,7 +534,7 @@ if (sp_device_opbuf_size <= (sp_opbuf_usage + bytes_to_be_added)) { sp_execute_opbuf(); /* If this happens in the mid of an page load the page load * - * will propably fail. */ + * will probably fail. */ msg_pdbg(MSGHEADER "Warning: executed operation buffer due to size reasons\n"); } } @@ -589,7 +589,7 @@ return c; } -/* Local version that really does the job, doesnt care of max_read_n. */ +/* Local version that really does the job, doesn't care of max_read_n. */ static void sp_do_read_n(uint8_t * buf, const chipaddr addr, size_t len) { int rd_bytes = 0; Modified: trunk/stm50flw0x0x.c ============================================================================== --- trunk/stm50flw0x0x.c Thu Mar 25 10:23:46 2010 (r984) +++ trunk/stm50flw0x0x.c Fri Mar 26 00:18:41 2010 (r985) @@ -49,7 +49,7 @@ * to them. The size of the locking sectors depends on the type * of chip. * - * Sometimes, the BIOS does this for you; so you propably + * Sometimes, the BIOS does this for you; so you probably * don't need to worry about that. */

1 0

Re: [flashrom] [PATCH] Move Gigabyte it87spi boards to 'no enable' section
by Carl-Daniel Hailfinger March 25, 2010

March 25, 2010

On 25.03.2010 10:54, Michael Karcher wrote: > This finishes the it87spi autodetection stuff of r983. Also fixes > sorting of Gigabyte boards. > > Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> > Hm. IMHO we have too much cosmetic changes in that table. The only thing that happens is reordering, but AFAICS this won't affect output in any way. Does ordering into different (OK/boardenable/bad) groups even make sense? That stuff is bound to change anyway we fix/modify some boards, and the group info is stored in other arrays anyway. A similar question applies to the laptop/non-laptop distinction in that table. Your patch changes the code to match the comments again, so I don't have a valid code-based reason to reject your patch. Still, I think we should discuss the general ordering of that table before that file will get a hotbed of reodering moves. Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1