May 2014 - flashrom - mail.coreboot.org

W836xx: 3354A31: flashrom -V
by id slacker May 29, 2014

May 29, 2014

# flashrom -p internal -V flashrom v0.9.7-r1804 on Linux 3.14.4-100.fc19.x86_64 (x86_64) flashrom is free software, get the source code at http://www.flashrom.org flashrom was built with libpci 3.2.1, GCC 4.8.2 20131212 (Red Hat 4.8.2-7), little endian Command line (3 args): flashrom -p internal -V Calibrating delay loop... OS timer resolution is 1 usecs, 1087M loops per second, 10 myus = 10 us, 100 myus = 99 us, 1000 myus = 993 us, 10000 myus = 9930 us, 4 myus = 4 us, OK. Initializing internal programmer No coreboot table found. Using Internal DMI decoder. DMI string chassis-type: "Notebook" Laptop detected via DMI. DMI string system-manufacturer: "LENOVO" DMI string system-product-name: "3354A31" DMI string system-version: "ThinkPad Edge E330" DMI string baseboard-manufacturer: "LENOVO" DMI string baseboard-product-name: "3354A31" DMI string baseboard-version: "Not Available" W836xx enter config mode worked or we were already in config mode. W836xx leave config mode had no effect. Active config mode, unknown reg 0x20 ID: fc.

1 0

[PATCH] Add default arguments for the default programmer (only).
by Stefan Tauner May 29, 2014

May 29, 2014

This code exists thanks to food for thought from Urja Rannikko. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- Makefile | 6 ++++++ cli_classic.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 346d46a..998979d 100644 --- a/Makefile +++ b/Makefile @@ -52,6 +52,11 @@ DOSLIBS_BASE ?= .. # evaluated below, namely those that enable/disable the various programmers). # Compilation will fail for unspecified values. CONFIG_DEFAULT_PROGRAMMER ?= PROGRAMMER_INVALID +# The following adds a default parameter for the default programmer set above (only). +CONFIG_DEFAULT_PROGRAMMER_ARGS ?= '' +# Example: compiling with +# make CONFIG_DEFAULT_PROGRAMMER=PROGRAMMER_SERPROG CONFIG_DEFAULT_PROGRAMMER_ARGS="dev=/dev/ttyUSB0:1500000" +# would make executing './flashrom' (almost) equivialent to './flashrom -p serprog:dev=/dev/ttyUSB0:1500000'. # If your compiler spits out excessive warnings, run make WARNERROR=no # You shouldn't have to change this flag. @@ -471,6 +476,7 @@ CONFIG_INTERNAL_DMI ?= yes # Depending on the CONFIG_* variables set and verified above we set compiler flags and parameters below. FEATURE_CFLAGS += -D'CONFIG_DEFAULT_PROGRAMMER=$(CONFIG_DEFAULT_PROGRAMMER)' +FEATURE_CFLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_ARGS="$(CONFIG_DEFAULT_PROGRAMMER_ARGS)"' ifeq ($(CONFIG_INTERNAL), yes) FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' diff --git a/cli_classic.c b/cli_classic.c index a32d55b..fc1b9ba 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -396,8 +396,10 @@ int main(int argc, char *argv[]) if (prog == PROGRAMMER_INVALID) { if (CONFIG_DEFAULT_PROGRAMMER != PROGRAMMER_INVALID) { prog = CONFIG_DEFAULT_PROGRAMMER; - msg_pinfo("Using default programmer \"%s\".\n", - programmer_table[CONFIG_DEFAULT_PROGRAMMER].name); + /* We need to strdup here because we free(pparam) unconditionally later. */ + pparam = strdup(CONFIG_DEFAULT_PROGRAMMER_ARGS); + msg_pinfo("Using default programmer \"%s\" with arguments \"%s\".\n", + programmer_table[CONFIG_DEFAULT_PROGRAMMER].name, pparam); } else { msg_perr("Please select a programmer with the --programmer parameter.\n" "Previously this was not necessary because there was a default set.\n" -- Kind regards, Stefan Tauner

1 0

[PATCH] Combine block_erase*_en29lv640b and block_erase*_m29f400bt respectively.
by Stefan Tauner May 29, 2014

May 29, 2014

This patch combines two identical block and chip erase functions respectively: - Merge block_erase_m29f400bt and block_erase_en29lv640b into erase_block_shifted_jedec. - Merge block_erase_chip_m29f400bt and block_erase_chip_en29lv640b into erase_chip_block_shifted_jedec. Leave their implementations in en29lv640b.c for now. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- chipdrivers.h | 6 ++---- en29lv640b.c | 10 ++++------ flashchips.c | 28 ++++++++++++++-------------- m29f400bt.c | 51 --------------------------------------------------- 4 files changed, 20 insertions(+), 75 deletions(-) diff --git a/chipdrivers.h b/chipdrivers.h index 7fe3202..ee86f83 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -147,8 +147,6 @@ int erase_chip_block_jedec(struct flashctx *flash, unsigned int page, unsigned i /* m29f400bt.c */ int probe_m29f400bt(struct flashctx *flash); -int block_erase_m29f400bt(struct flashctx *flash, unsigned int start, unsigned int len); -int block_erase_chip_m29f400bt(struct flashctx *flash, unsigned int start, unsigned int len); int write_m29f400bt(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); void protect_m29f400bt(struct flashctx *flash, chipaddr bios); @@ -199,8 +197,8 @@ int unlock_stm50_nonuniform(struct flashctx *flash); /* en29lv640b.c */ int probe_en29lv640b(struct flashctx *flash); -int block_erase_en29lv640b(struct flashctx *flash, unsigned int start, unsigned int len); -int block_erase_chip_en29lv640b(struct flashctx *flash, unsigned int start, unsigned int len); +int erase_block_shifted_jedec(struct flashctx *flash, unsigned int start, unsigned int len); +int erase_chip_block_shifted_jedec(struct flashctx *flash, unsigned int start, unsigned int len); int write_en29lv640b(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); #endif /* !__CHIPDRIVERS_H__ */ diff --git a/en29lv640b.c b/en29lv640b.c index 110aa18..a274f62 100644 --- a/en29lv640b.c +++ b/en29lv640b.c @@ -86,7 +86,7 @@ int probe_en29lv640b(struct flashctx *flash) return 0; } -int erase_en29lv640b(struct flashctx *flash) +static int erase_chip_shifted_jedec(struct flashctx *flash) { chipaddr bios = flash->virtual_memory; @@ -105,8 +105,7 @@ int erase_en29lv640b(struct flashctx *flash) return 0; } -int block_erase_en29lv640b(struct flashctx *flash, unsigned int start, - unsigned int len) +int erase_block_shifted_jedec(struct flashctx *flash, unsigned int start, unsigned int len) { chipaddr bios = flash->virtual_memory; chipaddr dst = bios + start; @@ -126,12 +125,11 @@ int block_erase_en29lv640b(struct flashctx *flash, unsigned int start, return 0; } -int block_erase_chip_en29lv640b(struct flashctx *flash, unsigned int address, - unsigned int blocklen) +int erase_chip_block_shifted_jedec(struct flashctx *flash, unsigned int address, unsigned int blocklen) { if ((address != 0) || (blocklen != flash->chip->total_size * 1024)) { msg_cerr("%s called with incorrect arguments\n", __func__); return -1; } - return erase_en29lv640b(flash); + return erase_chip_shifted_jedec(flash); } diff --git a/flashchips.c b/flashchips.c index 78c18ca..4a1e9f6 100644 --- a/flashchips.c +++ b/flashchips.c @@ -4730,10 +4730,10 @@ const struct flashchip flashchips[] = { {8 * 1024, 8}, {64 * 1024, 127}, }, - .block_erase = block_erase_en29lv640b, + .block_erase = erase_block_shifted_jedec, }, { .eraseblocks = { {8 * 1024 * 1024, 1} }, - .block_erase = block_erase_chip_en29lv640b, + .block_erase = erase_chip_block_shifted_jedec, }, }, .write = write_en29lv640b, @@ -4827,10 +4827,10 @@ const struct flashchip flashchips[] = { {32 * 1024, 1}, {64 * 1024, 7}, }, - .block_erase = block_erase_m29f400bt, + .block_erase = erase_block_shifted_jedec, }, { .eraseblocks = { {512 * 1024, 1} }, - .block_erase = block_erase_chip_m29f400bt, + .block_erase = erase_chip_block_shifted_jedec, }, }, .write = write_m29f400bt, @@ -4859,10 +4859,10 @@ const struct flashchip flashchips[] = { {8 * 1024, 2}, {16 * 1024, 1}, }, - .block_erase = block_erase_m29f400bt, + .block_erase = erase_block_shifted_jedec, }, { .eraseblocks = { {512 * 1024, 1} }, - .block_erase = block_erase_chip_m29f400bt, + .block_erase = erase_chip_block_shifted_jedec, }, }, .write = write_m29f400bt, @@ -4891,10 +4891,10 @@ const struct flashchip flashchips[] = { {32 * 1024, 1}, {64 * 1024, 31}, }, - .block_erase = block_erase_m29f400bt, + .block_erase = erase_block_shifted_jedec, }, { .eraseblocks = { {2048 * 1024, 1} }, - .block_erase = block_erase_chip_m29f400bt, + .block_erase = erase_chip_block_shifted_jedec, }, }, .write = write_m29f400bt, /* Supports a fast mode too */ @@ -4923,10 +4923,10 @@ const struct flashchip flashchips[] = { {8 * 1024, 2}, {16 * 1024, 1}, }, - .block_erase = block_erase_m29f400bt, + .block_erase = erase_block_shifted_jedec, }, { .eraseblocks = { {2048 * 1024, 1} }, - .block_erase = block_erase_chip_m29f400bt, + .block_erase = erase_chip_block_shifted_jedec, }, }, .write = write_m29f400bt, /* Supports a fast mode too */ @@ -11292,10 +11292,10 @@ const struct flashchip flashchips[] = { {32 * 1024, 1}, {64 * 1024, 7}, }, - .block_erase = block_erase_m29f400bt, + .block_erase = erase_block_shifted_jedec, }, { .eraseblocks = { {512 * 1024, 1} }, - .block_erase = block_erase_chip_m29f400bt, + .block_erase = erase_chip_block_shifted_jedec, } }, .write = write_m29f400bt, @@ -11324,10 +11324,10 @@ const struct flashchip flashchips[] = { {8 * 1024, 2}, {16 * 1024, 1}, }, - .block_erase = block_erase_m29f400bt, + .block_erase = erase_block_shifted_jedec, }, { .eraseblocks = { {512 * 1024, 1} }, - .block_erase = block_erase_chip_m29f400bt, + .block_erase = erase_chip_block_shifted_jedec, } }, .write = write_m29f400bt, diff --git a/m29f400bt.c b/m29f400bt.c index c2236e5..399a7e0 100644 --- a/m29f400bt.c +++ b/m29f400bt.c @@ -85,54 +85,3 @@ int probe_m29f400bt(struct flashctx *flash) return 0; } - -int erase_m29f400bt(struct flashctx *flash) -{ - chipaddr bios = flash->virtual_memory; - - chip_writeb(flash, 0xAA, bios + 0xAAA); - chip_writeb(flash, 0x55, bios + 0x555); - chip_writeb(flash, 0x80, bios + 0xAAA); - - chip_writeb(flash, 0xAA, bios + 0xAAA); - chip_writeb(flash, 0x55, bios + 0x555); - chip_writeb(flash, 0x10, bios + 0xAAA); - - programmer_delay(10); - toggle_ready_jedec(flash, bios); - - /* FIXME: Check the status register for errors. */ - return 0; -} - -int block_erase_m29f400bt(struct flashctx *flash, unsigned int start, - unsigned int len) -{ - chipaddr bios = flash->virtual_memory; - chipaddr dst = bios + start; - - chip_writeb(flash, 0xAA, bios + 0xAAA); - chip_writeb(flash, 0x55, bios + 0x555); - chip_writeb(flash, 0x80, bios + 0xAAA); - - chip_writeb(flash, 0xAA, bios + 0xAAA); - chip_writeb(flash, 0x55, bios + 0x555); - chip_writeb(flash, 0x30, dst); - - programmer_delay(10); - toggle_ready_jedec(flash, bios); - - /* FIXME: Check the status register for errors. */ - return 0; -} - -int block_erase_chip_m29f400bt(struct flashctx *flash, unsigned int address, - unsigned int blocklen) -{ - if ((address != 0) || (blocklen != flash->chip->total_size * 1024)) { - msg_cerr("%s called with incorrect arguments\n", - __func__); - return -1; - } - return erase_m29f400bt(flash); -} -- Kind regards, Stefan Tauner

1 0

[PATCH] Unlock ST M50FW002 correctly
by Carl-Daniel Hailfinger May 29, 2014

May 29, 2014

Unlock ST M50FW002 correctly Refactor ST M50 family unlocking TODO: Unify write_lockbits_49fl00x() and unlock_block_stm50() and unlock_w39_fwh_block() and unlock_82802ab() and write_lockbits_block_49lfxxxc(). They all use exactly the same mechanism, but they don't share any code. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-stm50fw002_unlock/flashchips.c =================================================================== --- flashrom-stm50fw002_unlock/flashchips.c (Revision 1437) +++ flashrom-stm50fw002_unlock/flashchips.c (Arbeitskopie) @@ -7523,9 +7523,9 @@ .total_size = 256, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PREW, .probe = probe_82802ab, - .probe_timing = TIMING_IGNORED, /* routine doesn't use probe_timing (sst49lfxxxc.c) */ + .probe_timing = TIMING_IGNORED, /* routine doesn't use probe_timing (82802ab.c) */ .block_erasers = { { @@ -7536,9 +7536,12 @@ {16 * 1024, 1}, }, .block_erase = erase_block_82802ab, + }, { + .eraseblocks = { {256 * 1024, 1}, }, + .block_erase = NULL, /* Only in A/A mux mode */ } }, - .unlock = unlock_stm50flw0x0x, + .unlock = unlock_stm50fw002, .write = write_82802ab, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ Index: flashrom-stm50fw002_unlock/stm50flw0x0x.c =================================================================== --- flashrom-stm50fw002_unlock/stm50flw0x0x.c (Revision 1437) +++ flashrom-stm50fw002_unlock/stm50flw0x0x.c (Arbeitskopie) @@ -3,6 +3,7 @@ * * Copyright (C) 2008 Claus Gindhart <claus.gindhart(a)kontron.com> * Copyright (C) 2009 Sean Nelson <audiohacked(a)gmail.com> + * Copyright (C) 2011 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 @@ -31,6 +32,21 @@ #include "flashchips.h" #include "chipdrivers.h" +#define STM50_UNLOCKED 0x00 + +static int unlock_block_stm50(struct flashchip *flash, int offset) +{ + chipaddr lock = flash->virtual_registers + offset + 2; + + msg_cdbg("Unlocking at 0x%x\n", offset); + chip_writeb(STM50_UNLOCKED, lock); + if (chip_readb(lock) != STM50_UNLOCKED) { + msg_cerr("Cannot unlock at 0x%x\n", offset); + return -1; + } + return 0; +} + /* * claus.gindhart(a)kontron.com * The ST M50FLW080B and STM50FLW080B chips have to be unlocked, @@ -38,8 +54,6 @@ */ static int unlock_block_stm50flw0x0x(struct flashchip *flash, int offset) { - chipaddr wrprotect = flash->virtual_registers + 2; - static const uint8_t unlock_sector = 0x00; int j; /* @@ -58,22 +72,12 @@ || (offset == 0xF0000)) { // unlock each 4k-sector - for (j = 0; j < 0x10000; j += 0x1000) { - msg_cdbg("unlocking at 0x%x\n", offset + j); - chip_writeb(unlock_sector, wrprotect + offset + j); - if (chip_readb(wrprotect + offset + j) != unlock_sector) { - msg_cerr("Cannot unlock sector @ 0x%x\n", - offset + j); + for (j = 0; j < 0x10000; j += 0x1000) + if (unlock_block_stm50(flash, offset + j)) return -1; - } - } } else { - msg_cdbg("unlocking at 0x%x\n", offset); - chip_writeb(unlock_sector, wrprotect + offset); - if (chip_readb(wrprotect + offset) != unlock_sector) { - msg_cerr("Cannot unlock sector @ 0x%x\n", offset); + if (unlock_block_stm50(flash, offset)) return -1; - } } return 0; @@ -93,6 +97,27 @@ return 0; } +/* FIXME: Should this be moved to a generic walk_unlockregions()? */ +int unlock_stm50fw002(struct flashchip *flash) +{ + static const struct eraseblock unlockregions[4] = { + {64 * 1024, 3}, + {32 * 1024, 1}, + {8 * 1024, 2}, + {16 * 1024, 1}}; + int i, j; + int addr = 0; + + for (i = 0; i < 4; i++) { + for (j = 0; j < unlockregions[i].count; j++) { + if (unlock_block_stm50(flash, addr)) + return 1; + addr += unlockregions[i].size; + } + } + return 0; +} + /* This function is unused. */ int erase_sector_stm50flw0x0x(struct flashchip *flash, unsigned int sector, unsigned int sectorsize) { Index: flashrom-stm50fw002_unlock/chipdrivers.h =================================================================== --- flashrom-stm50fw002_unlock/chipdrivers.h (Revision 1437) +++ flashrom-stm50fw002_unlock/chipdrivers.h (Arbeitskopie) @@ -146,5 +146,6 @@ /* stm50flw0x0x.c */ int erase_sector_stm50flw0x0x(struct flashchip *flash, unsigned int block, unsigned int blocksize); int unlock_stm50flw0x0x(struct flashchip *flash); +int unlock_stm50fw002(struct flashchip *flash); #endif /* !__CHIPDRIVERS_H__ */ -- http://www.hailfinger.org/

3 3

Winbond W25X80: flashrom -V (SUCCESS!)
by Bernardo Kuri May 29, 2014

May 29, 2014

Hello, Looks like everything went smoothly. I have attached the output in a text file. BTW, the board is a Zotac IONITX-F-E Intel Atom 330. Thank you! *Bernardo Kurihttp://bkuri.com <http://bkuri.com>*

1 0

[commit] r1805 - trunk
by repository service May 29, 2014

May 29, 2014

Author: stefanct Date: Thu May 29 13:51:24 2014 New Revision: 1805 URL: http://flashrom.org/trac/flashrom/changeset/1805 Log: jedec.c: constify a bit more. Also, include chipdrivers.h to find conflicting types between exported declarations and actual implementations. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/chipdrivers.h trunk/jedec.c Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Wed May 28 15:02:13 2014 (r1804) +++ trunk/chipdrivers.h Thu May 29 13:51:24 2014 (r1805) @@ -136,10 +136,8 @@ /* jedec.c */ uint8_t oddparity(uint8_t val); -void toggle_ready_jedec(struct flashctx *flash, chipaddr dst); -void data_polling_jedec(struct flashctx *flash, chipaddr dst, uint8_t data); -int write_byte_program_jedec(struct flashctx *flash, chipaddr bios, uint8_t *src, - chipaddr dst); +void toggle_ready_jedec(const struct flashctx *flash, chipaddr dst); +void data_polling_jedec(const struct flashctx *flash, chipaddr dst, uint8_t data); int probe_jedec(struct flashctx *flash); int write_jedec(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int write_jedec_1(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Wed May 28 15:02:13 2014 (r1804) +++ trunk/jedec.c Thu May 29 13:51:24 2014 (r1805) @@ -23,6 +23,7 @@ */ #include "flash.h" +#include "chipdrivers.h" #define MAX_REFLASH_TRIES 0x10 #define MASK_FULL 0xffff @@ -111,8 +112,7 @@ } } -static void start_program_jedec_common(struct flashctx *flash, - unsigned int mask) +static void start_program_jedec_common(const struct flashctx *flash, unsigned int mask) { chipaddr bios = flash->virtual_memory; chip_writeb(flash, 0xAA, bios + (0x5555 & mask)); @@ -328,7 +328,7 @@ return 0; } -static int write_byte_program_jedec_common(struct flashctx *flash, uint8_t *src, +static int write_byte_program_jedec_common(const struct flashctx *flash, const uint8_t *src, chipaddr dst, unsigned int mask) { int tried = 0, failed = 0; @@ -358,7 +358,7 @@ } /* chunksize is 1 */ -int write_jedec_1(struct flashctx *flash, uint8_t *src, unsigned int start, +int write_jedec_1(struct flashctx *flash, const uint8_t *src, unsigned int start, unsigned int len) { int i, failed = 0; @@ -380,11 +380,11 @@ return failed; } -static int write_page_write_jedec_common(struct flashctx *flash, uint8_t *src, +static int write_page_write_jedec_common(struct flashctx *flash, const uint8_t *src, unsigned int start, unsigned int page_size) { int i, tried = 0, failed; - uint8_t *s = src; + const uint8_t *s = src; chipaddr bios = flash->virtual_memory; chipaddr dst = bios + start; chipaddr d = dst; @@ -428,7 +428,7 @@ * This function is a slightly modified copy of spi_write_chunked. * Each page is written separately in chunks with a maximum size of chunksize. */ -int write_jedec(struct flashctx *flash, uint8_t *buf, unsigned int start, +int write_jedec(struct flashctx *flash, const uint8_t *buf, unsigned int start, int unsigned len) { unsigned int i, starthere, lenhere;

1 0

dlink-dir615 F25L32PA
by chris May 28, 2014

May 28, 2014

Hi i have a bricked router i was using as a test for my new ftdi cable and came across the message that flashrom posted out. thought i would send you the chip details if it helps you expand the flashrom device support. The router fron Dlink uses a Linux kernel firmware and was bricked through the web interface UI update. Anyway it is a ESMT F25L32PA c000x 1014. these are all the numbers on the flash chip.

3 6

enum test_state value for "depends"
by Stefan Tauner May 28, 2014

May 28, 2014

We currently have an enum test_state { OK = 0, NT = 1, /* Not tested */ BAD }; This is used in various arrays, namely those for boards, board enables, chipsets, programmers, and rayer_spi (LPT) devices. I'd like to add another state that indicates that support is configuration-dependent. Most infamous use cases would be boards with ME chipsets and ME chipsets. Another example is the atavia VT6421A LPC programmer which works in general, just not all boards due to a not fully understood offset configuration that is board-specific. Names... CONFIG is quite long but obvious to understand, CD for configuration-dependent would suite me too, but I am open to suggestions. What about DEP? -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 10

[commit] r1804 - trunk
by repository service May 28, 2014

May 28, 2014

Author: stefanct Date: Wed May 28 15:02:13 2014 New Revision: 1804 URL: http://flashrom.org/trac/flashrom/changeset/1804 Log: print_wiki: simplify template handling. Add test_state_to_template() and use it everywhere to select the correct template. This also enables the use of the new states in all tables. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/print_wiki.c Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Wed May 28 00:10:15 2014 (r1803) +++ trunk/print_wiki.c Wed May 28 15:02:13 2014 (r1804) @@ -95,6 +95,21 @@ ! align=\"center\" | IDs\n\ ! align=\"center\" | Status\n\n"; +/* The output of this module relies on MediaWiki templates to select special formatting styles for table cells + * reflecting the test status of the respective hardware. This functions returns the correct template name for + * the supplied enum test_state. */ +static const char *test_state_to_template(enum test_state test_state) +{ + switch (test_state) { + case OK: return "OK"; + case BAD: return "No"; + case NA: return "NA"; + case DEP: return "Dep"; + case NT: + default: return "?3"; + } +} + #if CONFIG_INTERNAL == 1 static const char laptop_intro[] = "\n== Supported laptops/notebooks ==\n\n\ In general, flashing laptops is more difficult because laptops\n\n\ @@ -133,10 +148,10 @@ color = !color; printf("|- bgcolor=\"#%s\"\n| %s || %s " - "|| %04x:%04x || %s\n", (color) ? "eeeeee" : "dddddd", + "|| %04x:%04x || {{%s}}\n", (color) ? "eeeeee" : "dddddd", e[i].vendor_name, e[i].device_name, e[i].vendor_id, e[i].device_id, - (e[i].status == OK) ? "{{OK}}" : "{{?3}}"); + test_state_to_template(e[i].status)); if (((i % lines_per_col) + 1) == lines_per_col) printf("\n|}\n\n"); @@ -202,8 +217,7 @@ b[k].lb_vendor ? b[k].lb_vendor : "", b[k].lb_vendor ? ":" : "", b[k].lb_vendor ? b[k].lb_part : "", - (boards[i].working == OK) ? "OK" : - (boards[i].working == NT) ? "?3" : "No"); + test_state_to_template(boards[i].working)); if (boards[i].note) { num_notes++; @@ -286,46 +300,18 @@ c = !c; old = f; - const char *probe, *read, *write, *erase; - switch (f->tested.probe) { - case OK: probe = "OK"; break; - case BAD: probe = "No"; break; - case NA: probe = "NA"; break; - case DEP: probe = "Dep"; break; - default: probe = "?3"; break; - } - switch (f->tested.read) { - case OK: read = "OK"; break; - case BAD: read = "No"; break; - case NA: read = "NA"; break; - case DEP: read = "Dep"; break; - default: read = "?3"; break; - } - switch (f->tested.erase) { - case OK: erase = "OK"; break; - case BAD: erase = "No"; break; - case NA: erase = "NA"; break; - case DEP: erase = "Dep"; break; - default: erase = "?3"; break; - } - switch (f->tested.write) { - case OK: write = "OK"; break; - case BAD: write = "No"; break; - case NA: write = "NA"; break; - case DEP: write = "Dep"; break; - default: write = "?3"; break; - } s = flashbuses_to_text(f->bustype); sprintf(vmin, "%0.03f", f->voltage.min / (double)1000); sprintf(vmax, "%0.03f", f->voltage.max / (double)1000); - /* '{{%s}}' is used in combination with 'OK', 'No' and '?3' to - * select special formatting templates for the bg color. */ printf("|- bgcolor=\"#%s\"\n| %s || %s || align=\"right\" | %d " "|| %s || {{%s}} || {{%s}} || {{%s}} || {{%s}}" "|| %s || %s \n", (c == 1) ? "eeeeee" : "dddddd", f->vendor, f->name, f->total_size, s, - probe, read, erase, write, + test_state_to_template(f->tested.probe), + test_state_to_template(f->tested.read), + test_state_to_template(f->tested.erase), + test_state_to_template(f->tested.write), f->voltage.min ? vmin : "?", f->voltage.max ? vmax : "?"); free(s); @@ -366,7 +352,7 @@ if (i == 0) printf("| rowspan=\"%u\" | %s |", count, prog.name); printf("| %s || %s || %04x:%04x || {{%s}}\n", devs[i].vendor_name, devs[i].device_name, - devs[i].vendor_id, devs[i].device_id, (devs[i].status == NT) ? "?3" : "OK"); + devs[i].vendor_id, devs[i].device_id, test_state_to_template(devs[i].status)); } }

1 0

Re: [flashrom] Please help me with my new mainboard
by 磊赵 May 28, 2014

May 28, 2014

Would you help me again? Flashrom works fine. I just get the binary flash file the flashrom saved. How can I find and modify the logo. Is there a suggested tool? 2014-05-28 17:58 GMT+08:00, 磊赵 <zhaolei.cpp(a)gmail.com>: > Thanks It works. > "apt-get install flashrom" gave me an old version. > I download the code and compiled and it works fine. > > Thanks! > > 2014-05-28 17:51 GMT+08:00, Stefan Tauner > <stefan.tauner(a)alumni.tuwien.ac.at>: >> On Wed, 28 May 2014 17:35:04 +0800 >> 磊赵 <zhaolei.cpp(a)gmail.com> wrote: >> >>> I bought the new mainboard just yestoday and want to modify the BIOS >>> logo. >>> The flashrom(latest) did not work. >>> AFUWIN.exe (4.88) did not work neither. >>> >>> Help me! >> >> Hi, >> >> your flash chip is supported by flashrom since r1598. The latest stable >> version (0.9.7) should work if there are no other problems. >> >> -- >> Kind regards/Mit freundlichen Grüßen, Stefan Tauner >> >

1 0