flashrom June 2010

flashrom@flashrom.org

74 participants
219 discussions

[PATCH] Make the 'flashrom --help' output look a bit nicer
by Uwe Hermann 04 Jun '10

04 Jun '10

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

2 2

[commit] r1030 - trunk
by repository service 04 Jun '10

04 Jun '10

Author: uwe Date: Fri Jun 4 19:07:39 2010 New Revision: 1030 URL: http://flashrom.org/trac/coreboot/changeset/1030 Log: Make the 'flashrom --help' output look a bit nicer. Only print "flashrom" as the program name unconditionally, not the full path and program name (e.g. "/home/foo/bar/baz/flashrom" or on Windows "C:\Foo\Bar\Whatever\flashrom.exe"). The path or exact executable name is not really useful to print here, if you managed to run --help you already know it, and it just makes the output look ugly. Also, add a missing newline to make the output look nicer. Finally, revert the "CONFIG_PRINT_WIKI ?= yes" change which accidentally slipped into r1029. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/Makefile trunk/cli_classic.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Fri Jun 4 18:39:35 2010 (r1029) +++ trunk/Makefile Fri Jun 4 19:07:39 2010 (r1030) @@ -120,7 +120,7 @@ CONFIG_DEDIPROG ?= no # Disable wiki printing by default. It is only useful if you have wiki access. -CONFIG_PRINT_WIKI ?= yes +CONFIG_PRINT_WIKI ?= no ifeq ($(CONFIG_INTERNAL), yes) FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' Modified: trunk/cli_classic.c ============================================================================== --- trunk/cli_classic.c Fri Jun 4 18:39:35 2010 (r1029) +++ trunk/cli_classic.c Fri Jun 4 19:07:39 2010 (r1030) @@ -38,14 +38,13 @@ int remaining = 0; enum programmer p; - printf("Usage: %s [-n] [-V] [-f] [-h|-R|-L|" + printf("Usage: flashrom [-n] [-V] [-f] [-h|-R|-L|" #if CONFIG_PRINT_WIKI == 1 "-z|" #endif "-E|-r <file>|-w <file>|-v <file>]\n" " [-c <chipname>] [-m [<vendor>:]<part>] [-l <file>]\n" - " [-i <image>] [-p <programmername>[:<parameters>]]\n", - name); + " [-i <image>] [-p <programmername>[:<parameters>]]\n\n"); printf("Please note that the command line interface for flashrom has " "changed between\n" @@ -119,9 +118,9 @@ "flash chips.\n\n"); } -void cli_classic_abort_usage(const char *name) +void cli_classic_abort_usage(void) { - printf("Please run \"%s --help\" for usage info.\n", name); + printf("Please run \"flashrom --help\" for usage info.\n"); exit(1); } @@ -185,7 +184,7 @@ if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); } filename = strdup(optarg); read_it = 1; @@ -194,7 +193,7 @@ if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); } filename = strdup(optarg); write_it = 1; @@ -204,12 +203,12 @@ if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); } if (dont_verify_it) { fprintf(stderr, "--verify and --noverify are" "mutually exclusive. Aborting.\n"); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); } filename = strdup(optarg); verify_it = 1; @@ -218,7 +217,7 @@ if (verify_it) { fprintf(stderr, "--verify and --noverify are" "mutually exclusive. Aborting.\n"); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); } dont_verify_it = 1; break; @@ -232,7 +231,7 @@ if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); } erase_it = 1; break; @@ -244,7 +243,7 @@ fprintf(stderr, "Error: Internal programmer support " "was not compiled in and --mainboard only\n" "applies to the internal programmer. Aborting.\n"); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); #endif break; case 'f': @@ -253,7 +252,7 @@ case 'l': tempstr = strdup(optarg); if (read_romlayout(tempstr)) - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); break; case 'i': tempstr = strdup(optarg); @@ -263,7 +262,7 @@ if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); } list_supported = 1; break; @@ -272,13 +271,13 @@ if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); } list_supported_wiki = 1; #else fprintf(stderr, "Error: Wiki output was not compiled " "in. Aborting.\n"); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); #endif break; case 'p': @@ -310,7 +309,7 @@ if (programmer == PROGRAMMER_INVALID) { fprintf(stderr, "Error: Unknown programmer " "%s.\n", optarg); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); } break; case 'R': @@ -318,7 +317,7 @@ if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); } exit(0); break; @@ -326,13 +325,13 @@ if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); } cli_classic_usage(argv[0]); exit(0); break; default: - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); break; } } @@ -353,14 +352,14 @@ if (optind < argc) { fprintf(stderr, "Error: Extra parameter found.\n"); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); } #if CONFIG_INTERNAL == 1 if ((programmer != PROGRAMMER_INTERNAL) && (lb_part || lb_vendor)) { fprintf(stderr, "Error: --mainboard requires the internal " "programmer. Aborting.\n"); - cli_classic_abort_usage(argv[0]); + cli_classic_abort_usage(); } #endif

1 0

[PATCH 1/1] Fix links for Gigabyte motherboards (2nd try)
by Peter Lemenkov 04 Jun '10

04 Jun '10

2 1

[commit] r1029 - trunk
by repository service 04 Jun '10

04 Jun '10

Author: uwe Date: Fri Jun 4 18:39:35 2010 New Revision: 1029 URL: http://flashrom.org/trac/coreboot/changeset/1029 Log: Fix URLs for GIGABYTE motherboards. Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/Makefile trunk/print.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Thu Jun 3 23:48:13 2010 (r1028) +++ trunk/Makefile Fri Jun 4 18:39:35 2010 (r1029) @@ -120,7 +120,7 @@ CONFIG_DEDIPROG ?= no # Disable wiki printing by default. It is only useful if you have wiki access. -CONFIG_PRINT_WIKI ?= no +CONFIG_PRINT_WIKI ?= yes ifeq ($(CONFIG_INTERNAL), yes) FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' Modified: trunk/print.c ============================================================================== --- trunk/print.c Thu Jun 3 23:48:13 2010 (r1028) +++ trunk/print.c Fri Jun 4 18:39:35 2010 (r1029) @@ -332,24 +332,24 @@ B("EPoX", "EP-BX3", 1, "http://www.epox.com/product.asp?ID=EP-BX3", NULL), B("FIC", "VA-502", 0, "ftp://ftp.fic.com.tw/motherboard/manual/socket7/va-502/", NULL), B("GIGABYTE", "GA-2761GXDK", 1, "http://www.computerbase.de/news/hardware/mainboards/amd-systeme/2007/mai/gi…", NULL), - B("GIGABYTE", "GA-6BXC", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), - B("GIGABYTE", "GA-6BXDU", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), - B("GIGABYTE", "GA-6ZMA", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), - B("GIGABYTE", "GA-7VT600", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), - B("GIGABYTE", "GA-7ZM", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", "Works fine if you remove jumper JP9 on the board and disable the flash protection BIOS option."), - B("GIGABYTE", "GA-965P-DS4", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), - B("GIGABYTE", "GA-EP35-DS3L", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), - B("GIGABYTE", "GA-EX58-UD4P", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), - B("GIGABYTE", "GA-K8N-SLI", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), - B("GIGABYTE", "GA-M57SLI-S4", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), - B("GIGABYTE", "GA-M61P-S3", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), - B("GIGABYTE", "GA-MA69VM-S2", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), - B("GIGABYTE", "GA-MA770T-UD3P", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), - B("GIGABYTE", "GA-MA78G-DS3H", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), /* TODO: Rev 1.x or 2.x? */ - B("GIGABYTE", "GA-MA78GM-S2H", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), /* TODO: Rev. 1.0, 1.1, or 2.x? */ - B("GIGABYTE", "GA-MA78GPM-DS2H", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), - B("GIGABYTE", "GA-MA790FX-DQ6", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), - B("GIGABYTE", "GA-MA790GP-DS4H", 1, "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…", NULL), + B("GIGABYTE", "GA-6BXC", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1445", NULL), + B("GIGABYTE", "GA-6BXDU", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1429", NULL), + B("GIGABYTE", "GA-6ZMA", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1541", NULL), + B("GIGABYTE", "GA-7VT600", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1666", NULL), + B("GIGABYTE", "GA-7ZM", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1366", "Works fine if you remove jumper JP9 on the board and disable the flash protection BIOS option."), + B("GIGABYTE", "GA-965P-DS4", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2288", NULL), + B("GIGABYTE", "GA-EP35-DS3L", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2778", NULL), + B("GIGABYTE", "GA-EX58-UD4P", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2986", NULL), + B("GIGABYTE", "GA-K8N-SLI", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1928", NULL), + B("GIGABYTE", "GA-M57SLI-S4", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2287", NULL), + B("GIGABYTE", "GA-M61P-S3", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2434", NULL), + B("GIGABYTE", "GA-MA69VM-S2", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2500", NULL), + B("GIGABYTE", "GA-MA770T-UD3P", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=3096", NULL), + B("GIGABYTE", "GA-MA78G-DS3H", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2800", NULL), /* TODO: Rev 1.x or 2.x? */ + B("GIGABYTE", "GA-MA78GM-S2H", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2758", NULL), /* TODO: Rev. 1.0, 1.1, or 2.x? */ + B("GIGABYTE", "GA-MA78GPM-DS2H", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2859", NULL), + B("GIGABYTE", "GA-MA790FX-DQ6", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2690", NULL), + B("GIGABYTE", "GA-MA790GP-DS4H", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2887", NULL), B("HP", "DL145 G3", 1, "http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c008…", NULL), B("HP", "Vectra VL400 PC", 1, "http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c000…", NULL), B("HP", "Vectra VL420 SFF PC", 1, "http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c000…", NULL),

1 0

"""help us finish support for your chipset. Thanks."""
by chris yagami 04 Jun '10

04 Jun '10

flashrom v0.9.1-r946 No coreboot table found. DMI string system-manufacturer: "To Be Filled By O.E.M." DMI string system-product-name: "To Be Filled By O.E.M." DMI string system-version: "To Be Filled By O.E.M." DMI string baseboard-manufacturer: "ASRock" DMI string baseboard-product-name: "N68-S".... Attached file txt

1 0

[PATCH] new windows port
by Stefan Reinauer 04 Jun '10

04 Jun '10

Hi, I separated the direct io access code from the flashrom changes, to make this code easily available for the other coreboot utilities, too. The remaining windows patch is rather small. I'll clean up the directio code some more and make a release asap. Best regards, Stefan -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/ Registergericht: Amtsgericht Freiburg • HRB 7656 Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866

3 9

[RFC] #ifdef or #if defined()
by Carl-Daniel Hailfinger 04 Jun '10

04 Jun '10

Right now flashrom uses a mix of #ifdef and #if defined() and due to that, readability suffers. Should we use #if defined() everywhere and kill #ifdef? Should we evaluate the preprocessor defines for their value instead of their presence to avoid strange problems once someone defines anything to 0? Regards, Carl-Daniel -- http://www.hailfinger.org/

1 0

[PATCH] Handle insufficient DOS timer precision
by Carl-Daniel Hailfinger 04 Jun '10

04 Jun '10

Handle insufficient DOS timer precision by measuring a 100 ms delay instead of a 100 us delay. This should reduce the likelihood of flashrom timer complaints from 100% to 50%. If you want less complaints, use 1000 ms instead. This is mostly a proof of concept and I'd appreciate tests. Once I know which #defines to look for on MinGW and Cygwin, I can modify the #if to cover them as well. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-measure_delay_precision_dos/udelay.c =================================================================== --- flashrom-measure_delay_precision_dos/udelay.c (Revision 1008) +++ flashrom-measure_delay_precision_dos/udelay.c (Arbeitskopie) @@ -93,7 +93,19 @@ * a scheduler delay or something similar. */ for (i = 0; i < 4; i++) { - if (measure_delay(100) < 90) { +#if !defined(__DJGPP__) + timeusec = measure_delay(100); +#else + /* This zero delay workaround should be active for + * DOS and Windows and maybe libpayload. The criterion + * here is insufficient (worse than 100 us) OS timer + * resolution which will result in measure_delay(100)=0 + * whereas a longer delay (100 ms) will be sufficient + * to get a nonzero time measurement. + */ + timeusec = measure_delay(100000) / 1000; +#endif + if (timeusec < 90) { msg_pdbg("delay more than 10%% too short, " "recalculating... "); goto recalibrate; -- http://www.hailfinger.org/

3 5

[commit] r1001 - tags/flashrom-0.9.2
by repository service 04 Jun '10

04 Jun '10

Author: hailfinger Date: Wed May 19 18:55:43 2010 New Revision: 1001 URL: http://flashrom.org/trac/coreboot/changeset/1001 Log: Tag flashrom 0.9.2 Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Luc Verhaegen <libv(a)skynet.be> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Added: tags/flashrom-0.9.2/ - copied from r1000, trunk/

3 3

[commit] r1028 - trunk
by repository service 03 Jun '10

03 Jun '10

Author: hailfinger Date: Thu Jun 3 23:48:13 2010 New Revision: 1028 URL: http://flashrom.org/trac/coreboot/changeset/1028 Log: Do not trust the OS at all and measure timer precision before calibrating the delay loop and use that measurement to get reasonable precision for our own delay code. Print a measurement for a delay of 4x the OS timer resolution. Be precise about how bad the deviation was if we had to recalculate. Tested on Windows XP, 32 bit, built using MinGW by Uwe. Tested on FreeDOS v1.0 Final, 32bit, built using DJGPP 4.3.2 by Idwer. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Idwer Vollering <vidwer+lists.flashrom(a)gmail.com> Modified: trunk/udelay.c Modified: trunk/udelay.c ============================================================================== --- trunk/udelay.c Thu Jun 3 18:35:51 2010 (r1027) +++ trunk/udelay.c Thu Jun 3 23:48:13 2010 (r1028) @@ -37,6 +37,30 @@ } } +unsigned long measure_os_delay_resolution(void) +{ + unsigned long timeusec; + struct timeval start, end; + unsigned long counter = 0; + + gettimeofday(&start, 0); + timeusec = 0; + + while (!timeusec && (++counter < 1000000000)) { + gettimeofday(&end, 0); + timeusec = 1000000 * (end.tv_sec - start.tv_sec) + + (end.tv_usec - start.tv_usec); + /* Protect against time going forward too much. */ + if ((end.tv_sec > start.tv_sec) && + ((end.tv_sec - start.tv_sec) >= LONG_MAX / 1000000 - 1)) + timeusec = 0; + /* Protect against time going backwards during leap seconds. */ + if ((end.tv_sec < start.tv_sec) || (timeusec > LONG_MAX)) + timeusec = 0; + } + return timeusec; +} + unsigned long measure_delay(int usecs) { unsigned long timeusec; @@ -61,10 +85,16 @@ void myusec_calibrate_delay(void) { unsigned long count = 1000; - unsigned long timeusec; + unsigned long timeusec, resolution; int i, tries = 0; msg_pinfo("Calibrating delay loop... "); + resolution = measure_os_delay_resolution(); + if (resolution) { + msg_pdbg("OS timer resolution is %u usecs, ", resolution); + } else { + msg_pinfo("OS timer resolution is unusable. "); + } recalibrate: count = 1000; @@ -94,9 +124,27 @@ * a scheduler delay or something similar. */ for (i = 0; i < 4; i++) { - if (measure_delay(100) < 90) { - msg_pdbg("delay more than 10%% too short, " - "recalculating... "); + if (resolution && (resolution < 10)) { + timeusec = measure_delay(100); + } else if (resolution && + (resolution < ULONG_MAX / 200)) { + timeusec = measure_delay(resolution * 10) * + 100 / (resolution * 10); + } else { + /* This workaround should be active for broken + * OS and maybe libpayload. The criterion + * here is horrible or non-measurable OS timer + * resolution which will result in + * measure_delay(100)=0 whereas a longer delay + * (1000 ms) may be sufficient + * to get a nonzero time measurement. + */ + timeusec = measure_delay(1000000) / 10000; + } + if (timeusec < 90) { + msg_pdbg("delay more than 10%% too short (got " + "%lu%% of expected delay), " + "recalculating... ", timeusec); goto recalibrate; } } @@ -113,6 +161,8 @@ msg_pdbg("1000 myus = %ld us, ", timeusec); timeusec = measure_delay(10000); msg_pdbg("10000 myus = %ld us, ", timeusec); + timeusec = measure_delay(resolution * 4); + msg_pdbg("%ld myus = %ld us, ", resolution * 4, timeusec); msg_pinfo("OK.\n"); }

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom June 2010