flashrom

flashrom@flashrom.org

11 participants
9092 discussions

Start a nNew thread

https://www.ohloh.net/p/flashrom
by Luc Verhaegen 07 Jul '09

07 Jul '09

Go claim your contributions :) Luc Verhaegen.

1 0

Re: [flashrom] Abit IP35 needs board enable.
by Luc Verhaegen 07 Jul '09

07 Jul '09

On Mon, Jul 06, 2009 at 08:18:32PM +0100, Richie Ward wrote: > Oh and I hope i used right program :) Is this ok? > > > Found Winbond W83627DHG (id=0xa0, rev=0x23) at 0x2e > > Register dump: > > idx 02 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f > > val ff a0 23 ff 00 4c 00 00 ff 50 00 7c c0 0a 01 00 ff > > def 00 a0 NA ff 00 MM 00 MM RR 50 00 00 RR e2 21 00 00 > > LDN 0x00 (Floppy) > > idx 30 60 61 70 74 f0 f1 f2 f4 f5 > > val 00 00 00 00 04 0e 00 ff 00 00 > > def 01 03 f0 06 02 8e 00 ff 00 00 > > LDN 0x01 (Parallel port) > > idx 30 60 61 70 74 f0 > > val 00 00 00 00 04 38 > > def 01 03 78 07 04 3f > > LDN 0x02 (COM1) > > idx 30 60 61 70 f0 > > val 00 00 00 00 00 > > def 01 03 f8 04 00 > > LDN 0x03 (COM2) > > idx 30 60 61 70 f0 f1 > > val 00 00 00 00 00 00 > > def 01 02 f8 03 00 00 > > LDN 0x05 (Keyboard) > > idx 30 60 61 62 63 70 72 f0 > > val 01 00 60 00 64 01 0c 80 > > def 01 00 60 00 64 01 0c 83 > > LDN 0x06 (Serial peripheral interface) > > idx 30 62 63 > > val 00 ff ff > > def 00 00 00 > > LDN 0x07 (GPIO 6) > > idx 30 f4 f5 f6 f7 > > val 07 ff ff ff ff > > def 00 ff 00 00 00 > > LDN 0x08 (WDTO#, PLED) > > idx 30 f5 f6 f7 > > val 00 ff 00 ff > > def 00 00 00 00 > > LDN 0x09 (GPIO 2, GPIO 3, GPIO 4, GPIO 5) > > idx 30 e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 f0 f1 f2 f3 f4 f5 f6 f7 fe > > val 0e ff 01 00 ff ff ff ff e3 ff 01 ff e3 00 00 c0 ff 20 00 00 > > def 00 ff 00 00 ff 00 00 00 00 00 00 ff 00 00 00 ff 00 00 00 00 > > LDN 0x0a (ACPI) > > idx 30 70 e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 f2 f3 f4 f6 f7 fe > > val 00 00 00 00 f0 04 00 00 1c 10 09 00 7d 00 00 00 08 00 > > def 00 00 01 00 ff 08 00 RR 1c 00 RR RR 7c 00 00 00 00 00 > > LDN 0x0b (Hardware monitor) > > idx 30 60 61 70 f0 f1 f2 > > val 01 02 90 02 81 ff 81 > > def 00 00 00 00 81 00 00 > > LDN 0x0c (PECI, SST) > > idx e0 e1 e2 e3 e4 e5 e8 f1 fe ff > > val 10 52 48 48 48 00 01 48 00 00 > > def 00 48 48 48 48 00 00 48 00 00 Yeah, looking through this now. Luc Verhaegen.

2 4

[commit] r642 - trunk
by svn＠flashrom.org 07 Jul '09

07 Jul '09

Author: libv Date: 2009-07-07 00:58:46 +0200 (Tue, 07 Jul 2009) New Revision: 642 Modified: trunk/board_enable.c Log: Board enable for Abit IP35. Raise GPIO 16 on ICH9R LPC Interface. Signed-off-by: Luc Verhaegen <libv(a)skynet.be> Acked-by: Richie Ward <RichieS(a)GMail.com> Modified: trunk/board_enable.c =================================================================== --- trunk/board_enable.c 2009-07-04 15:10:41 UTC (rev 641) +++ trunk/board_enable.c 2009-07-06 22:58:46 UTC (rev 642) @@ -806,6 +806,32 @@ } /** + * Suited for Abit IP35: Intel P35 + ICH9R. + */ +static int board_abit_ip35(const char *name) +{ + struct pci_dev *dev; + uint16_t base; + uint8_t tmp; + + dev = pci_dev_find(0x8086, 0x2916); /* Intel ICH9R LPC Interface */ + if (!dev) { + fprintf(stderr, "\nERROR: Intel ICH9R LPC not found.\n"); + return -1; + } + + /* get LPC GPIO base */ + base = pci_read_long(dev, 0x48) & 0x0000FFC0; + + /* Raise GPIO 16 */ + tmp = INB(base + 0x0E); + tmp |= 0x01; + OUTB(tmp, base + 0x0E); + + return 0; +} + +/** * We use 2 sets of IDs here, you're free to choose which is which. This * is to provide a very high degree of certainty when matching a board on * the basis of subsystem/card IDs. As not every vendor handles @@ -828,6 +854,7 @@ /* Please keep this list alphabetically ordered by vendor/board name. */ struct board_pciid_enable board_pciid_enables[] = { /* first pci-id set [4], second pci-id set [4], coreboot id [2], vendor name board name flash enable */ + {0x8086, 0x2926, 0x147b, 0x1084, 0x11ab, 0x4364, 0x147b, 0x1084, NULL, NULL, "Abit", "IP35", board_abit_ip35}, {0x8086, 0x1130, 0, 0, 0x105a, 0x0d30, 0x105a, 0x4d33, "acorp", "6a815epd", "Acorp", "6A815EPD", board_acorp_6a815epd}, {0x1022, 0x746B, 0x1022, 0x36C0, 0, 0, 0, 0, "AGAMI", "ARUMA", "agami", "Aruma", w83627hf_gpio24_raise_2e}, {0x1106, 0x3177, 0x17F2, 0x3177, 0x1106, 0x3148, 0x17F2, 0x3148, NULL, NULL, "Albatron", "PM266A*", board_epox_ep_8k5a2},

1 0

Abit IP35 needs board enable.
by Luc Verhaegen 07 Jul '09

07 Jul '09

Thanks to uwe for having the foresight of asking RichW on irc what his email was. lspci -vnn attached. Suggested matches: 2 port sata controller: 0x8086, 0x2926, 0x147b, 0x1084 marvell gigabit ethernet: 0x11ab, 0x4364, 0x147b, 0x1084 Board enable requires: a gpio line on the superio to be altered. logical device: 0x06 0xF0, 0xF1, 0xF2 then all get &= ~0x02 Richard, please provide the output of: superio -Vd so we can identify your superio completely and correctly. Luc Verhaegen.

2 2

Dashix, superio output
by Glenn Mueller 06 Jul '09

06 Jul '09

there is my superio output.The chip was not found, luc said this was still helpful though (sorry about replying directly to you I thought it would come straight to the mailing list). The chip is numbered ITE8703F-A _________________________________________________________________ Windows Live™: Keep your life in sync. http://windowslive.com/explore?ocid=TXT_TAGLM_WL_BR_life_in_synch_062009

1 0

Dashix from irc files
by Glenn Mueller 05 Jul '09

05 Jul '09

Hey guys hey are all the files you had me make (lspci output and such) and the bios that is on the board currently attempting to flash. let me know if you need anything else. _________________________________________________________________ Windows Live™: Keep your life in sync. http://windowslive.com/explore?ocid=TXT_TAGLM_WL_BR_life_in_synch_062009

1 0

[commit] r641 - trunk
by svn＠flashrom.org 04 Jul '09

04 Jul '09

Author: uwe Date: 2009-07-04 17:10:41 +0200 (Sat, 04 Jul 2009) New Revision: 641 Modified: trunk/board_enable.c trunk/print.c Log: Add more URLs and board notes, fix a typo (trivial). 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/board_enable.c 2009-07-03 23:51:19 UTC (rev 640) +++ trunk/board_enable.c 2009-07-04 15:10:41 UTC (rev 641) @@ -830,10 +830,10 @@ /* first pci-id set [4], second pci-id set [4], coreboot id [2], vendor name board name flash enable */ {0x8086, 0x1130, 0, 0, 0x105a, 0x0d30, 0x105a, 0x4d33, "acorp", "6a815epd", "Acorp", "6A815EPD", board_acorp_6a815epd}, {0x1022, 0x746B, 0x1022, 0x36C0, 0, 0, 0, 0, "AGAMI", "ARUMA", "agami", "Aruma", w83627hf_gpio24_raise_2e}, - {0x1106, 0x3177, 0x17F2, 0x3177, 0x1106, 0x3148, 0x17F2, 0x3148, NULL, NULL, "Albatron", "PM266A*", board_epox_ep_8k5a2}, + {0x1106, 0x3177, 0x17F2, 0x3177, 0x1106, 0x3148, 0x17F2, 0x3148, NULL, NULL, "Albatron", "PM266A*", board_epox_ep_8k5a2}, {0x1022, 0x2090, 0, 0, 0x1022, 0x2080, 0, 0, "artecgroup", "dbe61", "Artec Group", "DBE61", board_artecgroup_dbe6x}, {0x1022, 0x2090, 0, 0, 0x1022, 0x2080, 0, 0, "artecgroup", "dbe62", "Artec Group", "DBE62", board_artecgroup_dbe6x}, - {0x1106, 0x3177, 0x1043, 0x80A1, 0x1106, 0x3205, 0x1043, 0x8118, NULL, NULL, "ASUS", "A7V8-MX SE", board_asus_a7v8x_mx}, + {0x1106, 0x3177, 0x1043, 0x80A1, 0x1106, 0x3205, 0x1043, 0x8118, NULL, NULL, "ASUS", "A7V8X-MX SE", board_asus_a7v8x_mx}, {0x8086, 0x1a30, 0x1043, 0x8070, 0x8086, 0x244b, 0x1043, 0x8028, NULL, NULL, "ASUS", "P4B266", ich2_gpio22_raise}, {0x10B9, 0x1541, 0, 0, 0x10B9, 0x1533, 0, 0, "asus", "p5a", "ASUS", "P5A", board_asus_p5a}, {0x1106, 0x3149, 0x1565, 0x3206, 0x1106, 0x3344, 0x1565, 0x1202, NULL, NULL, "Biostar", "P4M80-M4", board_biostar_p4m80_m4}, Modified: trunk/print.c =================================================================== --- trunk/print.c 2009-07-03 23:51:19 UTC (rev 640) +++ trunk/print.c 2009-07-04 15:10:41 UTC (rev 641) @@ -298,7 +298,7 @@ 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=…" }, - { "Advantech", "PCM-5820", "http://taiwan.advantech.com.tw/products/Model_Detail.asp?model_id=1-1TGZL8&…" }, + { "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" }, @@ -324,7 +324,7 @@ { "ASUS", "P5KC", "http://www.asus.com/product.aspx?P_ID=fFZ8oUIGmLpwNMjj" }, { "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_Build_Tutorial" }, + { "BCOM", "WinNET100", "http://www.coreboot.org/BCOM_WINNET100" }, { "GIGABYTE", "GA-6BXC", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ClassVal…" }, { "GIGABYTE", "GA-6BXDU", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-6ZMA", "http://www.gigabyte.de/Support/Motherboard/BIOS_Model.aspx?ProductID=3289" }, @@ -332,22 +332,22 @@ { "GIGABYTE", "GA-EP35-DS3L", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Overview.aspx?Prod…" }, { "Intel", "EP80759", NULL }, { "Jetway", "J7F4K1G5D-PB", "http://www.jetway.com.tw/jetway/system/productshow2.asp?id=389&proname=J7F4…" }, - { "MSI", "MS-6570 (K7N2)", NULL }, - { "MSI", "MS-7065", NULL }, + { "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…" }, - { "MSI", "MS-7236 (945PL Neo3)", "http://global.msi.com.tw/index.php?func=prodmbspec&maincat_no=1&cat2_no=&ca…" }, - { "MSI", "MS-7255 (P4M890M)", "http://us.msi.com/product/p_spec.asp?model=P4M890M" }, - { "MSI", "MS-7345 (P35 Neo2-FIR)","http://www.msi.com/index.php?func=prodcpusupport&maincat_no=1&cat2_no=170&c…" }, + { "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&c…" }, { "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" }, + { "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" }, + { "Thomson", "IP1000", "http://www.settoplinux.org/index.php?title=Thomson_IP1000" }, { "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" }, @@ -366,7 +366,7 @@ { "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_board_detail.aspx?pid=601" }, + { "Tyan", "S5377", "http://www.tyan.com/product_SKU_spec.aspx?ProductType=MB&pid=642&SKU=600000…" }, { "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&…" }, { "VIA", "EPIA-LN", "http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_i…" }, @@ -377,8 +377,8 @@ { "VIA", "VB700X", "http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_i…" }, /* Verified working boards that DO need write-enables. */ - { "Acorp", "6A815EPD", NULL }, - { "agami", "Aruma", NULL }, + { "Acorp", "6A815EPD", "http://web.archive.org/web/20021206163652/www.acorp.com.tw/English/default.…" }, + { "agami", "Aruma", "http://web.archive.org/web/20080212111524/http://www.agami.com/site/ais-600…" }, { "Albatron", "PM266A Pro", "http://www.albatron.com.tw/English/Product/MB/pro_detail.asp?rlink=Overview…" }, /* FIXME */ { "Artec Group", "DBE61", "http://wiki.thincan.org/DBE61" }, { "Artec Group", "DBE62", "http://wiki.thincan.org/DBE62" }, @@ -389,7 +389,7 @@ { "Elitegroup", "K7VTA3", "http://www.ecs.com.tw/ECSWebSite/Products/ProductsDetail.aspx?detailid=264&…" }, { "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", NULL }, + { "GIGABYTE", "GA-2761GXDK", "http://www.computerbase.de/news/hardware/mainboards/amd-systeme/2007/mai/gi…" }, { "GIGABYTE", "GA-7VT600", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-7ZM", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-K8N-SLI", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, @@ -398,25 +398,26 @@ { "GIGABYTE", "GA-MA78G-DS3H", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, /* TODO: Rev 1.x or 2.x? */ { "GIGABYTE", "GA-MA78GM-S2H", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, /* TODO: Rev. 1.0, 1.1, or 2.x? */ { "GIGABYTE", "GA-MA790FX-DQ6", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, - { "HP", "DL145 G3", NULL }, - { "IBM", "x3455", NULL }, - { "Intel", "D201GLY", NULL }, + { "HP", "DL145 G3", "http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c008…" }, + { "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.as…" }, { "Kontron", "986LCD-M", "http://de.kontron.com/products/boards+and+mezzanines/embedded+motherboards/…" }, { "Mitac", "6513WU", "http://web.archive.org/web/20050313054828/http://www.mitac.com/micweb/produ…" }, - { "MSI", "MS-6590 (KT4 Ultra)", NULL }, - { "MSI", "MS-6702E (K8T Neo2-F)",NULL }, + { "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=&p…" }, - { "MSI", "MS-7046", NULL }, - { "MSI", "MS-7135 (K8N Neo3)", NULL }, + { "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_i…" }, - { "VIA", "EPIA M/MII/...", NULL }, - { "VIA", "EPIA SP", NULL }, - { "VIA", "PC3500G", NULL }, - + { "VIA", "EPIA M/MII/...", "http://www.via.com.tw/en/products/embedded/ProductDetail.jsp?productLine=1&…" }, /* EPIA-MII link for now */ + { "VIA", "EPIA-N/NL", "http://www.via.com.tw/en/products/embedded/ProductDetail.jsp?productLine=1&…" }, /* EPIA-N link for now */ + { "VIA", "EPIA SP", "http://www.via.com.tw/en/products/embedded/ProductDetail.jsp?productLine=1&…" }, + { "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_NA…" }, { "ASUS", "M3N78 Pro", "http://www.asus.com/product.aspx?P_ID=DVvm9CU0G1bCC4gp" }, @@ -427,10 +428,10 @@ { "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", NULL }, + { "DFI", "855GME-MGF", "http://www.dfi.com.tw/portal/CM/cmproduct/XX_cmproddetail/XX_WbProdsWindow?…" }, { "FIC", "VA-502", "ftp://ftp.fic.com.tw/motherboard/manual/socket7/va-502/" }, - { "MSI", "MS-6178", NULL }, - { "MSI", "MS-7260 (K9N Neo)", "http://global.msi.com.tw/index.php?func=proddesc&prod_no=255&maincat_no=1" }, + { "MSI", "MS-6178", "http://www.msi-technology.de/index.php?func=proddesc&prod_no=343&maincat_no…" }, + { "MSI", "MS-7260 (K9N Neo)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=255" }, { "PCCHIPS", "M537DMA33", "http://motherboards.mbarron.net/models/pcchips/m537dma.htm" }, { "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/" }, @@ -447,7 +448,7 @@ { "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…" }, { "IBM/Lenovo", "Thinkpad T40p", "http://www.thinkwiki.org/wiki/Category:T40p" }, - { "IBM/Lenovo", "240", NULL }, + { "IBM/Lenovo", "240", "http://www.stanford.edu/~bresnan//tp240.html" }, { NULL, NULL, 0 }, }; @@ -465,6 +466,7 @@ { "Acer", "Aspire One", "See http://www.coreboot.org/pipermail/coreboot/2009-May/048041.html." }, /* Verified non-working boards (for now). */ + { "ASUS", "M3N78 Pro", "SPI flash translation seems to be done in the NVIDIA MCP78 southbridge, but we don't have MCP78 datasheets." }, { "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." }, @@ -473,7 +475,7 @@ /* 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." }, + { "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." },

1 0

[commit] r640 - trunk
by svn＠flashrom.org 04 Jul '09

04 Jul '09

Author: uwe Date: 2009-07-04 01:51:19 +0200 (Sat, 04 Jul 2009) New Revision: 640 Modified: trunk/print.c Log: Some flashrom printing changes: - Also print URLs of boards with board-enables. - Mark known-bad operations for chips red in the wiki. - Clarifiy a wiki message a bit. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/print.c =================================================================== --- trunk/print.c 2009-07-03 17:12:05 UTC (rev 639) +++ trunk/print.c 2009-07-03 23:51:19 UTC (rev 640) @@ -239,7 +239,7 @@ <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 \ -semi-automatically generated by pasting '''flashrom -z''' output.<br />\ +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\ @@ -596,8 +596,9 @@ static void wiki_helper2(const char *heading, int cols) { - int i, j, boardcount = 0, color = 1; + 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++; @@ -612,9 +613,13 @@ if (i > 0 && strcmp(b[i].vendor_name, b[i - 1].vendor_name)) color = !color; - printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s || " - "%s%s%s%s || {{OK}}\n", (color) ? "eeeeee" : "dddddd", - b[i].vendor_name, b[i].board_name, + 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) ? ":" : "", @@ -646,6 +651,7 @@ { int i = 0, c = 1, chipcount = 0; struct flashchip *f, *old = NULL; + uint32_t t; for (f = flashchips; f->name != NULL; f++) chipcount++; @@ -663,14 +669,19 @@ 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), - ((f->tested & TEST_OK_PROBE) ? "OK" : (c) ? "?2" : "?"), - ((f->tested & TEST_OK_READ) ? "OK" : (c) ? "?2" : "?"), - ((f->tested & TEST_OK_ERASE) ? "OK" : (c) ? "?2" : "?"), - ((f->tested & TEST_OK_WRITE) ? "OK" : (c) ? "?2" : "?")); + (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)) {

1 0

[commit] r639 - trunk
by svn＠flashrom.org 03 Jul '09

03 Jul '09

Author: uwe Date: 2009-07-03 19:12:05 +0200 (Fri, 03 Jul 2009) New Revision: 639 Modified: trunk/board_enable.c trunk/flashchips.c trunk/print.c Log: Mark the following boards as working: - VIA EPIA-M700 (reported by Jakob Bornecrantz <wallbraker(a)gmail.com>) http://www.coreboot.org/pipermail/coreboot/2009-July/050416.html - GIGABYTE GA-EX58-UD4P (reported by Warren Turkal <wt(a)penguintechs.org>) http://www.coreboot.org/pipermail/coreboot/2009-June/050199.html Mark as non-working: - ASUS Eee PC 701 4G (reported by Uwe Hermann <uwe(a)hermann-uwe.de>) There seems to be some SPI flash translation layer, likey done by the embedded controller on the laptop (ENE KB3310). The BIOS chip in this Eee PC model is Winbond 25X40VSIG btw. More info: http://beta.ivancover.com/wiki/index.php/Eee_PC_Research Mark this chip as tested: - ST M25P40 (reported by Jakob Bornecrantz <wallbraker(a)gmail.com>) http://www.coreboot.org/pipermail/coreboot/2009-July/050416.html Other: - Make the "Albatron PM266A" board detection print "Albatron PM266A*" as this enable will actually work for other PM266A* boards according to libv. However, the code was actually tested on "Albatron PM266A Pro". - Add some more board URLs / notes. - s/BioStar/Biostar/ as per vendor website. - Fix typo in print.c: s/A7V8-MX SE/A7V8X-MX SE/. 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/board_enable.c 2009-07-01 00:02:23 UTC (rev 638) +++ trunk/board_enable.c 2009-07-03 17:12:05 UTC (rev 639) @@ -297,7 +297,7 @@ } /** - * Suited for EPoX EP-8K5A2 and Albatron PM266A. + * Suited for EPoX EP-8K5A2 and Albatron PM266A Pro. */ static int board_epox_ep_8k5a2(const char *name) { @@ -636,7 +636,7 @@ /** * Suited for: - * - BioStar P4M80-M4: Intel P4 + VIA P4M800 + VT8237 + * - Biostar P4M80-M4: Intel P4 + VIA P4M800 + VT8237 * - GIGABYTE GA-7VT600: AMD K7 + VIA KT600 + VT8237 */ static int board_biostar_p4m80_m4(const char *name) @@ -830,13 +830,13 @@ /* first pci-id set [4], second pci-id set [4], coreboot id [2], vendor name board name flash enable */ {0x8086, 0x1130, 0, 0, 0x105a, 0x0d30, 0x105a, 0x4d33, "acorp", "6a815epd", "Acorp", "6A815EPD", board_acorp_6a815epd}, {0x1022, 0x746B, 0x1022, 0x36C0, 0, 0, 0, 0, "AGAMI", "ARUMA", "agami", "Aruma", w83627hf_gpio24_raise_2e}, - {0x1106, 0x3177, 0x17F2, 0x3177, 0x1106, 0x3148, 0x17F2, 0x3148, NULL, NULL, "Albatron", "PM266A", board_epox_ep_8k5a2}, + {0x1106, 0x3177, 0x17F2, 0x3177, 0x1106, 0x3148, 0x17F2, 0x3148, NULL, NULL, "Albatron", "PM266A*", board_epox_ep_8k5a2}, {0x1022, 0x2090, 0, 0, 0x1022, 0x2080, 0, 0, "artecgroup", "dbe61", "Artec Group", "DBE61", board_artecgroup_dbe6x}, {0x1022, 0x2090, 0, 0, 0x1022, 0x2080, 0, 0, "artecgroup", "dbe62", "Artec Group", "DBE62", board_artecgroup_dbe6x}, {0x1106, 0x3177, 0x1043, 0x80A1, 0x1106, 0x3205, 0x1043, 0x8118, NULL, NULL, "ASUS", "A7V8-MX SE", board_asus_a7v8x_mx}, {0x8086, 0x1a30, 0x1043, 0x8070, 0x8086, 0x244b, 0x1043, 0x8028, NULL, NULL, "ASUS", "P4B266", ich2_gpio22_raise}, {0x10B9, 0x1541, 0, 0, 0x10B9, 0x1533, 0, 0, "asus", "p5a", "ASUS", "P5A", board_asus_p5a}, - {0x1106, 0x3149, 0x1565, 0x3206, 0x1106, 0x3344, 0x1565, 0x1202, NULL, NULL, "BioStar", "P4M80-M4", board_biostar_p4m80_m4}, + {0x1106, 0x3149, 0x1565, 0x3206, 0x1106, 0x3344, 0x1565, 0x1202, NULL, NULL, "Biostar", "P4M80-M4", board_biostar_p4m80_m4}, {0x1106, 0x3038, 0x1019, 0x0996, 0x1106, 0x3177, 0x1019, 0x0996, NULL, NULL, "Elitegroup", "K7VTA3", it8705f_write_enable_2e}, {0x1106, 0x3177, 0x1106, 0x3177, 0x1106, 0x3059, 0x1695, 0x3005, NULL, NULL, "EPoX", "EP-8K5A2", board_epox_ep_8k5a2}, {0x8086, 0x7110, 0, 0, 0x8086, 0x7190, 0, 0, "epox", "ep-bx3", "EPoX", "EP-BX3", board_epox_ep_bx3}, @@ -910,6 +910,7 @@ { "GIGABYTE", "GA-6ZMA", }, { "GIGABYTE", "GA-7ZM", }, { "GIGABYTE", "GA-EP35-DS3L", }, + { "GIGABYTE", "GA-EX58-UD4P", }, { "Intel", "EP80759", }, { "Jetway", "J7F4K1G5D-PB", }, { "MSI", "MS-6570 (K7N2)", }, @@ -950,6 +951,7 @@ { "Tyan", "S5397", }, { "VIA", "EPIA-EX15000G", }, { "VIA", "EPIA-LN", }, + { "VIA", "EPIA-M700", }, { "VIA", "EPIA-NX15000G", }, { "VIA", "NAB74X0", }, { "VIA", "pc2500e", }, @@ -996,6 +998,7 @@ const struct board_info laptops_bad[] = { /* Verified non-working laptops (for now). */ { "Acer", "Aspire One", }, + { "ASUS", "Eee PC 701 4G", }, { "Dell", "Latitude CPi A366XT", }, { "HP/Compaq", "nx9010", }, { "IBM/Lenovo", "Thinkpad T40p", }, Modified: trunk/flashchips.c =================================================================== --- trunk/flashchips.c 2009-07-01 00:02:23 UTC (rev 638) +++ trunk/flashchips.c 2009-07-03 17:12:05 UTC (rev 639) @@ -2289,7 +2289,7 @@ .model_id = ST_M25P40, .total_size = 512, .page_size = 256, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PREW, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, Modified: trunk/print.c =================================================================== --- trunk/print.c 2009-07-01 00:02:23 UTC (rev 638) +++ trunk/print.c 2009-07-03 17:12:05 UTC (rev 639) @@ -328,6 +328,7 @@ { "GIGABYTE", "GA-6BXC", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ClassVal…" }, { "GIGABYTE", "GA-6BXDU", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "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…" }, { "Intel", "EP80759", NULL }, { "Jetway", "J7F4K1G5D-PB", "http://www.jetway.com.tw/jetway/system/productshow2.asp?id=389&proname=J7F4…" }, @@ -369,6 +370,7 @@ { "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&…" }, { "VIA", "EPIA-LN", "http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_i…" }, + { "VIA", "EPIA-M700", "http://via.com.tw/servlet/downloadSvl?motherboard_id=670&download_file_id=3…" }, { "VIA", "EPIA-NX15000G", "http://www.via.com.tw/en/products/embedded/ProductDetail.jsp?productLine=1&…" }, { "VIA", "NAB74X0", "http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_i…" }, { "VIA", "pc2500e", "http://www.via.com.tw/en/initiatives/empowered/pc2500_mainboard/index.jsp" }, @@ -377,34 +379,34 @@ /* Verified working boards that DO need write-enables. */ { "Acorp", "6A815EPD", NULL }, { "agami", "Aruma", NULL }, - { "Albatron", "PM266A", NULL }, + { "Albatron", "PM266A Pro", "http://www.albatron.com.tw/English/Product/MB/pro_detail.asp?rlink=Overview…" }, /* FIXME */ { "Artec Group", "DBE61", "http://wiki.thincan.org/DBE61" }, { "Artec Group", "DBE62", "http://wiki.thincan.org/DBE62" }, - { "ASUS", "A7V8-MX SE", NULL }, + { "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", "P5A", NULL }, - { "BioStar", "P4M80-M4", NULL }, + { "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&…" }, - { "EPoX", "EP-8K5A2", NULL }, - { "EPoX", "EP-BX3", NULL }, + { "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", NULL }, - { "GIGABYTE", "GA-7VT600", NULL }, + { "GIGABYTE", "GA-7VT600", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-7ZM", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-K8N-SLI", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-M57SLI-S4", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Overview.aspx?Prod…" }, { "GIGABYTE", "GA-M61P-S3", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, - { "GIGABYTE", "GA-MA78G-DS3H", NULL }, - { "GIGABYTE", "GA-MA78GM-S2H", NULL }, + { "GIGABYTE", "GA-MA78G-DS3H", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, /* TODO: Rev 1.x or 2.x? */ + { "GIGABYTE", "GA-MA78GM-S2H", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, /* TODO: Rev. 1.0, 1.1, or 2.x? */ { "GIGABYTE", "GA-MA790FX-DQ6", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "HP", "DL145 G3", NULL }, { "IBM", "x3455", NULL }, { "Intel", "D201GLY", NULL }, - { "IWILL", "DK8-HTX", NULL }, + { "IWILL", "DK8-HTX", "http://web.archive.org/web/20060507170150/http://www.iwill.net/product_2.as…" }, { "Kontron", "986LCD-M", "http://de.kontron.com/products/boards+and+mezzanines/embedded+motherboards/…" }, - { "Mitac", "6513WU", NULL }, + { "Mitac", "6513WU", "http://web.archive.org/web/20050313054828/http://www.mitac.com/micweb/produ…" }, { "MSI", "MS-6590 (KT4 Ultra)", NULL }, { "MSI", "MS-6702E (K8T Neo2-F)",NULL }, - { "MSI", "MS-6712 (KT4V)", NULL }, + { "MSI", "MS-6712 (KT4V)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&cat2_no=&cat3_no=&p…" }, { "MSI", "MS-7046", NULL }, { "MSI", "MS-7135 (K8N Neo3)", NULL }, { "Shuttle", "AK38N", "http://eu.shuttle.com/en/desktopdefault.aspx/tabid-36/558_read-9889/" }, @@ -441,7 +443,9 @@ /* 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…" }, { "IBM/Lenovo", "Thinkpad T40p", "http://www.thinkwiki.org/wiki/Category:T40p" }, { "IBM/Lenovo", "240", NULL }, @@ -469,7 +473,9 @@ /* 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." }, { "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 },

1 0

[commit] r638 - trunk
by svn＠flashrom.org 01 Jul '09

01 Jul '09

Author: hailfinger Date: 2009-07-01 02:02:23 +0200 (Wed, 01 Jul 2009) New Revision: 638 Modified: trunk/flash.h trunk/flashrom.8 trunk/flashrom.c trunk/ft2232_spi.c Log: ft2232_spi: Allow runtime selection of FT2232H vs. FT4232H and interface A vs. B. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Tested-by: Jakob Bornecrantz <wallbraker(a)gmail.com> Acked-by: Jakob Bornecrantz <wallbraker(a)gmail.com> Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-06-30 12:41:00 UTC (rev 637) +++ trunk/flash.h 2009-07-01 00:02:23 UTC (rev 638) @@ -368,6 +368,9 @@ extern struct pcidev_status satas_sii[]; /* ft2232_spi.c */ +#define FTDI_FT2232H 0x6010 +#define FTDI_FT4232H 0x6011 +extern char *ft2232spi_param; int ft2232_spi_init(void); int ft2232_spi_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int ft2232_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); Modified: trunk/flashrom.8 =================================================================== --- trunk/flashrom.8 2009-06-30 12:41:00 UTC (rev 637) +++ trunk/flashrom.8 2009-07-01 00:02:23 UTC (rev 638) @@ -183,6 +183,23 @@ Currently the following programmers support this mechanism: .BR nic3com , .BR satasii . +.sp +The ft2232spi has an optional parameter specifying the controller type and +interface/port it should support. For that you have to use the +.B "flashrom -p ft2232spi=model,port=interface" +syntax where +.B model +can be any of +.B 2232H 4232H +and +.B interface +can be any of +.B A +.BR B . +The default model is +.B 4232H +and the default interface is +.BR B . .TP .B "\-h, \-\-help" Show a help text and exit. Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-06-30 12:41:00 UTC (rev 637) +++ trunk/flashrom.c 2009-07-01 00:02:23 UTC (rev 638) @@ -649,10 +649,12 @@ programmer = PROGRAMMER_IT87SPI; } else if (strncmp(optarg, "ft2232spi", 9) == 0) { programmer = PROGRAMMER_FT2232SPI; - } else if (strncmp(optarg, "serprog", 7) == 0) { - programmer = PROGRAMMER_SERPROG; - if (optarg[7] == '=') - serprog_param = strdup(optarg + 8); + if (optarg[9] == '=') + ft2232spi_param = strdup(optarg + 10); + } else if (strncmp(optarg, "serprog", 7) == 0) { + programmer = PROGRAMMER_SERPROG; + if (optarg[7] == '=') + serprog_param = strdup(optarg + 8); } else { printf("Error: Unknown programmer.\n"); exit(1); Modified: trunk/ft2232_spi.c =================================================================== --- trunk/ft2232_spi.c 2009-06-30 12:41:00 UTC (rev 637) +++ trunk/ft2232_spi.c 2009-07-01 00:02:23 UTC (rev 638) @@ -22,9 +22,12 @@ #include <stdint.h> #include <string.h> #include <stdlib.h> +#include <ctype.h> #include "flash.h" #include "spi.h" +char *ft2232spi_param = NULL; + #if FT2232_SPI_SUPPORT == 1 #include <ftdi.h> @@ -71,24 +74,56 @@ struct ftdi_context *ftdic = &ftdic_context; unsigned char buf[512]; unsigned char port_val = 0; + char *portpos = NULL; + int ft2232_type = FTDI_FT4232H; + enum ftdi_interface ft2232_interface = INTERFACE_B; - if (ftdi_init(ftdic) < 0) { fprintf(stderr, "ftdi_init failed\n"); return EXIT_FAILURE; } - // f = ftdi_usb_open(ftdic, 0x0403, 0x6010); // FT2232 - f = ftdi_usb_open(ftdic, 0x0403, 0x6011); // FT4232 + if (ft2232spi_param && !strlen(ft2232spi_param)) { + free(ft2232spi_param); + ft2232spi_param = NULL; + } + if (ft2232spi_param) { + if (strstr(ft2232spi_param, "2232")) + ft2232_type = FTDI_FT2232H; + if (strstr(ft2232spi_param, "4232")) + ft2232_type = FTDI_FT4232H; + portpos = strstr(ft2232spi_param, "port="); + if (portpos) { + portpos += 5; + switch (toupper(*portpos)) { + case 'A': + ft2232_interface = INTERFACE_A; + break; + case 'B': + ft2232_interface = INTERFACE_B; + break; + default: + fprintf(stderr, "Invalid interface specified, " + "using default.\n"); + } + } + free(ft2232spi_param); + } + printf_debug("Using device type %s ", + (ft2232_type == FTDI_FT2232H) ? "2232H" : "4232H"); + printf_debug("interface %s\n", + (ft2232_interface == INTERFACE_A) ? "A" : "B"); + f = ftdi_usb_open(ftdic, 0x0403, ft2232_type); + if (f < 0 && f != -5) { fprintf(stderr, "Unable to open ftdi device: %d (%s)\n", f, ftdi_get_error_string(ftdic)); exit(-1); } - if (ftdi_set_interface(ftdic, INTERFACE_B) < 0) { - fprintf(stderr, "Unable to select FT2232 channel B: %s\n", + if (ftdi_set_interface(ftdic, ft2232_interface) < 0) { + fprintf(stderr, "Unable to select interface: %s\n", ftdic->error_str); }

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom