Compile out wiki output on request and move wiki stuff into a separate file. This is useful for libflashrom (you don't need wiki output in a coreboot payload).
Please note that the patch below was created by using svn cp print.c print_wiki.c, then deleting code from each file. As a result, you only see the deleted code in the patch instead of the added code in print_wiki.c. Signed-off-by: Carl-Daniel Hailfinger <[email protected]> Index: flashrom-wiki_compileout/Makefile =================================================================== --- flashrom-wiki_compileout/Makefile (Revision 724) +++ flashrom-wiki_compileout/Makefile (Arbeitskopie) @@ -83,6 +83,9 @@ # Always enable Dr. Kaiser for now. CONFIG_DRKAISER ?= yes +# Always enable wiki printing for now. +CONFIG_PRINT_WIKI ?= yes + ifeq ($(CONFIG_SERPROG), yes) FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1' OBJS += serprog.o @@ -118,6 +121,11 @@ OBJS += drkaiser.o endif +ifeq ($(CONFIG_PRINT_WIKI), yes) +FEATURE_CFLAGS += -D'PRINT_WIKI_SUPPORT=1' +OBJS += print_wiki.o +endif + $(PROGRAM): $(OBJS) $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS) Index: flashrom-wiki_compileout/flashrom.c =================================================================== --- flashrom-wiki_compileout/flashrom.c (Revision 724) +++ flashrom-wiki_compileout/flashrom.c (Arbeitskopie) @@ -581,7 +581,9 @@ " -l | --layout <file.layout>: read ROM layout from file\n" " -i | --image <name>: only flash image name from flash layout\n" " -L | --list-supported: print supported devices\n" +#if CONFIG_PRINT_WIKI == 1 " -z | --list-supported-wiki: print supported devices in wiki syntax\n" +#endif " -p | --programmer <name>: specify the programmer device"); for (p = 0; p < PROGRAMMER_INVALID; p++) { @@ -634,10 +636,18 @@ int option_index = 0; int force = 0; int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0; - int dont_verify_it = 0, list_supported = 0, list_supported_wiki = 0; + int dont_verify_it = 0, list_supported = 0; +#if CONFIG_PRINT_WIKI == 1 + int list_supported_wiki = 0; +#endif int operation_specified = 0; int ret = 0, i; +#if CONFIG_PRINT_WIKI == 1 + const char *optstring = "rRwvnVEfc:m:l:i:p:Lzh"; +#else + const char *optstring = "rRwvnVEfc:m:l:i:p:Lh"; +#endif static struct option long_options[] = { {"read", 0, 0, 'r'}, {"write", 0, 0, 'w'}, @@ -651,7 +661,9 @@ {"layout", 1, 0, 'l'}, {"image", 1, 0, 'i'}, {"list-supported", 0, 0, 'L'}, +#if CONFIG_PRINT_WIKI == 1 {"list-supported-wiki", 0, 0, 'z'}, +#endif {"programmer", 1, 0, 'p'}, {"help", 0, 0, 'h'}, {"version", 0, 0, 'R'}, @@ -683,7 +695,7 @@ } setbuf(stdout, NULL); - while ((opt = getopt_long(argc, argv, "rRwvnVEfc:m:l:i:p:Lzh", + while ((opt = getopt_long(argc, argv, optstring, long_options, &option_index)) != EOF) { switch (opt) { case 'r': @@ -754,9 +766,11 @@ case 'L': list_supported = 1; break; +#if CONFIG_PRINT_WIKI == 1 case 'z': list_supported_wiki = 1; break; +#endif case 'p': for (programmer = 0; programmer < PROGRAMMER_INVALID; programmer++) { name = programmer_table[programmer].name; @@ -813,10 +827,12 @@ exit(0); } +#if CONFIG_PRINT_WIKI == 1 if (list_supported_wiki) { print_wiki_tables(); exit(0); } +#endif if (read_it && write_it) { printf("Error: -r and -w are mutually exclusive.\n"); Index: flashrom-wiki_compileout/print_wiki.c =================================================================== --- flashrom-wiki_compileout/print_wiki.c (Revision 724) +++ flashrom-wiki_compileout/print_wiki.c (Arbeitskopie) @@ -37,204 +37,6 @@ const char *note; }; -/* - * Return a string corresponding to the bustype parameter. - * Memory is obtained with malloc() and can be freed with free(). - */ -char *flashbuses_to_text(enum chipbustype bustype) -{ - char *ret = calloc(1, 1); - if (bustype == CHIP_BUSTYPE_UNKNOWN) { - ret = strcat_realloc(ret, "Unknown,"); - /* - * FIXME: Once all chipsets and flash chips have been updated, NONSPI - * will cease to exist and should be eliminated here as well. - */ - } else if (bustype == CHIP_BUSTYPE_NONSPI) { - ret = strcat_realloc(ret, "Non-SPI,"); - } else { - if (bustype & CHIP_BUSTYPE_PARALLEL) - ret = strcat_realloc(ret, "Parallel,"); - if (bustype & CHIP_BUSTYPE_LPC) - ret = strcat_realloc(ret, "LPC,"); - if (bustype & CHIP_BUSTYPE_FWH) - ret = strcat_realloc(ret, "FWH,"); - if (bustype & CHIP_BUSTYPE_SPI) - ret = strcat_realloc(ret, "SPI,"); - if (bustype == CHIP_BUSTYPE_NONE) - ret = strcat_realloc(ret, "None,"); - } - /* Kill last comma. */ - ret[strlen(ret) - 1] = '\0'; - ret = realloc(ret, strlen(ret) + 1); - return ret; -} - -#define POS_PRINT(x) do { pos += strlen(x); printf(x); } while (0) - -static int digits(int n) -{ - int i; - - if (!n) - return 1; - - for (i = 0; n; ++i) - n /= 10; - - return i; -} - -void print_supported_chips(void) -{ - int okcol = 0, pos = 0, i, chipcount = 0; - struct flashchip *f; - - for (f = flashchips; f->name != NULL; f++) { - if (GENERIC_DEVICE_ID == f->model_id) - continue; - okcol = max(okcol, strlen(f->vendor) + 1 + strlen(f->name)); - } - okcol = (okcol + 7) & ~7; - - for (f = flashchips; f->name != NULL; f++) - chipcount++; - - printf("\nSupported flash chips (total: %d):\n\n", chipcount); - POS_PRINT("Vendor: Device:"); - while (pos < okcol) { - printf("\t"); - pos += 8 - (pos % 8); - } - - printf("Tested OK:\tKnown BAD: Size/KB: Type:\n\n"); - printf("(P = PROBE, R = READ, E = ERASE, W = WRITE)\n\n"); - - for (f = flashchips; f->name != NULL; f++) { - /* Don't print "unknown XXXX SPI chip" entries. */ - if (!strncmp(f->name, "unknown", 7)) - continue; - - printf("%s", f->vendor); - for (i = 0; i < 10 - strlen(f->vendor); i++) - printf(" "); - printf("%s", f->name); - - pos = 10 + strlen(f->name); - while (pos < okcol) { - printf("\t"); - pos += 8 - (pos % 8); - } - if ((f->tested & TEST_OK_MASK)) { - if ((f->tested & TEST_OK_PROBE)) - POS_PRINT("P "); - if ((f->tested & TEST_OK_READ)) - POS_PRINT("R "); - if ((f->tested & TEST_OK_ERASE)) - POS_PRINT("E "); - if ((f->tested & TEST_OK_WRITE)) - POS_PRINT("W "); - } - while (pos < okcol + 9) { - printf("\t"); - pos += 8 - (pos % 8); - } - if ((f->tested & TEST_BAD_MASK)) { - if ((f->tested & TEST_BAD_PROBE)) - printf("P "); - if ((f->tested & TEST_BAD_READ)) - printf("R "); - if ((f->tested & TEST_BAD_ERASE)) - printf("E "); - if ((f->tested & TEST_BAD_WRITE)) - printf("W "); - } - - printf("\t %d", f->total_size); - for (i = 0; i < 10 - digits(f->total_size); i++) - printf(" "); - printf("%s\n", flashbuses_to_text(f->bustype)); - } -} - -void print_supported_chipsets(void) -{ - int i, j, chipsetcount = 0; - const struct penable *c = chipset_enables; - - for (i = 0; c[i].vendor_name != NULL; i++) - chipsetcount++; - - printf("\nSupported chipsets (total: %d):\n\nVendor: " - "Chipset: PCI IDs:\n\n", chipsetcount); - - for (i = 0; c[i].vendor_name != NULL; i++) { - printf("%s", c[i].vendor_name); - for (j = 0; j < 25 - strlen(c[i].vendor_name); j++) - printf(" "); - printf("%s", c[i].device_name); - for (j = 0; j < 25 - strlen(c[i].device_name); j++) - printf(" "); - printf("%04x:%04x%s\n", c[i].vendor_id, c[i].device_id, - (c[i].status == OK) ? "" : " (untested)"); - } -} - -void print_supported_boards_helper(const struct board_info *b, const char *msg) -{ - int i, j, boardcount = 0; - - for (i = 0; b[i].vendor != NULL; i++) - boardcount++; - - printf("\n%s (total: %d):\n\n", msg, boardcount); - - for (i = 0; b[i].vendor != NULL; i++) { - printf("%s", b[i].vendor); - for (j = 0; j < 25 - strlen(b[i].vendor); j++) - printf(" "); - printf("%s", b[i].name); - for (j = 0; j < 23 - strlen(b[i].name); j++) - printf(" "); - printf("\n"); - } -} - -void print_supported_boards(void) -{ - int i, j, boardcount = 0; - struct board_pciid_enable *b = board_pciid_enables; - - for (i = 0; b[i].vendor_name != NULL; i++) - boardcount++; - - printf("\nSupported boards which need write-enable code (total: %d):" - "\n\nVendor: Board: " - "Required option:\n\n", boardcount); - - for (i = 0; b[i].vendor_name != NULL; i++) { - printf("%s", b[i].vendor_name); - for (j = 0; j < 25 - strlen(b[i].vendor_name); j++) - printf(" "); - printf("%s", b[i].board_name); - for (j = 0; j < 25 - strlen(b[i].board_name); j++) - printf(" "); - if (b[i].lb_vendor != NULL) - printf("-m %s:%s\n", b[i].lb_vendor, b[i].lb_part); - else - printf("(none, board is autodetected)\n"); - } - - print_supported_boards_helper(boards_ok, - "Supported boards which don't need write-enable code"); - print_supported_boards_helper(boards_bad, - "Boards which have been verified to NOT work yet"); - print_supported_boards_helper(laptops_ok, - "Laptops which have been verified to work"); - print_supported_boards_helper(laptops_bad, - "Laptops which have been verified to NOT work yet"); -} - const char *wiki_header = "= Supported devices =\n\n\ <div style=\"margin-top:0.5em; padding:0.5em 0.5em 0.5em 0.5em; \ background-color:#eeeeee; align:right; border:1px solid #aabbcc;\"><small>\n\ Index: flashrom-wiki_compileout/print.c =================================================================== --- flashrom-wiki_compileout/print.c (Revision 724) +++ flashrom-wiki_compileout/print.c (Arbeitskopie) @@ -21,22 +21,9 @@ #include <string.h> #include <stdlib.h> -#include <time.h> #include "flash.h" #include "flashchips.h" -struct board_info_url { - const char *vendor; - const char *name; - const char *url; -}; - -struct board_info_notes { - const char *vendor; - const char *name; - const char *note; -}; - /* * Return a string corresponding to the bustype parameter. * Memory is obtained with malloc() and can be freed with free(). @@ -234,512 +221,3 @@ print_supported_boards_helper(laptops_bad, "Laptops which have been verified to NOT work yet"); } - -const char *wiki_header = "= Supported devices =\n\n\ -<div style=\"margin-top:0.5em; padding:0.5em 0.5em 0.5em 0.5em; \ -background-color:#eeeeee; align:right; border:1px solid #aabbcc;\"><small>\n\ -Please do '''not''' edit these tables in the wiki directly, they are \ -generated by pasting '''flashrom -z''' output.<br />\ -'''Last update:''' %s(generated by flashrom %s)\n</small></div>\n"; - -const char *chipset_th = "{| border=\"0\" style=\"font-size: smaller\"\n\ -|- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\ -! align=\"left\" | Southbridge\n! align=\"left\" | PCI IDs\n\ -! align=\"left\" | Status\n\n"; - -const char *board_th = "{| border=\"0\" style=\"font-size: smaller\" \ -valign=\"top\"\n|- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\ -! align=\"left\" | Mainboard\n! align=\"left\" | Status\n\n"; - -const char *board_th2 = "{| border=\"0\" style=\"font-size: smaller\" \ -valign=\"top\"\n|- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\ -! align=\"left\" | Mainboard\n! align=\"left\" | Required option\n\ -! align=\"left\" | Status\n\n"; - -const char *board_intro = "\ -\n== Supported mainboards ==\n\n\ -In general, it is very likely that flashrom works out of the box even if your \ -mainboard is not listed below.\n\nThis is a list of mainboards where we have \ -verified that they either do or do not need any special initialization to \ -make flashrom work (given flashrom supports the respective chipset and flash \ -chip), or that they do not yet work at all. If they do not work, support may \ -or may not be added later.\n\n\ -Mainboards which don't appear in the list may or may not work (we don't \ -know, someone has to give it a try). Please report any further verified \ -mainboards on the [[Mailinglist|mailing list]].\n"; - -const char *chip_th = "{| border=\"0\" style=\"font-size: smaller\" \ -valign=\"top\"\n|- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\ -! align=\"left\" | Device\n! align=\"left\" | Size / KB\n\ -! align=\"left\" | Type\n! align=\"left\" colspan=\"4\" | Status\n\n\ -|- bgcolor=\"#6699ff\"\n| colspan=\"4\" | \n\ -| Probe\n| Read\n| Write\n| Erase\n\n"; - -const char *programmer_section = "\ -\n== Supported programmers ==\n\nThis is a list \ -of supported PCI devices flashrom can use as programmer:\n\n{| border=\"0\" \ -valign=\"top\"\n| valign=\"top\"|\n\n{| border=\"0\" style=\"font-size: \ -smaller\" valign=\"top\"\n|- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\ -! align=\"left\" | Device\n! align=\"left\" | PCI IDs\n\ -! align=\"left\" | Status\n\n"; - -const char *laptop_intro = "\n== Supported laptops/notebooks ==\n\n\ -In general, flashing laptops is more difficult because laptops\n\n\ -* often use the flash chip for stuff besides the BIOS,\n\ -* often have special protection stuff which has to be handled by flashrom,\n\ -* often use flash translation circuits which need drivers in flashrom.\n\n\ -<div style=\"margin-top:0.5em; padding:0.5em 0.5em 0.5em 0.5em; \ -background-color:#ff6666; align:right; border:1px solid #000000;\">\n\ -'''IMPORTANT:''' At this point we recommend to '''not''' use flashrom on \ -untested laptops unless you have a means to recover from a flashing that goes \ -wrong (a working backup flash chip and/or good soldering skills).\n</div>\n"; - -/* Please keep these lists alphabetically ordered by vendor/board. */ -const struct board_info_url boards_url[] = { - /* Verified working boards that don't need write-enables. */ - { "Abit", "AX8", "http://www.abit.com.tw/page/en/motherboard/motherboard_detail.php?DEFTITLE=Y&fMTYPE=Socket%20939&pMODEL_NAME=AX8"; }, - { "Abit", "Fatal1ty F-I90HD", "http://www.abit.com.tw/page/de/motherboard/motherboard_detail.php?pMODEL_NAME=Fatal1ty+F-I90HD&fMTYPE=LGA775"; }, - { "Advantech", "PCM-5820", "http://www.emacinc.com/sbc_pc_compatible/pcm_5820.htm"; }, - { "ASI", "MB-5BLMP", "http://www.hojerteknik.com/winnet.htm"; }, - { "ASRock", "A770CrossFire", "http://www.asrock.com/mb/overview.asp?Model=A770CrossFire&s=AM2\%2b"; }, - { "ASUS", "A7N8X Deluxe", "http://www.asus.com/Product.aspx?P_ID=wAsRYm41KTp78MFC"; }, - { "ASUS", "A7N8X-E Deluxe", "http://www.asus.com/products.aspx?l1=3&l2=13&l3=56&l4=0&model=217&modelmenu=1"; }, - { "ASUS", "A7V400-MX", "http://www.asus.com.tw/products.aspx?l1=3&l2=13&l3=63&l4=0&model=228&modelmenu=1"; }, - { "ASUS", "A7V8X-MX", "http://www.asus.com.tw/products.aspx?l1=3&l2=13&l3=64&l4=0&model=229&modelmenu=1"; }, - { "ASUS", "A8N-E", "http://www.asus.com.tw/products.aspx?l1=3&l2=15&l3=171&l4=0&model=455&modelmenu=2"; }, - { "ASUS", "A8NE-FM/S", "http://www.hardwareschotte.de/hardware/preise/proid_1266090/preis_ASUS+A8NE-FM"; }, - { "ASUS", "A8N-SLI", "http://asus.com/product.aspx?P_ID=J9FKa8z2xVId3pDK"; }, - { "ASUS", "A8N-SLI Premium", "http://www.asus.com.tw/products.aspx?l1=3&l2=15&l3=148&l4=0&model=539&modelmenu=1"; }, - { "ASUS", "A8V Deluxe", "http://www.asus.com/product.aspx?P_ID=tvpdgPNCPaABZRVU"; }, - { "ASUS", "A8V-E Deluxe", "http://www.asus.com.tw/products.aspx?l1=3&l2=15&l3=143&l4=0&model=376&modelmenu=1"; }, - { "ASUS", "A8V-E SE", "http://www.asus.com.tw/products.aspx?l1=3&l2=15&l3=143&l4=0&model=576&modelmenu=1"; }, - { "ASUS", "M2A-MX", "http://www.asus.com/products.aspx?l1=3&l2=101&l3=583&l4=0&model=1909&modelmenu=1"; }, - { "ASUS", "M2A-VM", "http://www.asus.com.tw/products.aspx?l1=3&l2=101&l3=496&l4=0&model=1568&modelmenu=1"; }, - { "ASUS", "M2N-E", "http://www.asus.com/products.aspx?l1=3&l2=101&l3=308&l4=0&model=1181&modelmenu=1"; }, - { "ASUS", "M2V", "http://asus.com/Product.aspx?P_ID=OqYlEDFfF6ZqZGvp"; }, - { "ASUS", "P2B", "http://www.motherboard.cz/mb/asus/P2B.htm"; }, - { "ASUS", "P2B-D", "ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440bx/p2b-d/"; }, - { "ASUS", "P2B-DS", "ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440bx/p2b-ds/"; }, - { "ASUS", "P2B-F", "http://www.motherboard.cz/mb/asus/P2B-F.htm"; }, - { "ASUS", "P2L97-S", "http://www.motherboard.cz/mb/asus/P2L97-S.htm"; }, - { "ASUS", "P5B-Deluxe", "ftp://ftp.asus.com.tw/pub/ASUS/mb/socket775/P5B-Deluxe/"; }, - { "ASUS", "P5KC", "http://www.asus.com/product.aspx?P_ID=fFZ8oUIGmLpwNMjj"; }, - { "ASUS", "P5L-MX", "http://www.asus.com/product.aspx?P_ID=X70d3NCzH2DE9vWH"; }, - { "ASUS", "P6T Deluxe V2", "http://www.asus.com/product.aspx?P_ID=iRlP8RG9han6saZx"; }, - { "A-Trend", "ATC-6220", "http://www.motherboard.cz/mb/atrend/atc6220.htm"; }, - { "BCOM", "WinNET100", "http://www.coreboot.org/BCOM_WINNET100"; }, - { "GIGABYTE", "GA-6BXC", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ClassValue=Motherboard&ProductID=1445&ProductName=GA-6BXC"; }, - { "GIGABYTE", "GA-6BXDU", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductID=1429"; }, - { "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?ProductID=2986"; }, - { "GIGABYTE", "GA-EP35-DS3L", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Overview.aspx?ProductID=2778"; }, - { "GIGABYTE", "GA-MA790GP-DS4H", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductID=2887"; }, - { "GIGABYTE", "GA-MA78GPM-DS2H", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductID=2859"; }, - { "Intel", "EP80759", NULL }, - { "Jetway", "J7F4K1G5D-PB", "http://www.jetway.com.tw/jetway/system/productshow2.asp?id=389&proname=J7F4K1G5D-P"; }, - { "MSI", "MS-6570 (K7N2)", "http://www.msi-computer.de/index.php?func=proddesc&prod_no=519&maincat_no=1"; }, - { "MSI", "MS-7065", "http://browse.geekbench.ca/geekbench2/view/53114"; }, - { "MSI", "MS-7168 (Orion)", "http://support.packardbell.co.uk/uk/item/index.php?i=spec_orion&pi=platform_honeymoon_istart"; }, - { "MSI", "MS-7236 (945PL Neo3)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=1173"; }, - { "MSI", "MS-7255 (P4M890M)", "http://www.tcsbahamas.com/P4M89.htm"; }, - { "MSI", "MS-7345 (P35 Neo2-FIR)","http://www.msi.com/index.php?func=prodcpusupport&maincat_no=1&cat2_no=170&cat3_no=&prod_no=1261"; }, - { "NEC", "PowerMate 2000", "http://support.necam.com/mobilesolutions/hardware/Desktops/pm2000/celeron/"; }, - { "PC Engines", "Alix.1c", "http://pcengines.ch/alix1c.htm"; }, - { "PC Engines", "Alix.2c2", "http://pcengines.ch/alix2c2.htm"; }, - { "PC Engines", "Alix.2c3", "http://pcengines.ch/alix2c3.htm"; }, - { "PC Engines", "Alix.3c3", "http://pcengines.ch/alix3c3.htm"; }, - { "PC Engines", "Alix.3d3", "http://pcengines.ch/alix3d3.htm"; }, - { "RCA", "RM4100", "http://www.settoplinux.org/index.php?title=RCA_RM4100"; }, - { "Sun", "Blade x6250", "http://www.sun.com/servers/blades/x6250/"; }, - { "Supermicro", "H8QC8", "http://www.supermicro.com/Aplus/motherboard/Opteron/nforce/H8QC8.cfm"; }, - { "Thomson", "IP1000", "http://www.settoplinux.org/index.php?title=Thomson_IP1000"; }, - { "TriGem", "Lomita", "http://www.e4allupgraders.info/dir1/motherboards/socket370/lomita.shtml"; }, - { "T-Online", "S-100", "http://wiki.freifunk-hannover.de/T-Online_S_100"; }, - { "Tyan", "iS5375-1U", "http://www.tyan.com/product_board_detail.aspx?pid=610"; }, - { "Tyan", "S1846", "http://www.tyan.com/archive/products/html/tsunamiatx.html"; }, - { "Tyan", "S2466", "http://www.tyan.com/product_board_detail.aspx?pid=461"; }, - { "Tyan", "S2881", "http://www.tyan.com/product_board_detail.aspx?pid=115"; }, - { "Tyan", "S2882", "http://www.tyan.com/product_board_detail.aspx?pid=121"; }, - { "Tyan", "S2882-D", "http://www.tyan.com/product_board_detail.aspx?pid=127"; }, - { "Tyan", "S2891", "http://www.tyan.com/product_board_detail.aspx?pid=144"; }, - { "Tyan", "S2892", "http://www.tyan.com/product_board_detail.aspx?pid=145"; }, - { "Tyan", "S2895", "http://www.tyan.com/archive/products/html/thunderk8we.html"; }, - { "Tyan", "S3095", "http://www.tyan.com/product_board_detail.aspx?pid=181"; }, - { "Tyan", "S5180", "http://www.tyan.com/product_board_detail.aspx?pid=456"; }, - { "Tyan", "S5191", "http://www.tyan.com/product_board_detail.aspx?pid=343"; }, - { "Tyan", "S5197", "http://www.tyan.com/product_board_detail.aspx?pid=349"; }, - { "Tyan", "S5211", "http://www.tyan.com/product_board_detail.aspx?pid=591"; }, - { "Tyan", "S5211-1U", "http://www.tyan.com/product_board_detail.aspx?pid=593"; }, - { "Tyan", "S5220", "http://www.tyan.com/product_board_detail.aspx?pid=597"; }, - { "Tyan", "S5375", "http://www.tyan.com/product_board_detail.aspx?pid=566"; }, - { "Tyan", "S5376G2NR/S5376WAG2NR","http://www.tyan.com/product_board_detail.aspx?pid=605"; }, - { "Tyan", "S5377", "http://www.tyan.com/product_SKU_spec.aspx?ProductType=MB&pid=642&SKU=600000017"; }, - { "Tyan", "S5397", "http://www.tyan.com/product_board_detail.aspx?pid=560"; }, - { "VIA", "EPIA-EX15000G", "http://www.via.com.tw/en/products/embedded/ProductDetail.jsp?productLine=1&motherboard_id=450"; }, - { "VIA", "EPIA-LN", "http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_id=473"; }, - { "VIA", "EPIA-M700", "http://via.com.tw/servlet/downloadSvl?motherboard_id=670&download_file_id=3700"; }, - { "VIA", "EPIA-NX15000G", "http://www.via.com.tw/en/products/embedded/ProductDetail.jsp?productLine=1&motherboard_id=470"; }, - { "VIA", "NAB74X0", "http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_id=590"; }, - { "VIA", "pc2500e", "http://www.via.com.tw/en/initiatives/empowered/pc2500_mainboard/index.jsp"; }, - { "VIA", "VB700X", "http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_id=490"; }, - - /* Verified working boards that DO need write-enables. */ - { "Acorp", "6A815EPD", "http://web.archive.org/web/20021206163652/www.acorp.com.tw/English/default.asp"; }, - { "agami", "Aruma", "http://web.archive.org/web/20080212111524/http://www.agami.com/site/ais-6000-series"; }, - { "Albatron", "PM266A Pro", "http://www.albatron.com.tw/English/Product/MB/pro_detail.asp?rlink=Overview&no=56"; }, /* FIXME */ - { "AOpen", "vKM400Am-S", "http://usa.aopen.com/products_detail.aspx?Auno=824"; }, - { "Artec Group", "DBE61", "http://wiki.thincan.org/DBE61"; }, - { "Artec Group", "DBE62", "http://wiki.thincan.org/DBE62"; }, - { "ASUS", "A7V600-X", "http://www.asus.com/product.aspx?P_ID=L2XYS0rmtCjeOr4k"; }, - { "ASUS", "A7V8X-MX SE", "http://www.asus.com/product.aspx?P_ID=1guVBT1qV5oqhHyZ"; }, - { "ASUS", "P4B266", "http://www.ciao.co.uk/ASUS_Intel_845D_Chipset_P4B266__5409807#productdetail"; }, - { "ASUS", "P4P800-E Deluxe", "http://www.asus.com/product.aspx?P_ID=INIJUvLlif7LHp3g"; }, - { "ASUS", "P5A", "ftp://ftp.asus.com.tw/pub/ASUS/mb/sock7/ali/p5a/"; }, - { "Biostar", "P4M80-M4", "http://www.biostar-usa.com/mbdetails.asp?model=p4m80-m4"; }, - { "Elitegroup", "K7VTA3", "http://www.ecs.com.tw/ECSWebSite/Products/ProductsDetail.aspx?detailid=264&CategoryID=1&DetailName=Specification&MenuID=52&LanID=0"; }, - { "EPoX", "EP-8K5A2", "http://www.epox.com/product.asp?ID=EP-8K5A2"; }, - { "EPoX", "EP-BX3", "http://www.epox.com/product.asp?ID=EP-BX3"; }, - { "GIGABYTE", "GA-2761GXDK", "http://www.computerbase.de/news/hardware/mainboards/amd-systeme/2007/mai/gigabyte_dtx-mainboard/"; }, - { "GIGABYTE", "GA-7VT600", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductID=1666"; }, - { "GIGABYTE", "GA-7ZM", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductID=1366"; }, - { "GIGABYTE", "GA-K8N-SLI", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductID=1928"; }, - { "GIGABYTE", "GA-M57SLI-S4", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Overview.aspx?ProductID=2287&ModelName=GA-M57SLI-S4"; }, - { "GIGABYTE", "GA-M61P-S3", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductID=2434"; }, - { "GIGABYTE", "GA-MA78G-DS3H", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductID=2800"; }, /* TODO: Rev 1.x or 2.x? */ - { "GIGABYTE", "GA-MA78GM-S2H", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductID=2758"; }, /* TODO: Rev. 1.0, 1.1, or 2.x? */ - { "GIGABYTE", "GA-MA790FX-DQ6", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductID=2690"; }, - { "HP", "DL145 G3", "http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c00816835&lang=en&cc=us&taskId=101&prodSeriesId=3219755&prodTypeId=15351"; }, - { "IBM", "x3455", "http://www-03.ibm.com/systems/x/hardware/rack/x3455/index.html"; }, - { "Intel", "D201GLY", "http://www.intel.com/support/motherboards/desktop/d201gly/index.htm"; }, - { "IWILL", "DK8-HTX", "http://web.archive.org/web/20060507170150/http://www.iwill.net/product_2.asp?p_id=98"; }, - { "Kontron", "986LCD-M", "http://de.kontron.com/products/boards+and+mezzanines/embedded+motherboards/miniitx+motherboards/986lcdmmitx.html"; }, - { "Mitac", "6513WU", "http://web.archive.org/web/20050313054828/http://www.mitac.com/micweb/products/tyan/6513wu/6513wu.htm"; }, - { "MSI", "MS-6590 (KT4 Ultra)", "http://www.msicomputer.com/product/p_spec.asp?model=KT4_Ultra&class=mb"; }, - { "MSI", "MS-6702E (K8T Neo2-F)","http://www.msicomputer.com/product/p_spec.asp?model=K8T_Neo2-F&class=mb"; }, - { "MSI", "MS-6712 (KT4V)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&cat2_no=&cat3_no=&prod_no=505"; }, - { "MSI", "MS-7046", "http://www.heimir.de/ms7046/"; }, - { "MSI", "MS-7135 (K8N Neo3)", "http://www.msi-computer.de/index.php?func=proddesc&prod_no=170&maincat_no=1"; }, - { "Shuttle", "AK38N", "http://eu.shuttle.com/en/desktopdefault.aspx/tabid-36/558_read-9889/"; }, - { "Soyo", "SY-7VCA", "http://www.tomshardware.com/reviews/12-socket-370-motherboards,196-15.html"; }, - { "Tyan", "S2498 (Tomcat K7M)", "http://www.tyan.com/archive/products/html/tomcatk7m.html"; }, - { "VIA", "EPIA-CN", "http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_id=400"; }, - { "VIA", "EPIA M/MII/...", "http://www.via.com.tw/en/products/embedded/ProductDetail.jsp?productLine=1&motherboard_id=202"; }, /* EPIA-MII link for now */ - { "VIA", "EPIA-N/NL", "http://www.via.com.tw/en/products/embedded/ProductDetail.jsp?productLine=1&motherboard_id=221"; }, /* EPIA-N link for now */ - { "VIA", "EPIA SP", "http://www.via.com.tw/en/products/embedded/ProductDetail.jsp?productLine=1&motherboard_id=261"; }, - { "VIA", "PC3500G", "http://www.via.com.tw/en/initiatives/empowered/pc3500_mainboard/index.jsp"; }, - - /* Verified non-working boards (for now). */ - { "Abit", "IS-10", "http://www.abit.com.tw/page/en/motherboard/motherboard_detail.php?pMODEL_NAME=IS-10&fMTYPE=Socket+478"; }, - { "ASRock", "K7VT4A+", "http://www.asrock.com/mb/overview.asp?Model=K7VT4A%%2b&s="; }, - { "ASUS", "MEW-AM", "ftp://ftp.asus.com.tw/pub/ASUS/mb/sock370/810/mew-am/"; }, - { "ASUS", "MEW-VM", "http://www.elhvb.com/mboards/OEM/HP/manual/ASUS%20MEW-VM.htm"; }, - { "ASUS", "P3B-F", "ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440bx/p3b-f/"; }, - { "ASUS", "P5B", "ftp://ftp.asus.com.tw/pub/ASUS/mb/socket775/P5B/"; }, - { "ASUS", "P5BV-M", "ftp://ftp.asus.com.tw/pub/ASUS/mb/socket775/P5B-VM/"; }, - { "Biostar", "M6TBA", "ftp://ftp.biostar-usa.com/manuals/M6TBA/"; }, - { "Boser", "HS-6637", "http://www.boser.com.tw/manual/HS-62376637v3.4.pdf"; }, - { "DFI", "855GME-MGF", "http://www.dfi.com.tw/portal/CM/cmproduct/XX_cmproddetail/XX_WbProdsWindow?action=e&downloadType=&windowstate=normal&mode=view&downloadFlag=false&itemId=433"; }, - { "FIC", "VA-502", "ftp://ftp.fic.com.tw/motherboard/manual/socket7/va-502/"; }, - { "MSI", "MS-6178", "http://www.msi-technology.de/index.php?func=proddesc&prod_no=343&maincat_no=1"; }, - { "MSI", "MS-7260 (K9N Neo)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=255"; }, - { "Soyo", "SY-5VD", "http://www.soyo.com/content/Downloads/163/&c=80&p=464&l=English"; }, - { "Sun", "Fire x4540", "http://www.sun.com/servers/x64/x4540/"; }, - { "Sun", "Fire x4150", "http://www.sun.com/servers/x64/x4150/"; }, - { "Sun", "Fire x4200", "http://www.sun.com/servers/entry/x4200/"; }, - { "Sun", "Fire x4600", "http://www.sun.com/servers/x64/x4600/"; }, - - /* Verified working laptops. */ - { "Lenovo", "3000 V100 TF05Cxx", "http://www5.pc.ibm.com/europe/products.nsf/products?openagent&brand=Lenovo3000Notebook&series=Lenovo+3000+V+Series#viewallmodelstop"; }, - - /* Verified non-working laptops (for now). */ - { "Acer", "Aspire One", NULL }, - { "ASUS", "Eee PC 701 4G", "http://www.asus.com/product.aspx?P_ID=h6SPd3tEzLEsrEiS"; }, - { "Dell", "Latitude CPi A366XT", "http://www.coreboot.org/Dell_Latitude_CPi_A366XT"; }, - { "HP/Compaq", "nx9010", "http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?lang=en&cc=us&objectID=c00348514"; }, - { "IBM/Lenovo", "Thinkpad T40p", "http://www.thinkwiki.org/wiki/Category:T40p"; }, - { "IBM/Lenovo", "240", "http://www.stanford.edu/~bresnan//tp240.html"; }, - - { NULL, NULL, 0 }, -}; - -/* Please keep these lists alphabetically ordered by vendor/board. */ -const struct board_info_notes boards_notes[] = { - /* Verified working boards that don't need write-enables. */ - { "ASI", "MB-5BLMP", "Used in the IGEL WinNET III thin client." }, - { "ASUS", "A8V-E SE", "See http://www.coreboot.org/pipermail/coreboot/2007-October/026496.html."; }, - { "ASUS", "M2A-VM", "See http://www.coreboot.org/pipermail/coreboot/2007-September/025281.html."; }, - { "BCOM", "WinNET100", "Used in the IGEL-316 thin client." }, - { "GIGABYTE", "GA-7ZM", "Works fine iff you remove jumper JP9 on the board and disable the flash protection BIOS option." }, - - /* Verified working boards that DO need write-enables. */ - { "Acer", "Aspire One", "See http://www.coreboot.org/pipermail/coreboot/2009-May/048041.html."; }, - - /* Verified non-working boards (for now). */ - { "MSI", "MS-6178", "Immediately powers off if you try to hot-plug the chip. However, this does '''not''' happen if you use coreboot." }, - { "MSI", "MS-7260 (K9N Neo)", "Interestingly flashrom does not work when the vendor BIOS is booted, but it ''does'' work flawlessly when the machine is booted with coreboot." }, - - /* Verified working laptops. */ - /* None which need comments, yet... */ - - /* Verified non-working laptops (for now). */ - { "Acer", "Aspire One", "http://www.coreboot.org/pipermail/coreboot/2009-May/048041.html"; }, - { "ASUS", "Eee PC 701 4G", "It seems the chip (25X40VSIG) is behind some SPI flash translation layer (likely in the EC, the ENE KB3310)." }, - { "Dell", "Latitude CPi A366XT", "The laptop immediately powers off if you try to hot-swap the chip. It's not yet tested if write/erase would work on this laptop." }, - { "HP/Compaq", "nx9010", "Hangs upon '''flashrom -V''' (needs hard power-cycle then)." }, - { "IBM/Lenovo", "Thinkpad T40p", "Seems to (partially) work at first, but one block/sector cannot be written which then leaves you with a bricked laptop. Maybe this can be investigated and fixed in software later." }, - - { NULL, NULL, 0 }, -}; - -static int url(const char *vendor, const char *board) -{ - int i; - const struct board_info_url *b = boards_url; - - for (i = 0; b[i].vendor != NULL; i++) { - if (!strcmp(vendor, b[i].vendor) && !strcmp(board, b[i].name)) - return i; - } - - return -1; -} - -static int note(const char *vendor, const char *board) -{ - int i; - const struct board_info_notes *n = boards_notes; - - for (i = 0; n[i].vendor != NULL; i++) { - if (!strcmp(vendor, n[i].vendor) && !strcmp(board, n[i].name)) - return i; - } - - return -1; -} - -void print_supported_chipsets_wiki(void) -{ - int i, j, enablescount = 0, color = 1; - const struct penable *e; - - for (e = chipset_enables; e->vendor_name != NULL; e++) - enablescount++; - - printf("\n== Supported chipsets ==\n\nTotal amount of supported " - "chipsets: '''%d'''\n\n{| border=\"0\" valign=\"top\"\n| " - "valign=\"top\"|\n\n%s", enablescount, chipset_th); - - e = chipset_enables; - for (i = 0, j = 0; e[i].vendor_name != NULL; i++, j++) { - /* Alternate colors if the vendor changes. */ - if (i > 0 && strcmp(e[i].vendor_name, e[i - 1].vendor_name)) - color = !color; - - printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s " - "|| %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}}" : "?"); - - /* Split table in three columns. */ - if (j >= (enablescount / 3 + 1)) { - printf("\n|}\n\n| valign=\"top\"|\n\n%s", chipset_th); - j = 0; - } - } - - printf("\n|}\n\n|}\n"); -} - -static void wiki_helper(const char *heading, const char *status, - int cols, const struct board_info boards[]) -{ - int i, j, k, c, boardcount = 0, color = 1, num_notes = 0; - const struct board_info *b; - const struct board_info_url *u = boards_url; - char *notes = calloc(1, 1); - char tmp[900 + 1]; - - for (b = boards; b->vendor != NULL; b++) - boardcount++; - - printf("\n'''%s'''\n\nTotal amount of boards: '''%d'''\n\n" - "{| border=\"0\" valign=\"top\"\n| valign=\"top\"|\n\n%s", - heading, boardcount, board_th); - - for (i = 0, j = 0, b = boards; b[i].vendor != NULL; i++, j++) { - /* Alternate colors if the vendor changes. */ - if (i > 0 && strcmp(b[i].vendor, b[i - 1].vendor)) - color = !color; - - k = url(b[i].vendor, b[i].name); - c = note(b[i].vendor, b[i].name); - - printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s%s %s%s ||" - " {{%s}}", (color) ? "eeeeee" : "dddddd", b[i].vendor, - (k != -1 && u[k].url) ? "[" : "", - (k != -1 && u[k].url) ? u[k].url : "", - b[i].name, (k != -1 && u[k].url) ? "]" : "", status); - - if (c != -1) { - printf("<sup>%d</sup>\n", num_notes + 1); - snprintf((char *)&tmp, 900, "<sup>%d</sup> %s<br />\n", - 1 + num_notes++, boards_notes[c].note); - notes = strcat_realloc(notes, (char *)&tmp); - } else { - printf("\n"); - } - - /* Split table in 'cols' columns. */ - if (j >= (boardcount / cols + 1)) { - printf("\n|}\n\n| valign=\"top\"|\n\n%s", board_th); - j = 0; - } - } - - printf("\n|}\n\n|}\n"); - - if (num_notes > 0) - printf("\n<small>\n%s</small>\n", notes); - free(notes); -} - -static void wiki_helper2(const char *heading, int cols) -{ - int i, j, k, boardcount = 0, color = 1; - struct board_pciid_enable *b; - const struct board_info_url *u = boards_url; - - for (b = board_pciid_enables; b->vendor_name != NULL; b++) - boardcount++; - - printf("\n'''%s'''\n\nTotal amount of boards: '''%d'''\n\n" - "{| border=\"0\" valign=\"top\"\n| valign=\"top\"|\n\n%s", - heading, boardcount, board_th2); - - b = board_pciid_enables; - for (i = 0, j = 0; b[i].vendor_name != NULL; i++, j++) { - /* Alternate colors if the vendor changes. */ - if (i > 0 && strcmp(b[i].vendor_name, b[i - 1].vendor_name)) - color = !color; - - k = url(b[i].vendor_name, b[i].board_name); - - printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s%s %s%s " - "|| %s%s%s%s || {{OK}}\n", (color) ? "eeeeee" : "dddddd", - b[i].vendor_name, (k != -1 && u[k].url) ? "[" : "", - (k != -1 && u[k].url) ? u[k].url : "", b[i].board_name, - (k != -1 && u[k].url) ? "]" : "", - (b[i].lb_vendor) ? "-m " : "—", - (b[i].lb_vendor) ? b[i].lb_vendor : "", - (b[i].lb_vendor) ? ":" : "", - (b[i].lb_vendor) ? b[i].lb_part : ""); - - /* Split table in three columns. */ - if (j >= (boardcount / cols + 1)) { - printf("\n|}\n\n| valign=\"top\"|\n\n%s", board_th2); - j = 0; - } - } - - printf("\n|}\n\n|}\n"); -} - -void print_supported_boards_wiki(void) -{ - printf("%s", board_intro); - wiki_helper("Known good (worked out of the box)", "OK", 3, boards_ok); - wiki_helper2("Known good (with write-enable code in flashrom)", 3); - wiki_helper("Not supported (yet)", "No", 3, boards_bad); - - printf("%s", laptop_intro); - wiki_helper("Known good (worked out of the box)", "OK", 1, laptops_ok); - wiki_helper("Not supported (yet)", "No", 1, laptops_bad); -} - -void print_supported_chips_wiki(void) -{ - int i = 0, c = 1, chipcount = 0; - struct flashchip *f, *old = NULL; - uint32_t t; - - for (f = flashchips; f->name != NULL; f++) - chipcount++; - - printf("\n== Supported chips ==\n\nTotal amount of supported " - "chips: '''%d'''\n\n{| border=\"0\" valign=\"top\"\n" - "| valign=\"top\"|\n\n%s", chipcount, chip_th); - - for (f = flashchips; f->name != NULL; f++, i++) { - /* Don't print "unknown XXXX SPI chip" entries. */ - if (!strncmp(f->name, "unknown", 7)) - continue; - - /* Alternate colors if the vendor changes. */ - if (old != NULL && strcmp(old->vendor, f->vendor)) - c = !c; - - t = f->tested; - printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s || %d " - "|| %s || {{%s}} || {{%s}} || {{%s}} || {{%s}}\n", - (c == 1) ? "eeeeee" : "dddddd", f->vendor, f->name, - f->total_size, flashbuses_to_text(f->bustype), - (t & TEST_OK_PROBE) ? "OK" : - (t & TEST_BAD_PROBE) ? "No" : ((c) ? "?2" : "?"), - (t & TEST_OK_READ) ? "OK" : - (t & TEST_BAD_READ) ? "No" : ((c) ? "?2" : "?"), - (t & TEST_OK_ERASE) ? "OK" : - (t & TEST_BAD_ERASE) ? "No" : ((c) ? "?2" : "?"), - (t & TEST_OK_WRITE) ? "OK" : - (t & TEST_BAD_WRITE) ? "No" : ((c) ? "?2" : "?")); - - /* Split table into three columns. */ - if (i >= (chipcount / 3 + 1)) { - printf("\n|}\n\n| valign=\"top\"|\n\n%s", chip_th); - i = 0; - } - - old = f; - } - - printf("\n|}\n\n|}\n"); -} - -void print_supported_pcidevs_wiki(struct pcidev_status *devs) -{ - int i = 0; - static int c = 0; - - /* Alternate colors if the vendor changes. */ - c = !c; - - for (i = 0; devs[i].vendor_name != NULL; i++) { - printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s || " - "%04x:%04x || {{%s}}\n", (c) ? "eeeeee" : "dddddd", - devs[i].vendor_name, devs[i].device_name, - devs[i].vendor_id, devs[i].device_id, - (devs[i].status == PCI_NT) ? (c) ? "?2" : "?" : "OK"); - } -} - -void print_wiki_tables(void) -{ - time_t t = time(NULL); - - printf(wiki_header, ctime(&t), flashrom_version); - print_supported_chips_wiki(); - print_supported_chipsets_wiki(); - print_supported_boards_wiki(); - printf("%s", programmer_section); -#if NIC3COM_SUPPORT == 1 - print_supported_pcidevs_wiki(nics_3com); -#endif -#if DRKAISER_SUPPORT == 1 - /* FIXME: drkaiser_pcidev is missing here. */ -#endif -#if SATASII_SUPPORT == 1 - print_supported_pcidevs_wiki(satas_sii); -#endif - printf("\n|}\n"); -} - -- http://www.hailfinger.org/ _______________________________________________ flashrom mailing list [email protected] http://www.flashrom.org/mailman/listinfo/flashrom
