March 2010 - flashrom - mail.coreboot.org

[PATCH] Fix non-FWH chips with FWH-like commands
by Michael Karcher March 13, 2010

March 13, 2010

Flash registers are not mapped on these chips, but the unprotection code in erase_82802ab_block tried to access them. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> --- 82802ab.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/82802ab.c b/82802ab.c index e63dc10..e0c0ba5 100644 --- a/82802ab.c +++ b/82802ab.c @@ -101,7 +101,10 @@ int erase_82802ab_block(struct flashchip *flash, unsigned int page, unsigned int chip_writeb(0x50, bios + page); // clear write protect - chip_writeb(0, wrprotect); + // FIXME: remove second part when FWH uses feature bits + if (flash->feature_bits & FEATURE_REGISTERMAP || + flash->bustype == CHIP_BUSTYPE_FWH) + chip_writeb(0, wrprotect); // now start it chip_writeb(0x20, bios + page); -- 1.7.0

1 0

[commit] r935 - trunk
by repository service March 13, 2010

March 13, 2010

Author: mkarcher Date: Sun Mar 14 01:00:14 2010 New Revision: 935 URL: http://flashrom.org/trac/coreboot/changeset/935 Log: Enabling Gigabyte GA-MA69VM-S2 This board has a supported chipset and a supported bios, but it's connected indirectly through IT8716 and not recognized. Signed-off-by: Raúl Soriano <GatoLoko(a)gmail.com> Acked-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Modified: trunk/board_enable.c trunk/print.c trunk/print_wiki.c Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Sun Mar 14 00:47:09 2010 (r934) +++ trunk/board_enable.c Sun Mar 14 01:00:14 2010 (r935) @@ -1293,6 +1293,7 @@ {0x10DE, 0x0050, 0x1458, 0x0C11, 0x10DE, 0x005e, 0x1458, 0x5000, NULL, NULL, NULL, "GIGABYTE", "GA-K8N-SLI", 0, OK, nvidia_mcp_gpio21_raise}, {0x10DE, 0x0360, 0x1458, 0x0C11, 0x10DE, 0x0369, 0x1458, 0x5001, NULL, "gigabyte", "m57sli", "GIGABYTE", "GA-M57SLI-S4", 0, OK, it87xx_probe_spi_flash}, {0x10de, 0x03e0, 0, 0, 0x10DE, 0x03D0, 0, 0, NULL, NULL, NULL, "GIGABYTE", "GA-M61P-S3", 0, OK, it87xx_probe_spi_flash}, + {0x1002, 0x7910, 0x1458, 0x5000, 0x1002, 0x438D, 0x1458, 0x5001, NULL, NULL, NULL, "GIGABYTE", "GA-MA69VM-S2", 0, OK, it87xx_probe_spi_flash}, {0x1002, 0x4398, 0x1458, 0x5004, 0x1002, 0x4391, 0x1458, 0xb000, NULL, NULL, NULL, "GIGABYTE", "GA-MA78G-DS3H", 0, OK, it87xx_probe_spi_flash}, {0x1002, 0x4398, 0x1458, 0x5004, 0x1002, 0x4391, 0x1458, 0xb002, NULL, NULL, NULL, "GIGABYTE", "GA-MA78GM-S2H", 0, OK, it87xx_probe_spi_flash}, {0x1002, 0x438d, 0x1458, 0x5001, 0x1002, 0x5956, 0x1002, 0x5956, NULL, NULL, NULL, "GIGABYTE", "GA-MA790FX-DQ6", 0, OK, it87xx_probe_spi_flash}, Modified: trunk/print.c ============================================================================== --- trunk/print.c Sun Mar 14 00:47:09 2010 (r934) +++ trunk/print.c Sun Mar 14 01:00:14 2010 (r935) @@ -301,6 +301,7 @@ { "GIGABYTE", "GA-7ZM", }, { "GIGABYTE", "GA-EP35-DS3L", }, { "GIGABYTE", "GA-EX58-UD4P", }, + { "GIGABYTE", "GA-MA69VM-S2", }, { "GIGABYTE", "GA-MA78GPM-DS2H", }, { "GIGABYTE", "GA-MA790GP-DS4H", }, { "GIGABYTE", "GA-MA770T-UD3P", }, Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Sun Mar 14 00:47:09 2010 (r934) +++ trunk/print_wiki.c Sun Mar 14 01:00:14 2010 (r935) @@ -144,6 +144,7 @@ { "GIGABYTE", "GA-6ZMA", "http://www.gigabyte.de/Support/Motherboard/BIOS_Model.aspx?ProductID=3289" }, { "GIGABYTE", "GA-EX58-UD4P", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Overview.aspx?Prod…" }, { "GIGABYTE", "GA-EP35-DS3L", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Overview.aspx?Prod…" }, + { "GIGABYTE", "GA-MA69VM-S2", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Overview.aspx?Prod…" }, { "GIGABYTE", "GA-MA790GP-DS4H", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-MA78GPM-DS2H", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-MA770T-UD3P", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" },

1 0

Re: [flashrom] [PATCH] Fix EN29F002 Top/Bottom Boot Block
by Sean Nelson March 13, 2010

March 13, 2010

On 3/13/10 3:22 PM, Michael Karcher wrote: > Signed-off-by: Michael Karcher<flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Sean Nelson <audiohacked(a)gmail.com>

2 1

[commit] r934 - trunk
by repository service March 13, 2010

March 13, 2010

Author: mkarcher Date: Sun Mar 14 00:47:09 2010 New Revision: 934 URL: http://flashrom.org/trac/coreboot/changeset/934 Log: Fix EN29F002 Top/Bottom Boot Block See http://www.coreboot.org/pipermail/flashrom/2010-March/002480.html for effects of mixup: blockwise erase will fail, fallback to chip erase works. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/flashchips.c Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Sat Mar 13 18:28:29 2010 (r933) +++ trunk/flashchips.c Sun Mar 14 00:47:09 2010 (r934) @@ -2137,10 +2137,10 @@ { { .eraseblocks = { - {64 * 1024, 3}, - {32 * 1024, 1}, - {8 * 1024, 2}, {16 * 1024, 1}, + {8 * 1024, 2}, + {32 * 1024, 1}, + {64 * 1024, 3}, }, .block_erase = erase_sector_jedec, }, { @@ -2168,10 +2168,10 @@ { { .eraseblocks = { - {16 * 1024, 1}, - {8 * 1024, 2}, - {32 * 1024, 1}, {64 * 1024, 3}, + {32 * 1024, 1}, + {8 * 1024, 2}, + {16 * 1024, 1}, }, .block_erase = erase_sector_jedec, }, {

1 0

[PATCH] Fix EN29F002 Top/Bottom Boot Block
by Michael Karcher March 13, 2010

March 13, 2010

See http://www.coreboot.org/pipermail/flashrom/2010-March/002480.html for effects of mixup: blockwise erase will fail, fallback to chip erase works. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> --- flashchips.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flashchips.c b/flashchips.c index 24736d4..1c30edc 100644 --- a/flashchips.c +++ b/flashchips.c @@ -2137,10 +2137,10 @@ struct flashchip flashchips[] = { { { .eraseblocks = { - {64 * 1024, 3}, - {32 * 1024, 1}, - {8 * 1024, 2}, {16 * 1024, 1}, + {8 * 1024, 2}, + {32 * 1024, 1}, + {64 * 1024, 3}, }, .block_erase = erase_sector_jedec, }, { @@ -2168,10 +2168,10 @@ struct flashchip flashchips[] = { { { .eraseblocks = { - {16 * 1024, 1}, - {8 * 1024, 2}, - {32 * 1024, 1}, {64 * 1024, 3}, + {32 * 1024, 1}, + {8 * 1024, 2}, + {16 * 1024, 1}, }, .block_erase = erase_sector_jedec, }, { -- 1.7.0

1 0

[commit] r933 - trunk
by repository service March 13, 2010

March 13, 2010

Author: uwe Date: Sat Mar 13 18:28:29 2010 New Revision: 933 URL: http://flashrom.org/trac/coreboot/changeset/933 Log: Various coding style and cosmetic changes (trivial). - Fix coding-style, whitespace, and indentation in a few places. - Consistently use the same spelling ("Super I/O") everywhere. - Make some flashrom stdout output look a bit nicer. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/board_enable.c trunk/cli_output.c trunk/dmi.c trunk/flashrom.c trunk/hwaccess.h trunk/internal.c trunk/it87spi.c trunk/serial.c Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Sat Mar 13 15:47:48 2010 (r932) +++ trunk/board_enable.c Sat Mar 13 18:28:29 2010 (r933) @@ -79,7 +79,7 @@ break; case SUPERIO_VENDOR_ITE: enter_conf_mode_ite(superio.port); - /* Enable flash mapping. Works for most old ITE style SuperI/O. */ + /* Enable flash mapping. Works for most old ITE style Super I/O. */ tmp = sio_read(superio.port, 0x24); tmp |= 0xfc; sio_write(superio.port, 0x24, tmp); @@ -87,7 +87,7 @@ ret = 0; break; default: - printf_debug("Unhandled SuperI/O type!\n"); + printf_debug("Unhandled Super I/O type!\n"); ret = -1; break; } @@ -226,7 +226,7 @@ * - GIGABYTE GA-7VT600: VIA KT600 + VT8237 + IT8705 * - Shuttle AK38N: VIA KT333CF + VIA VT8235 + ITE IT8705F * - * SIS950 superio probably requires the same flash write enable. + * The SIS950 Super I/O probably requires the same flash write enable. */ static int it8705f_write_enable_2e(const char *name) { @@ -239,36 +239,32 @@ int gpio_bank = gpio / 8; int gpio_pin = gpio % 8; uint16_t baseport; - uint8_t id; - uint8_t val; + uint8_t id, val; - if (gpio_bank > 4) - { + if (gpio_bank > 4) { fprintf(stderr, "PC87360: Invalid GPIO %d\n", gpio); return -1; } id = sio_read(0x2E, 0x20); - if (id != 0xE1) - { + if (id != 0xE1) { fprintf(stderr, "PC87360: unexpected ID %02x\n", id); return -1; } - sio_write(0x2E, 0x07, 0x07); /* select GPIO device */ + sio_write(0x2E, 0x07, 0x07); /* Select GPIO device */ baseport = (sio_read(0x2E, 0x60) << 8) | sio_read(0x2E, 0x61); - if((baseport & 0xFFF0) == 0xFFF0 || baseport == 0) - { + if ((baseport & 0xFFF0) == 0xFFF0 || baseport == 0) { fprintf (stderr, "PC87360: invalid GPIO base address %04x\n", baseport); return -1; } sio_mask (0x2E, 0x30, 0x01, 0x01); /* Enable logical device */ - sio_write(0x2E, 0xF0, gpio_bank*16 + gpio_pin); + sio_write(0x2E, 0xF0, gpio_bank * 16 + gpio_pin); sio_mask (0x2E, 0xF1, 0x01, 0x01); /* Make pin output */ val = INB(baseport + bankbase[gpio_bank]); - if(raise) + if (raise) val |= 1 << gpio_pin; else val &= ~(1 << gpio_pin); @@ -1028,8 +1024,7 @@ static int board_msi_651ml(const char *name) { struct pci_dev *dev; - uint16_t base; - uint16_t temp; + uint16_t base, temp; dev = pci_dev_find(0x1039, 0x0962); if (!dev) { @@ -1133,7 +1128,7 @@ w836xx_ext_leave(0x2E); if (id != 0x8701) { - fprintf(stderr, "\nERROR: IT8703F SuperIO not found.\n"); + fprintf(stderr, "\nERROR: IT8703F Super I/O not found.\n"); return -1; } @@ -1144,7 +1139,7 @@ w836xx_ext_leave(0x2E); if (!base) { - fprintf(stderr, "\nERROR: Failed to read IT8703F SuperIO GPIO" + fprintf(stderr, "\nERROR: Failed to read IT8703F Super I/O GPIO" " Base.\n"); return -1; } @@ -1161,8 +1156,7 @@ * General routine for raising/dropping GPIO lines on the ITE IT8712F. * There is only some limited checking on the port numbers. */ -static int -it8712f_gpio_set(unsigned int line, int raise) +static int it8712f_gpio_set(unsigned int line, int raise) { unsigned int port; uint16_t id, base; @@ -1186,7 +1180,7 @@ exit_conf_mode_ite(0x2E); if (id != 0x8712) { - fprintf(stderr, "\nERROR: IT8712F SuperIO not found.\n"); + fprintf(stderr, "\nERROR: IT8712F Super I/O not found.\n"); return -1; } @@ -1197,7 +1191,7 @@ exit_conf_mode_ite(0x2E); if (!base) { - fprintf(stderr, "\nERROR: Failed to read IT8712F SuperIO GPIO" + fprintf(stderr, "\nERROR: Failed to read IT8712F Super I/O GPIO" " Base.\n"); return -1; } @@ -1446,20 +1440,19 @@ board = board_match_pci_card_ids(); if (board && board->status == NT) { - if (!force_boardenable) - { + if (!force_boardenable) { printf("WARNING: Your mainboard is %s %s, but the mainboard-specific\n" "code has not been tested, and thus will not not be executed by default.\n" "Depending on your hardware environment, erasing, writing or even probing\n" "can fail without running the board specific code.\n\n" "Please see the man page (section PROGRAMMER SPECIFIC INFO, subsection\n" - "\"internal programmer\") for details\n", + "\"internal programmer\") for details.\n", board->vendor_name, board->board_name); board = NULL; - } - else + } else { printf("NOTE: Running an untested board enable procedure.\n" - "Please report success/failure to flashrom(a)flashrom.org\n"); + "Please report success/failure to flashrom(a)flashrom.org.\n"); + } } if (board) { Modified: trunk/cli_output.c ============================================================================== --- trunk/cli_output.c Sat Mar 13 15:47:48 2010 (r932) +++ trunk/cli_output.c Sat Mar 13 18:28:29 2010 (r933) @@ -27,25 +27,25 @@ va_list ap; int ret; FILE *output_type; - - switch (type) - { + + switch (type) { case MSG_ERROR: output_type = stderr; break; case MSG_BARF: - if (verbose < 2) return 0; + if (verbose < 2) + return 0; case MSG_DEBUG: - if (verbose < 1) return 0; + if (verbose < 1) + return 0; case MSG_INFO: default: output_type = stdout; break; } - + va_start(ap, fmt); ret = vfprintf(output_type, fmt, ap); va_end(ap); return ret; } - Modified: trunk/dmi.c ============================================================================== --- trunk/dmi.c Sat Mar 13 15:47:48 2010 (r932) +++ trunk/dmi.c Sat Mar 13 18:28:29 2010 (r933) @@ -31,18 +31,20 @@ DMI_BB_MANUFACTURER, DMI_BB_PRODUCT, DMI_BB_VERSION, - DMI_ID_INVALID /* This must always be the last entry */ + DMI_ID_INVALID, /* This must always be the last entry! */ }; -/* The short_id for baseboard starts with "m" as in mainboard to leave - "b" available for BIOS */ +/* + * The short_id for baseboard starts with "m" as in mainboard to leave + * "b" available for BIOS. + */ const char *dmidecode_names[DMI_ID_INVALID] = { "system-manufacturer", "system-product-name", "system-version", "baseboard-manufacturer", "baseboard-product-name", - "baseboard-version" + "baseboard-version", }; #define DMI_COMMAND_LEN_MAX 260 @@ -51,7 +53,7 @@ int has_dmi_support = 0; char *dmistrings[DMI_ID_INVALID]; -/* strings longer than 4096 in DMI are just insane */ +/* Strings longer than 4096 in DMI are just insane. */ #define DMI_MAX_ANSWER_LEN 4096 static char *get_dmi_string(const char *string_name) @@ -59,7 +61,8 @@ FILE *dmidecode_pipe; char *result; char answerbuf[DMI_MAX_ANSWER_LEN]; - char commandline[DMI_COMMAND_LEN_MAX+40]; + char commandline[DMI_COMMAND_LEN_MAX + 40]; + snprintf(commandline, sizeof(commandline), "%s -s %s", dmidecode_command, string_name); dmidecode_pipe = popen(commandline, "r"); @@ -82,7 +85,7 @@ return NULL; } - /* chomp trailing newline */ + /* Chomp trailing newline. */ if (answerbuf[0] != 0 && answerbuf[strlen(answerbuf) - 1] == '\n') answerbuf[strlen(answerbuf) - 1] = 0; @@ -99,6 +102,7 @@ { int i; char *chassis_type; + has_dmi_support = 1; for (i = 0; i < DMI_ID_INVALID; i++) { dmistrings[i] = get_dmi_string(dmidecode_names[i]); @@ -131,8 +135,9 @@ { int anchored = 0; int patternlen; + printf_debug("matching %s against %s\n", value, pattern); - /* The empty string is part of all strings */ + /* The empty string is part of all strings! */ if (pattern[0] == 0) return 1; @@ -145,11 +150,11 @@ if (pattern[patternlen - 1] == '$') { int valuelen = strlen(value); patternlen--; - if(patternlen > valuelen) + if (patternlen > valuelen) return 0; /* full string match: require same length */ - if(anchored && (valuelen != patternlen)) + if (anchored && (valuelen != patternlen)) return 0; /* start character to make ends match */ @@ -166,11 +171,12 @@ int dmi_match(const char *pattern) { int i; + if (!has_dmi_support) return 0; - for (i = 0;i < DMI_ID_INVALID; i++) - if(dmi_compare(dmistrings[i], pattern)) + for (i = 0; i < DMI_ID_INVALID; i++) + if (dmi_compare(dmistrings[i], pattern)) return 1; return 0; Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sat Mar 13 15:47:48 2010 (r932) +++ trunk/flashrom.c Sat Mar 13 18:28:29 2010 (r933) @@ -664,7 +664,7 @@ case write_gran_256bytes: for (j = 0; j < len / 256; j++) { limit = min (256, len - j * 256); - /* Are have and want identical? */ + /* Are 'have' and 'want' identical? */ if (!memcmp(have + j * 256, want + j * 256, limit)) continue; /* have needs to be in erased state. */ @@ -1028,7 +1028,7 @@ * layouts. That would imply "magic" erase functions. The * easiest way to check this is with function pointers. */ - for (j = k + 1; j < NUM_ERASEFUNCTIONS; j++) + for (j = k + 1; j < NUM_ERASEFUNCTIONS; j++) { if (eraser.block_erase == flash->block_erasers[j].block_erase) { msg_gerr("ERROR: Flash chip %s erase function " @@ -1037,6 +1037,7 @@ flash->name, k, j); ret = 1; } + } } return ret; } @@ -1198,7 +1199,7 @@ "this flash part. Please include the flashrom\noutput " "with the additional -V option for all operations you " "tested (-V, -rV,\n-wV, -EV), and mention which " - "mainboard or programmer you tested. Thanks for your " + "mainboard or programmer you tested.\nThanks for your " "help!\n===\n"); } } Modified: trunk/hwaccess.h ============================================================================== --- trunk/hwaccess.h Sat Mar 13 15:47:48 2010 (r932) +++ trunk/hwaccess.h Sat Mar 13 18:28:29 2010 (r933) @@ -15,8 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * + */ + +/* * Header file for hardware access and OS abstraction. Included from flash.h. */ @@ -89,42 +90,36 @@ #endif #include <stdint.h> -static inline void -outb(uint8_t value, uint16_t port) +static inline void outb(uint8_t value, uint16_t port) { asm volatile ("outb %b0,%w1": :"a" (value), "Nd" (port)); } -static inline uint8_t -inb(uint16_t port) +static inline uint8_t inb(uint16_t port) { uint8_t value; asm volatile ("inb %w1,%0":"=a" (value):"Nd" (port)); return value; } -static inline void -outw(uint16_t value, uint16_t port) +static inline void outw(uint16_t value, uint16_t port) { asm volatile ("outw %w0,%w1": :"a" (value), "Nd" (port)); } -static inline uint16_t -inw(uint16_t port) +static inline uint16_t inw(uint16_t port) { uint16_t value; asm volatile ("inw %w1,%0":"=a" (value):"Nd" (port)); return value; } -static inline void -outl(uint32_t value, uint16_t port) +static inline void outl(uint32_t value, uint16_t port) { asm volatile ("outl %0,%w1": :"a" (value), "Nd" (port)); } -static inline uint32_t -inl(uint16_t port) +static inline uint32_t inl(uint16_t port) { uint32_t value; asm volatile ("inl %1,%0":"=a" (value):"Nd" (port)); Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Sat Mar 13 15:47:48 2010 (r932) +++ trunk/internal.c Sat Mar 13 18:28:29 2010 (r933) @@ -105,7 +105,8 @@ void probe_superio(void) { superio = probe_superio_ite(); -#if 0 /* Winbond SuperI/O code is not yet available. */ +#if 0 + /* Winbond Super I/O code is not yet available. */ if (superio.vendor == SUPERIO_VENDOR_NONE) superio = probe_superio_winbond(); #endif @@ -150,17 +151,17 @@ coreboot_init(); dmi_init(); - /* Probe for the SuperI/O chip and fill global struct superio. */ + /* Probe for the Super I/O chip and fill global struct superio. */ probe_superio(); - /* Warn if a laptop is detected */ + /* Warn if a laptop is detected. */ if (is_laptop) printf("========================================================================\n" "WARNING! You seem to be running flashrom on a laptop.\n" "Laptops, notebooks and netbooks are difficult to support and we recommend\n" "to use the vendor flashing utility. The embedded controller (EC) in these\n" - "machines often interacts badly with flashing\n" - "See http://www.flashrom.org/Laptops\n" + "machines often interacts badly with flashing.\n" + "See http://www.flashrom.org/Laptops for details.\n" "========================================================================\n"); /* try to enable it. Failure IS an option, since not all motherboards Modified: trunk/it87spi.c ============================================================================== --- trunk/it87spi.c Sat Mar 13 15:47:48 2010 (r932) +++ trunk/it87spi.c Sat Mar 13 18:28:29 2010 (r933) @@ -81,7 +81,7 @@ case 0x82: case 0x86: case 0x87: - msg_pinfo("Found ITE SuperI/O, id %04hx\n", + msg_pinfo("Found ITE Super I/O, id %04hx\n", ret.model); return ret; } @@ -170,7 +170,7 @@ int ret; get_io_perms(); - /* Probe for the SuperI/O chip and fill global struct superio. */ + /* Probe for the Super I/O chip and fill global struct superio. */ probe_superio(); ret = it87spi_common_init(); if (!ret) { Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Sat Mar 13 15:47:48 2010 (r932) +++ trunk/serial.c Sat Mar 13 18:28:29 2010 (r933) @@ -105,13 +105,15 @@ { #ifdef _WIN32 HANDLE fd; - char* dev2 = dev; - if ((strlen(dev) > 3) && (tolower(dev[0])=='c') && (tolower(dev[1])=='o') && (tolower(dev[2])=='m')) { - dev2 = malloc(strlen(dev)+5); + char *dev2 = dev; + if ((strlen(dev) > 3) && (tolower(dev[0]) == 'c') + && (tolower(dev[1]) == 'o') && (tolower(dev[2]) == 'm')) { + dev2 = malloc(strlen(dev) + 5); strcpy(dev2, "\\\\.\\"); - strcpy(dev2+4, dev); + strcpy(dev2 + 4, dev); } - fd = CreateFile(dev2, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + fd = CreateFile(dev2, GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, 0, NULL); if (dev2 != dev) free(dev2); if (fd == INVALID_HANDLE_VALUE) { @@ -129,9 +131,9 @@ case 115200: dcb.BaudRate = CBR_115200; break; default: sp_die("Error: Could not set baud rate"); } - dcb.ByteSize=8; - dcb.Parity=NOPARITY; - dcb.StopBits=ONESTOPBIT; + dcb.ByteSize = 8; + dcb.Parity = NOPARITY; + dcb.StopBits = ONESTOPBIT; if (!SetCommState(fd, &dcb)) { sp_die("Error: Could not change serial port configuration"); } @@ -147,9 +149,8 @@ for (i = 0;; i++) { if (sp_baudtable[i].baud == 0) { close(fd); - msg_perr( - "Error: cannot configure for baudrate %d\n", - baud); + msg_perr("Error: cannot configure for baudrate %d\n", + baud); exit(1); } if (sp_baudtable[i].baud == baud) {

1 0

Patch: Manpage: Move description of layout file into the right place
by Joerg Mayer March 13, 2010

March 13, 2010

-- Joerg Mayer <jmayer(a)loplof.de> We are stuck with technology when what we really want is just stuff that works. Some say that should read Microsoft instead of technology.

2 2

[commit] r932 - trunk
by repository service March 13, 2010

March 13, 2010

Author: mkarcher Date: Sat Mar 13 15:47:48 2010 New Revision: 932 URL: http://flashrom.org/trac/coreboot/changeset/932 Log: Patch: Manpage: Move description of layout file into the right place Move the description of the layout file out of the --chip option into the --layout option. Signed-off-by: Joerg Mayer <jmayer(a)loplof.de> Acked-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Modified: trunk/flashrom.8 Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Fri Mar 12 07:41:39 2010 (r931) +++ trunk/flashrom.8 Sat Mar 13 15:47:48 2010 (r932) @@ -62,6 +62,30 @@ .TP .B "\-c, \-\-chip" <chipname> Probe only for specified flash ROM chip. +.TP +.B "\-m, \-\-mainboard" <[vendor:]part> +Override mainboard settings. +.sp +flashrom reads the coreboot table to determine the current mainboard. If no +coreboot table could be read or if you want to override these values, you can +specify \-m, e.g.: +.sp +.B " flashrom -w --mainboard AGAMI:ARUMA agami_aruma.rom" +.sp +See the 'Supported mainboards' section in the output of 'flashrom \-L' for +a list of boards which require the specification of the board name, if no +coreboot table is found. +.TP +.B "\-f, \-\-force" +Force write without checking whether the ROM image file is really meant +to be used on this board. +.sp +Note: This check only works while coreboot is running, and only for those +boards where the coreboot code supports it. +.TP +.B "\-l, \-\-layout <file>" +Read ROM layout from +.BR <file> . .sp flashrom supports ROM layouts. This allows you to flash certain parts of the flash chip only. A ROM layout file looks like follows: @@ -90,30 +114,6 @@ flexible and they should lead to a ROM update file format with the ROM layout and the ROM image in one file (cpio, zip or something?). .TP -.B "\-m, \-\-mainboard" <[vendor:]part> -Override mainboard settings. -.sp -flashrom reads the coreboot table to determine the current mainboard. If no -coreboot table could be read or if you want to override these values, you can -specify \-m, e.g.: -.sp -.B " flashrom -w --mainboard AGAMI:ARUMA agami_aruma.rom" -.sp -See the 'Supported mainboards' section in the output of 'flashrom \-L' for -a list of boards which require the specification of the board name, if no -coreboot table is found. -.TP -.B "\-f, \-\-force" -Force write without checking whether the ROM image file is really meant -to be used on this board. -.sp -Note: This check only works while coreboot is running, and only for those -boards where the coreboot code supports it. -.TP -.B "\-l, \-\-layout <file>" -Read ROM layout from -.BR <file> . -.TP .B "\-i, \-\-image <name>" Only flash image .B <name>

1 0

Re: [flashrom] [PATCH] Tell users to probe/backup first
by Carl-Daniel Hailfinger March 11, 2010

March 11, 2010

If you add your signoff, this is Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Note: I'm not a native speaker, so I just checked if the text is understandable. Regards, Carl-Daniel -- "I do consider assignment statements and pointer variables to be among computer science's most valuable treasures." -- Donald E. Knuth

3 2

[commit] r931 - trunk
by repository service March 11, 2010

March 11, 2010

Author: mkarcher Date: Fri Mar 12 07:41:39 2010 New Revision: 931 URL: http://flashrom.org/trac/coreboot/changeset/931 Log: Tell users to probe/backup first Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flashrom.8 Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Fri Mar 12 00:04:16 2010 (r930) +++ trunk/flashrom.8 Fri Mar 12 07:41:39 2010 (r931) @@ -22,7 +22,11 @@ .PP You can specify one of \-E, \-r, \-w, \-v or no operation. If no operation is specified, then all that happens -is that flash info is dumped and the flash chip is set to writable. +is that flash info is dumped and the flash chip is set to writable. It is +recommended that if you try flashrom the first time on a system, you run it +in probe only mode and check the output. Also you are advised to make a +backup of your current ROM contents with \-r before you try to write a new +image. .TP .B "\-r, \-\-read <file>" Read flash ROM contents and save them into the given

1 0