November 2012 - flashrom - mail.coreboot.org

[PATCH] Fix linker flag bug introduced in r1623
by Carl-Daniel Hailfinger Jan. 8, 2013

Jan. 8, 2013

Spotted by Idwer Vollering. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> and committed in r1623 Index: flashrom-Makefile_libusb_libpci_ldflags_fix/Makefile =================================================================== --- flashrom-Makefile_libusb_libpci_ldflags_fix/Makefile (Revision 1624) +++ flashrom-Makefile_libusb_libpci_ldflags_fix/Makefile (Revision 1625) @@ -710,10 +710,10 @@ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1) @printf "Checking if libpci is present and sufficient... " - @$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(PCILIBS) >/dev/null && \ + @$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) >/dev/null && \ echo "yes." || ( echo "no."; \ printf "Checking if libz+libpci are present and sufficient..."; \ - $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(PCILIBS) -lz >/dev/null && \ + $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) -lz >/dev/null && \ ( echo "yes."; echo "NEEDLIBZ := yes" > .libdeps ) || ( echo "no."; echo; \ echo "Please install libpci (package pciutils) and/or libz."; \ echo "See README for more information."; echo; \ @@ -729,7 +729,7 @@ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1) @printf "Checking if libusb-0.1 is usable... " - @$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(USBLIBS) >/dev/null && \ + @$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USBLIBS) >/dev/null && \ echo "yes." || ( echo "no."; \ echo "Please install libusb-0.1 or libusb-compat."; \ echo "See README for more information."; echo; \ -- http://www.hailfinger.org/

1 1

flashrom -p gfxnvidia detect my atheros ath9k wifi card
by Denis 'GNUtoo' Carikli Jan. 6, 2013

Jan. 6, 2013

Hi, Here are the logs: # ./flashrom -p gfxnvidia -VVV flashrom v0.9.5.2-r1546 on Linux 3.0.0-19-generic-pae (i686) flashrom is free software, get the source code at http://www.flashrom.org flashrom was built with libpci 3.1.7, GCC 4.6.1, little endian Command line (3 args): ./flashrom -p gfxnvidia -VVV Calibrating delay loop... OS timer resolution is 1 usecs, 1503M loops per second, 10 myus = 10 us, 100 myus = 100 us, 1000 myus = 1000 us, 10000 myus = 10007 us, 4 myus = 4 us, OK. Initializing gfxnvidia programmer Found "NVIDIA RIVA TNT2 Ultra" (168c:0029, BDF 03:06.0). PCI header type 0x00 Requested BAR is MEM, 32bit, not prefetchable === This PCI device is UNTESTED. Please report the 'flashrom -p xxxx' output to flashrom(a)flashrom.org if it works for you. Please add the name of your PCI device to the subject. Thank you for your help! === Detected NVIDIA I/O base address: 0xd8600000. The following protocols are supported: Parallel. Probing for AMD Am29F010A/B, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F002(N)BB, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F002(N)BT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F016D, 2048 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F080B, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV001BB, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV001BT, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV002BB, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV002BT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV004BB, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV004BT, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV008BB, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV008BT, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV081B, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A29002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A29002T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A29040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT29C512, 64 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT29C010A, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT29C020, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT29C040A, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT49BV512, 64 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT49F002(N), 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT49F002(N)T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT49F020, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT49F040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Catalyst CAT28F512, 64 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Bright BM29F040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for EMST F49B002UA, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Eon EN29F010, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Eon EN29F002(A)(N)B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Eon EN29F002(A)(N)T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Eon EN29LV640B, 8192 kB: probe_en29lv640b: id1 0xffff, id2 0x00ff Probing for Fujitsu MBM29F004BC, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F004TC, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F400BC, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for Fujitsu MBM29F400TC, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for Hyundai HY29F002T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Hyundai HY29F002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Hyundai HY29F040A, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F001BN/BX-B, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F001BN/BX-T, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F002BC/BL/BV/BX-T, 256 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F008S3/S5/SC, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F004B5/BE/BV/BX-B, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F004B5/BE/BV/BX-T, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F400BV/BX/CE/CV-B, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F400BV/BX/CE/CV-T, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F001B, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F001T, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F002(N)B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F002(N)T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29LV040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29C51000B, 64 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29C51000T, 64 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29C51400B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29C51400T, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29LC51000, 64 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29LC51001, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29LC51002, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm29F002T, 256 kB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm29F002B, 256 kB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV010, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV020, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV512, 64 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Sharp LH28F008BJT-BTLZ1, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST28SF040A, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST29EE010, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST29LE010, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST29EE020A, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST29LE020, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39SF512, 64 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39SF010A, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39SF020A, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39SF040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF512, 64 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF010, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF020, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF080, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F002T/NT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F400BB, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for ST M29F400BT, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for ST M29W010B, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29W040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29W512B, 64 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51001B, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51001T, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51002T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51004B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51004T, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {S,V}29C31004B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {S,V}29C31004T, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for TI TMS29F002RB, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for TI TMS29F002RT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W29C010(M)/W29C011A/W29EE011/W29EE012-old, 128 kB: Old Winbond W29* probe method disabled because the probing sequence puts the AMIC A49LF040A in a funky state. Use 'flashrom -c W29C010(M)/W29C011A/W29EE011/W29EE012-old' if you have a board with such a chip. Probing for Winbond W29C010(M)/W29C011A/W29EE011/W29EE012, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W29C020(C)/W29C022, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W29C040/P, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39L040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49F002U/N, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49F020, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content No EEPROM/flash device found. Note: flashrom can never write if the flash chip isn't found automatically. Restoring PCI config space for 03:06:0 reg 0x50 # lspci -n 00:00.0 0600: 1022:9601 00:01.0 0604: 1022:9602 00:0a.0 0604: 1022:9609 00:11.0 0106: 1002:4390 00:12.0 0c03: 1002:4397 00:12.1 0c03: 1002:4398 00:12.2 0c03: 1002:4396 00:13.0 0c03: 1002:4397 00:13.1 0c03: 1002:4398 00:13.2 0c03: 1002:4396 00:14.0 0c05: 1002:4385 (rev 3c) 00:14.1 0101: 1002:439c 00:14.2 0403: 1002:4383 00:14.3 0601: 1002:439d 00:14.4 0604: 1002:4384 00:14.5 0c03: 1002:4399 00:18.0 0600: 1022:1200 00:18.1 0600: 1022:1201 00:18.2 0600: 1022:1202 00:18.3 0600: 1022:1203 00:18.4 0600: 1022:1204 01:05.0 0300: 1002:9710 01:05.1 0403: 1002:970f 02:00.0 0200: 10ec:8168 (rev 03) 03:06.0 0280: 168c:0029 (rev 01) # lspci 00:00.0 Host bridge: Advanced Micro Devices [AMD] RS880 Host Bridge 00:01.0 PCI bridge: Advanced Micro Devices [AMD] RS780/RS880 PCI to PCI bridge (int gfx) 00:0a.0 PCI bridge: Advanced Micro Devices [AMD] RS780/RS880 PCI to PCI bridge (PCIE port 5) 00:11.0 SATA controller: ATI Technologies Inc SB7x0/SB8x0/SB9x0 SATA Controller [IDE mode] 00:12.0 USB Controller: ATI Technologies Inc SB7x0/SB8x0/SB9x0 USB OHCI0 Controller 00:12.1 USB Controller: ATI Technologies Inc SB7x0 USB OHCI1 Controller 00:12.2 USB Controller: ATI Technologies Inc SB7x0/SB8x0/SB9x0 USB EHCI Controller 00:13.0 USB Controller: ATI Technologies Inc SB7x0/SB8x0/SB9x0 USB OHCI0 Controller 00:13.1 USB Controller: ATI Technologies Inc SB7x0 USB OHCI1 Controller 00:13.2 USB Controller: ATI Technologies Inc SB7x0/SB8x0/SB9x0 USB EHCI Controller 00:14.0 SMBus: ATI Technologies Inc SBx00 SMBus Controller (rev 3c) 00:14.1 IDE interface: ATI Technologies Inc SB7x0/SB8x0/SB9x0 IDE Controller 00:14.2 Audio device: ATI Technologies Inc SBx00 Azalia (Intel HDA) 00:14.3 ISA bridge: ATI Technologies Inc SB7x0/SB8x0/SB9x0 LPC host controller 00:14.4 PCI bridge: ATI Technologies Inc SBx00 PCI to PCI Bridge 00:14.5 USB Controller: ATI Technologies Inc SB7x0/SB8x0/SB9x0 USB OHCI2 Controller 00:18.0 Host bridge: Advanced Micro Devices [AMD] Family 10h Processor HyperTransport Configuration 00:18.1 Host bridge: Advanced Micro Devices [AMD] Family 10h Processor Address Map 00:18.2 Host bridge: Advanced Micro Devices [AMD] Family 10h Processor DRAM Controller 00:18.3 Host bridge: Advanced Micro Devices [AMD] Family 10h Processor Miscellaneous Control 00:18.4 Host bridge: Advanced Micro Devices [AMD] Family 10h Processor Link Control 01:05.0 VGA compatible controller: ATI Technologies Inc RS880 [Radeon HD 4200] 01:05.1 Audio device: ATI Technologies Inc RS880 Audio Device [Radeon HD 4200] 02:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168B PCI Express Gigabit Ethernet controller (rev 03) 03:06.0 Network controller: Atheros Communications Inc. AR922X Wireless Network Adapter (rev 01) Denis.

4 18

[PATCH] remove exit call from pcidev_init
by Niklas Söderlund Jan. 5, 2013

Jan. 5, 2013

If the function fails it returns 0. All callers have been made aware of this and are prepared to handle it. Signed-off-by: Niklas Söderlund <niso(a)kth.se> --- atahpt.c | 2 ++ drkaiser.c | 2 ++ gfxnvidia.c | 2 ++ nic3com.c | 2 ++ nicintel.c | 7 +++---- nicintel_spi.c | 2 ++ nicnatsemi.c | 2 ++ nicrealtek.c | 2 ++ ogp_spi.c | 2 ++ pcidev.c | 6 +++--- satamv.c | 5 ++--- satasii.c | 3 ++- 12 files changed, 26 insertions(+), 11 deletions(-) diff --git a/atahpt.c b/atahpt.c index b692b88..4c1b13e 100644 --- a/atahpt.c +++ b/atahpt.c @@ -71,6 +71,8 @@ int atahpt_init(void) return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_4, ata_hpt); + if (!io_base_addr) + return 1; /* Enable flash access. */ reg32 = pci_read_long(pcidev_dev, REG_FLASH_ACCESS); diff --git a/drkaiser.c b/drkaiser.c index d4b6120..ffabf9b 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -71,6 +71,8 @@ int drkaiser_init(void) return 1; addr = pcidev_init(PCI_BASE_ADDRESS_2, drkaiser_pcidev); + if (!addr) + return 1; /* Write magic register to enable flash write. */ rpci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, diff --git a/gfxnvidia.c b/gfxnvidia.c index 457172d..fe2362a 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -95,6 +95,8 @@ int gfxnvidia_init(void) return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, gfx_nvidia); + if (!io_base_addr) + return 1; io_base_addr += 0x300000; msg_pinfo("Detected NVIDIA I/O base address: 0x%x.\n", io_base_addr); diff --git a/nic3com.c b/nic3com.c index 4df720f..27d9506 100644 --- a/nic3com.c +++ b/nic3com.c @@ -91,6 +91,8 @@ int nic3com_init(void) return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_3com); + if (!io_base_addr) + return 1; id = pcidev_dev->device_id; diff --git a/nicintel.c b/nicintel.c index f2d4529..7d6fa94 100644 --- a/nicintel.c +++ b/nicintel.c @@ -77,11 +77,10 @@ int nicintel_init(void) if (get_io_perms()) return 1; - /* No need to check for errors, pcidev_init() will not return in case - * of errors. - * FIXME: BAR2 is not available if the device uses the CardBus function. - */ + /* FIXME: BAR2 is not available if the device uses the CardBus function. */ addr = pcidev_init(PCI_BASE_ADDRESS_2, nics_intel); + if (!addr) + return 1; nicintel_bar = physmap("Intel NIC flash", addr, NICINTEL_MEMMAP_SIZE); if (nicintel_bar == ERROR_PTR) diff --git a/nicintel_spi.c b/nicintel_spi.c index 7eb3af3..af7347b 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -171,6 +171,8 @@ int nicintel_spi_init(void) return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_intel_spi); + if (!io_base_addr) + return 1; nicintel_spibar = physmap("Intel Gigabit NIC w/ SPI flash", io_base_addr, 4096); diff --git a/nicnatsemi.c b/nicnatsemi.c index c39637a..d16984d 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -63,6 +63,8 @@ int nicnatsemi_init(void) return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_natsemi); + if (!io_base_addr) + return 1; if (register_shutdown(nicnatsemi_shutdown, NULL)) return 1; diff --git a/nicrealtek.c b/nicrealtek.c index f808e06..17a3172 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -65,6 +65,8 @@ int nicrealtek_init(void) return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_realtek); + if (!io_base_addr) + return 1; if (register_shutdown(nicrealtek_shutdown, NULL)) return 1; diff --git a/ogp_spi.c b/ogp_spi.c index 8502847..dc62d7d 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -132,6 +132,8 @@ int ogp_spi_init(void) return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, ogp_spi); + if (!io_base_addr) + return 1; ogp_spibar = physmap("OGP registers", io_base_addr, 4096); diff --git a/pcidev.c b/pcidev.c index e8b4dc1..c32027c 100644 --- a/pcidev.c +++ b/pcidev.c @@ -207,7 +207,7 @@ uintptr_t pcidev_init(int bar, const struct pcidev_status *devs) if (pcidev_bdf != NULL) { if ((msg = pci_filter_parse_slot(&filter, pcidev_bdf))) { msg_perr("Error: %s\n", msg); - exit(1); + return 0; } } free(pcidev_bdf); @@ -228,13 +228,13 @@ uintptr_t pcidev_init(int bar, const struct pcidev_status *devs) /* Only continue if exactly one supported PCI dev has been found. */ if (found == 0) { msg_perr("Error: No supported PCI device found.\n"); - exit(1); + return 0; } else if (found > 1) { msg_perr("Error: Multiple supported PCI devices found. " "Use 'flashrom -p xxxx:pci=bb:dd.f' \n" "to explicitly select the card with the given BDF " "(PCI bus, device, function).\n"); - exit(1); + return 0; } return curaddr; diff --git a/satamv.c b/satamv.c index 0b83a14..f23af3b 100644 --- a/satamv.c +++ b/satamv.c @@ -89,10 +89,9 @@ int satamv_init(void) return 1; /* BAR0 has all internal registers memory mapped. */ - /* No need to check for errors, pcidev_init() will not return in case - * of errors. - */ addr = pcidev_init(PCI_BASE_ADDRESS_0, satas_mv); + if (!addr) + return 1; mv_bar = physmap("Marvell 88SX7042 registers", addr, 0x20000); if (mv_bar == ERROR_PTR) diff --git a/satasii.c b/satasii.c index 75378be..ac70129 100644 --- a/satasii.c +++ b/satasii.c @@ -73,7 +73,8 @@ int satasii_init(void) if (get_io_perms()) return 1; - pcidev_init(PCI_BASE_ADDRESS_0, satas_sii); + if (!pcidev_init(PCI_BASE_ADDRESS_0, satas_sii)) + return 1; id = pcidev_dev->device_id; -- 1.7.11.1

2 1

[PATCH] Automatic programmer driver writer
by Carl-Daniel Hailfinger Jan. 3, 2013

Jan. 3, 2013

Run ./build_new_driver.sh and recompile. You have a new driver, and it's linked in at the appropriate places. Patch needs work for anything which is not a bitbang SPI driver. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-programmer_template/build_new_driver.sh =================================================================== --- flashrom-programmer_template/build_new_driver.sh (Revision 0) +++ flashrom-programmer_template/build_new_driver.sh (Revision 0) @@ -0,0 +1,232 @@ +#!/bin/bash +# flashrom programmer driver skeleton builder. +# Copyright 2012 Carl-Daniel Hailfinger +# Licensed under the GNU GPL v2 + +# Fill in all info in the block below, and don't touch anything else. +PROGRAMMERNAME=ezo +PROGRAMMERDESCR="EZo+Willem Programmer" +PROGRAMMERMANUF="EZo and Willem" +PROGRAMMERURL="http://www.$PROGRAMMERNAMEflash.com/" +AUTHORNAME="Carl-Daniel Hailfinger" +# Does the programmer need a map/unmap function? +HAVE_MAP=no +# Does the programmer have its own delay function? +HAVE_DELAY=no +# Does the programmer need some sort of direct hardware access? +NEED_PCI=yes +# Does the programmer need some sort of serial port access? +NEED_SERIAL=no +# Does the programmer use Parallel/LPC/FWH functionality? +NEED_PARLPCFWH=no +# Does the programmer use the bitbanging SPI infrastructure? +NEED_BITBANG_SPI=yes + +# No user serviceable parts below. +if test $HAVE_MAP = yes; then MAPNAME=$PROGRAMMERNAME; else MAPNAME=fallback; fi +if test $HAVE_DELAY = yes; then DELAYNAME=$PROGRAMMERNAME; else DELAYNAME=internal; fi +PROGRAMMERNAMECAPS=$(echo -n $PROGRAMMERNAME|tr "[[:lower:]]" "[[:upper:]]") +CONFIGNAME=CONFIG_$PROGRAMMERNAMECAPS +ENUMNAME=PROGRAMMER_$PROGRAMMERNAMECAPS +BITBANG_SPI_ENUMNAME=BITBANG_SPI_MASTER_$PROGRAMMERNAMECAPS +if test $NEED_PCI = yes; then NEEDS="NEED_PCI := yes\n"; fi +if test $NEED_SERIAL = yes; then NEEDS+="NEED_SERIAL := yes\n"; fi + +sed "s-^//PLACEHOLDER_NEWPROG_PROGRAMMER_ARRAY-\ +#if $CONFIGNAME == 1\n\ + {\n\ + .name = \"${PROGRAMMERNAME}\",\n\ + .init = ${PROGRAMMERNAME}_init,\n\ + .map_flash_region = ${MAPNAME}_map,\n\ + .unmap_flash_region = ${MAPNAME}_unmap,\n\ + .delay = ${DELAYNAME}_delay,\n\ + },\n\ +#endif\n\ +\n\0-" flashrom.c >flashrom.c.mine + +sed -e "s/^#PLACEHOLDER_NEWPROG_DEFAULTCONFIG/\ +# Enable $PROGRAMMERDESCR for now.\n\ +$CONFIGNAME ?= yes\n\ +\n\0/" \ +-e "s/^#PLACEHOLDER_NEWPROG_COMPILERULE/\ +ifeq (\$($CONFIGNAME), yes)\n\ +FEATURE_CFLAGS += -D'$CONFIGNAME=1'\n\ +PROGRAMMER_OBJS += $PROGRAMMERNAME.o\n\ +${NEEDS}\ +endif\n\ +\n\0/" Makefile >Makefile.mine1 + +if test $NEED_BITBANG_SPI = yes; then +sed -e "s/^#PLACEHOLDER_NEWPROG_BITBANGSPICONFIG1/\ +ifeq (\$($CONFIGNAME), yes)\n\ +override CONFIG_BITBANG_SPI = yes\n\ +else\n\ +\0/" \ +-e "s/^#PLACEHOLDER_NEWPROG_BITBANGSPICONFIG2/\ +\0\n\ +endif/;" Makefile.mine1 >Makefile.mine +rm Makefile.mine1 +else +mv Makefile.mine1 Makefile.mine +fi + +sed -e "s-^//PLACEHOLDER_NEWPROG_PROGRAMMER_ENUM-\ +#if $CONFIGNAME == 1\n\ + $ENUMNAME,\n\ +#endif\n\ +\0-" \ +-e "s-//PLACEHOLDER_NEWPROG_PUBLICFUNCTIONS-\ +/* $PROGRAMMERNAME.c */\n\ +#if $CONFIGNAME == 1\n\ +int ${PROGRAMMERNAME}_init(void);\n\ +#endif\n\ +\n\0-" programmer.h >programmer.h.mine1 + +if test $NEED_BITBANG_SPI = yes; then +sed -e "s-^//PLACEHOLDER_NEWPROG_PROGRAMMER_BITBANG_ENUM-\ +#if $CONFIGNAME == 1\n\ + $BITBANG_SPI_ENUMNAME,\n\ +#endif\n\ +\0-" \ +-e "s-//PLACEHOLDER_NEWPROG_SELECT_SPI_BITBANG\$-\ +|| $CONFIGNAME == 1 \0-" programmer.h.mine1 >programmer.h.mine +rm programmer.h.mine1 +else +mv programmer.h.mine1 programmer.h.mine +fi + +sed -e "s-PLACEHOLDER_NEWPROG_CHECK_PROGRAMMERCOUNT-\ +$CONFIGNAME+\0-" \ +-e "s-^//PLACEHOLDER_NEWPROG_PROGRAMMER_ENUMDEFAULT-\ +#if $CONFIGNAME == 1\n\ + $ENUMNAME\n\ +#endif\n\ +\0-" cli_classic.c >cli_classic.c.mine + +cat >$PROGRAMMERNAME.c <<EOF +/* + * This file is part of the flashrom project. + * + * Copyright (C) $(date +%Y) $AUTHORNAME + * + * 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 + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* Driver for the $PROGRAMMERDESCR hardware by $PROGRAMMERMANUF. + * See $PROGRAMMERURL for more info. + */ + +#include "flash.h" +#include "programmer.h" + +EOF + +if test $NEED_PARLPCFWH = yes; then +cat >>$PROGRAMMERNAME.c <<EOF +static const struct par_programmer par_programmer_${PROGRAMMERNAME} = { + .chip_readb = ${PROGRAMMERNAME}_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = ${PROGRAMMERNAME}_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, +}; + +EOF +fi + +if test $NEED_BITBANG_SPI = yes; then +cat >>$PROGRAMMERNAME.c <<EOF +static void ${PROGRAMMERNAME}_bitbang_set_cs(int val) +{ + /* Set/clear the CS# line. */ +} + +static void ${PROGRAMMERNAME}_bitbang_set_sck(int val) +{ + /* Set/clear the SCLK line. */ +} + +static void ${PROGRAMMERNAME}_bitbang_set_mosi(int val) +{ + /* Set/clear the MOSI line. */ +} + +static int ${PROGRAMMERNAME}_bitbang_get_miso(void) +{ + /* Get the state of the MISO line and return it. */ + /* Set it to 1 to get the template to compile. */ + int misoval = 0; + + return misoval; +} + +static void ${PROGRAMMERNAME}_request_spibus(void) +{ +} + +static void ${PROGRAMMERNAME}_release_spibus(void) +{ +} + +static const struct bitbang_spi_master bitbang_spi_master_$PROGRAMMERNAME = { + .type = $BITBANG_SPI_ENUMNAME, + .set_cs = ${PROGRAMMERNAME}_bitbang_set_cs, + .set_sck = ${PROGRAMMERNAME}_bitbang_set_sck, + .set_mosi = ${PROGRAMMERNAME}_bitbang_set_mosi, + .get_miso = ${PROGRAMMERNAME}_bitbang_get_miso, + .request_bus = ${PROGRAMMERNAME}_request_spibus, + .release_bus = ${PROGRAMMERNAME}_release_spibus, + .half_period = 1, +}; + +EOF +fi + +cat >>$PROGRAMMERNAME.c <<EOF +static int ${PROGRAMMERNAME}_shutdown(void *data) +{ + /* Shutdown stuff. */ + return 0; +} + +int ${PROGRAMMERNAME}_init(void) +{ + /* Init stuff (i.e. parameter parsing) here which does not need to be + * undone. + */ + + /* If your shutdown function takes a parameter, replace NULL with it. */ + register_shutdown(${PROGRAMMERNAME}_shutdown, NULL); + + /* Init stuff which needs to be undone on shutdown. */ + +EOF + +if test $NEED_BITBANG_SPI = yes; then +cat >>$PROGRAMMERNAME.c <<EOF + /* 1 usec halfperiod delay, change as needed. */ + if (bitbang_spi_init(&bitbang_spi_master_${PROGRAMMERNAME})) + return 1; + +EOF +fi + +cat >>$PROGRAMMERNAME.c <<EOF + return 0; +} +EOF + EigenschaftsÃ¤nderungen: flashrom-programmer_template/build_new_driver.sh ___________________________________________________________________ HinzugefÃ¼gt: svn:executable + * Index: flashrom-programmer_template/Makefile =================================================================== --- flashrom-programmer_template/Makefile (Revision 1539) +++ flashrom-programmer_template/Makefile (Arbeitskopie) @@ -344,6 +344,8 @@ # Enable Linux spidev interface by default. We disable it on non-Linux targets. CONFIG_LINUX_SPI ?= yes +#PLACEHOLDER_NEWPROG_DEFAULTCONFIG + # Disable wiki printing by default. It is only useful if you have wiki access. CONFIG_PRINT_WIKI ?= no @@ -363,7 +365,9 @@ ifeq ($(CONFIG_OGP_SPI), yes) override CONFIG_BITBANG_SPI = yes else +#PLACEHOLDER_NEWPROG_BITBANGSPICONFIG1 CONFIG_BITBANG_SPI ?= no +#PLACEHOLDER_NEWPROG_BITBANGSPICONFIG2 endif endif endif @@ -503,6 +507,8 @@ PROGRAMMER_OBJS += linux_spi.o endif +#PLACEHOLDER_NEWPROG_COMPILERULE + ifeq ($(NEED_SERIAL), yes) LIB_OBJS += serial.o endif Index: flashrom-programmer_template/cli_classic.c =================================================================== --- flashrom-programmer_template/cli_classic.c (Revision 1539) +++ flashrom-programmer_template/cli_classic.c (Arbeitskopie) @@ -41,7 +41,7 @@ * if more than one of them is selected. If only one is selected, it is clear * that the user wants that one to become the default. */ -#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_FT2232_SPI+CONFIG_SERPROG+CONFIG_BUSPIRATE_SPI+CONFIG_DEDIPROG+CONFIG_RAYER_SPI+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV > 1 +#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_FT2232_SPI+CONFIG_SERPROG+CONFIG_BUSPIRATE_SPI+CONFIG_DEDIPROG+CONFIG_RAYER_SPI+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV+PLACEHOLDER_NEWPROG_CHECK_PROGRAMMERCOUNT > 1 #error Please enable either CONFIG_DUMMY or CONFIG_INTERNAL or disable support for all programmers except one. #endif static enum programmer default_programmer = @@ -96,6 +96,7 @@ #if CONFIG_LINUX_SPI == 1 PROGRAMMER_LINUX_SPI #endif +//PLACEHOLDER_NEWPROG_PROGRAMMER_ENUMDEFAULT ; #endif Index: flashrom-programmer_template/flashrom.c =================================================================== --- flashrom-programmer_template/flashrom.c (Revision 1539) +++ flashrom-programmer_template/flashrom.c (Arbeitskopie) @@ -261,6 +261,7 @@ }, #endif +//PLACEHOLDER_NEWPROG_PROGRAMMER_ARRAY {}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; Index: flashrom-programmer_template/programmer.h =================================================================== --- flashrom-programmer_template/programmer.h (Revision 1539) +++ flashrom-programmer_template/programmer.h (Arbeitskopie) @@ -87,6 +87,7 @@ #if CONFIG_LINUX_SPI == 1 PROGRAMMER_LINUX_SPI, #endif +//PLACEHOLDER_NEWPROG_PROGRAMMER_ENUM PROGRAMMER_INVALID /* This must always be the last entry. */ }; @@ -127,6 +128,7 @@ #if CONFIG_OGP_SPI == 1 BITBANG_SPI_MASTER_OGP, #endif +//PLACEHOLDER_NEWPROG_PROGRAMMER_BITBANG_ENUM }; struct bitbang_spi_master { @@ -461,6 +463,8 @@ int dediprog_init(void); #endif +//PLACEHOLDER_NEWPROG_PUBLICFUNCTIONS + /* flashrom.c */ struct decode_sizes { uint32_t parallel; @@ -505,7 +509,7 @@ #if CONFIG_DEDIPROG == 1 SPI_CONTROLLER_DEDIPROG, #endif -#if CONFIG_OGP_SPI == 1 || CONFIG_NICINTEL_SPI == 1 || CONFIG_RAYER_SPI == 1 || CONFIG_PONY_SPI == 1 || (CONFIG_INTERNAL == 1 && (defined(__i386__) || defined(__x86_64__))) +#if CONFIG_OGP_SPI == 1 || CONFIG_NICINTEL_SPI == 1 || CONFIG_RAYER_SPI == 1 || CONFIG_PONY_SPI == 1 || (CONFIG_INTERNAL == 1 && (defined(__i386__) || defined(__x86_64__))) //PLACEHOLDER_NEWPROG_SELECT_SPI_BITBANG SPI_CONTROLLER_BITBANG, #endif #if CONFIG_LINUX_SPI == 1 -- http://www.hailfinger.org/

2 6

Re: [flashrom] [PATCH] automatically round address ranges requested from physmap_common to page boundaries
by Stefan Tauner Dec. 31, 2012

Dec. 31, 2012

On Mon, 30 May 2011 02:45:44 +0200 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > this patch also changes the display width of all addresses in physmap.c to 16 hex characters. > > FIXME: what about unmappings? > munmap is safe. > djgpp's __dpmi_free_physical_address_mapping: unknown. > DirectHW's unmap_physical: unknown. > > FIXME: jakllsch suggested using PRIx64 instead of x, because it's more portable FIXME: in the case we can not map and 'mayfail' is true we should return ERROR_PTR instead of ERROR_PTR + diff -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 1

Re: [flashrom] [7/7, RFC] Unify usbdev_status and pcidev_status into dev_status.
by Kyösti Mälkki Dec. 26, 2012

Dec. 26, 2012

Mostly looked good to me, I did not rebase or compile. Find a few comments inlined below. Kyösti On Sat, 2012-03-03 at 19:11 +0000, Stefan Tauner wrote: > diff --git a/programmer.h b/programmer.h > index 9f90fe5..b52727e 100644 > --- a/programmer.h > +++ b/programmer.h > @@ -93,15 +93,22 @@ enum programmer_type { > OTHER, > }; > > +struct dev_status { > + uint16_t vendor_id; > + uint16_t device_id; > + const enum test_state status; > + const char *vendor_name; > + const char *device_name; > +}; I find the name "dev_status" odd, these are the arrays for listing and probing the VID/DID too, and the "status" is just documentation. > struct programmer_entry { > const char *vendor; > const char *name; > enum programmer_type type; > union { > - const struct pcidev_status *const pci; > - const struct usbdev_status *const usb; > + const struct dev_status *const status; > const char * const note; > - } devices; > + } devs; I don't know why the "devices->devs" rename is here. Maybe add comment that "type" is the selector for the union. It might be confused for some internal/nic/sata enumeration. > /* print.c */ > #if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 > -void print_supported_pcidevs(const struct pcidev_status *devs); > +void print_supported_devs(const struct dev_status *devs); > #endif That #if does not look nice.

2 2

Re: [flashrom] [PATCH 3/3] [RFC] Unify usbdev_status and pcidev_status into dev_status.
by Carl-Daniel Hailfinger Dec. 12, 2012

Dec. 12, 2012

Am 17.11.2012 20:09 schrieb Stefan Tauner: > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Is there a reason you introduce a .devices struct member inside struct programmer_entry in patch 1 just to rename it to .dev in patch 3? Regards, Carl-Daniel > diff --git a/flashrom.c b/flashrom.c > index d873276..ae8f70c 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -65,7 +65,7 @@ const struct programmer_entry programmer_table[] = { > { > .name = "internal", > .type = OTHER, > - .devices.note = NULL, > + .devs.note = NULL, > .init = internal_init, > .map_flash_region = physmap, > .unmap_flash_region = physunmap, > @@ -78,7 +78,7 @@ const struct programmer_entry programmer_table[] = { > .name = "dummy", > .type = OTHER, > /* FIXME */ > - .devices.note = "Dummy device, does nothing and logs all accesses\n", > + .devs.note = "Dummy device, does nothing and logs all accesses\n", > .init = dummy_init, > .map_flash_region = dummy_map, > .unmap_flash_region = dummy_unmap, > @@ -90,7 +90,7 @@ const struct programmer_entry programmer_table[] = { > { > .name = "nic3com", > .type = PCI, > - .devices.pci = nics_3com, > + .devs.status = nics_3com, > .init = nic3com_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -103,7 +103,7 @@ const struct programmer_entry programmer_table[] = { > /* This programmer works for Realtek RTL8139 and SMC 1211. */ > .name = "nicrealtek", > .type = PCI, > - .devices.pci = nics_realtek, > + .devs.status = nics_realtek, > .init = nicrealtek_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -115,7 +115,7 @@ const struct programmer_entry programmer_table[] = { > { > .name = "nicnatsemi", > .type = PCI, > - .devices.pci = nics_natsemi, > + .devs.status = nics_natsemi, > .init = nicnatsemi_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -127,7 +127,7 @@ const struct programmer_entry programmer_table[] = { > { > .name = "gfxnvidia", > .type = PCI, > - .devices.pci = gfx_nvidia, > + .devs.status = gfx_nvidia, > .init = gfxnvidia_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -139,7 +139,7 @@ const struct programmer_entry programmer_table[] = { > { > .name = "drkaiser", > .type = PCI, > - .devices.pci = drkaiser_pcidev, > + .devs.status = drkaiser_pcidev, > .init = drkaiser_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -151,7 +151,7 @@ const struct programmer_entry programmer_table[] = { > { > .name = "satasii", > .type = PCI, > - .devices.pci = satas_sii, > + .devs.status = satas_sii, > .init = satasii_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -163,7 +163,7 @@ const struct programmer_entry programmer_table[] = { > { > .name = "atahpt", > .type = PCI, > - .devices.pci = ata_hpt, > + .devs.status = ata_hpt, > .init = atahpt_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -175,7 +175,7 @@ const struct programmer_entry programmer_table[] = { > { > .name = "ft2232_spi", > .type = USB, > - .devices.usb = devs_ft2232spi, > + .devs.status = devs_ft2232spi, > .init = ft2232_spi_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -188,7 +188,7 @@ const struct programmer_entry programmer_table[] = { > .name = "serprog", > .type = OTHER, > /* FIXME */ > - .devices.note = "All programmer devices speaking the serprog protocol\n", > + .devs.note = "All programmer devices speaking the serprog protocol\n", > .init = serprog_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -201,7 +201,7 @@ const struct programmer_entry programmer_table[] = { > .name = "buspirate_spi", > .type = OTHER, > /* FIXME */ > - .devices.note = "Dangerous Prototypes Bus Pirate\n", > + .devs.note = "Dangerous Prototypes Bus Pirate\n", > .init = buspirate_spi_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -214,7 +214,7 @@ const struct programmer_entry programmer_table[] = { > .name = "dediprog", > .type = OTHER, > /* FIXME */ > - .devices.note = "Dediprog SF100\n", > + .devs.note = "Dediprog SF100\n", > .init = dediprog_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -227,7 +227,7 @@ const struct programmer_entry programmer_table[] = { > .name = "rayer_spi", > .type = OTHER, > /* FIXME */ > - .devices.note = "RayeR parallel port programmer\n", > + .devs.note = "RayeR parallel port programmer\n", > .init = rayer_spi_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -240,7 +240,7 @@ const struct programmer_entry programmer_table[] = { > .name = "pony_spi", > .type = OTHER, > /* FIXME */ > - .devices.note = "Programmers compatible with SI-Prog, serbang or AJAWe\n", > + .devs.note = "Programmers compatible with SI-Prog, serbang or AJAWe\n", > .init = pony_spi_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -252,7 +252,7 @@ const struct programmer_entry programmer_table[] = { > { > .name = "nicintel", > .type = PCI, > - .devices.pci = nics_intel, > + .devs.status = nics_intel, > .init = nicintel_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -264,7 +264,7 @@ const struct programmer_entry programmer_table[] = { > { > .name = "nicintel_spi", > .type = PCI, > - .devices.pci = nics_intel_spi, > + .devs.status = nics_intel_spi, > .init = nicintel_spi_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -276,7 +276,7 @@ const struct programmer_entry programmer_table[] = { > { > .name = "ogp_spi", > .type = PCI, > - .devices.pci = ogp_spi, > + .devs.status = ogp_spi, > .init = ogp_spi_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -288,7 +288,7 @@ const struct programmer_entry programmer_table[] = { > { > .name = "satamv", > .type = PCI, > - .devices.pci = satas_mv, > + .devs.status = satas_mv, > .init = satamv_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -300,7 +300,7 @@ const struct programmer_entry programmer_table[] = { > { > .name = "linux_spi", > .type = OTHER, > - .devices.note = "Device files /dev/spidev*.*\n", > + .devs.note = "Device files /dev/spidev*.*\n", > .init = linux_spi_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > diff --git a/programmer.h b/programmer.h > index 21fa707..90033a9 100644 > --- a/programmer.h > +++ b/programmer.h > @@ -96,15 +96,22 @@ enum programmer_type { > struct programmer_entry { > const char *vendor; > const char *name; > const enum programmer_type type; > union { > const struct pcidev_status *const pci; > const struct usbdev_status *const usb; > const char *const note; > - } devices; > + } devs; > > int (*init) (void); > -- http://www.hailfinger.org/

2 3

Re: [flashrom] [PATCH 1/3] Refactor PCI and USB device status printing.
by Carl-Daniel Hailfinger Dec. 12, 2012

Dec. 12, 2012

Am 17.11.2012 20:09 schrieb Stefan Tauner: > To be able to get rid of lots of #ifdefs and centralize programmer-specific > data more... > - introduce two new fields to struct programmer_entry, namely > enum type (OTHER, USB, PCI) and union devices (pcidev_status, usbdev_status > or char *note). > - use those fields to generate device listings in print.c and print_wiki.c. > > Bonus: add printing of USB devices to print_wiki.c and count supported PCI > and USB devices. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Good idea. I have a few comments, otherwise it looks OK. Note: I have not checked the wiki output, I only reviewed the code. I trust you have checked the wiki output for changes. > --- > flashrom.c | 48 ++++++++++++++++++- > ft2232_spi.c | 13 ------ > pcidev.c | 13 ------ > print.c | 148 +++++++++++++++++++--------------------------------------- > print_wiki.c | 141 ++++++++++++++++++++++++++++++++++--------------------- > programmer.h | 41 ++++++++++------ > 6 files changed, 211 insertions(+), 193 deletions(-) > > diff --git a/flashrom.c b/flashrom.c > index 2299b06..d873276 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -64,6 +64,8 @@ const struct programmer_entry programmer_table[] = { > #if CONFIG_INTERNAL == 1 > { > .name = "internal", > + .type = OTHER, > + .devices.note = NULL, > .init = internal_init, > .map_flash_region = physmap, > .unmap_flash_region = physunmap, > @@ -84,6 +89,8 @@ const struct programmer_entry programmer_table[] = { > #if CONFIG_NIC3COM == 1 > { > .name = "nic3com", > + .type = PCI, > + .devices.pci = nics_3com, If we reference the device list here, can we kill the code in each programmer which mentions the device list explicitly and use pgm->devices->pci there? Otherwise there's a good chance someone will forget one or the other reference and wonder why --list and actual recognized programmer devices differ. > .init = nic3com_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > @@ -185,6 +212,9 @@ const struct programmer_entry programmer_table[] = { > #if CONFIG_DEDIPROG == 1 > { > .name = "dediprog", > + .type = OTHER, Regression. The old code lists all devices. > + /* FIXME */ > + .devices.note = "Dediprog SF100\n", > .init = dediprog_init, > .map_flash_region = fallback_map, > .unmap_flash_region = fallback_unmap, > diff --git a/print.c b/print.c > index d7bdbfe..4b23ca0 100644 > --- a/print.c > +++ b/print.c > @@ -433,8 +433,32 @@ static void print_supported_boards_helper(const struct board_info *boards, > } > #endif > For consistency, we should introduce NEED_USB here. That would need Makefile glue, but I think it's worth it, especially now that there are Dediprog patches which change the libusb-0 dependency to a libusb-1 dependency. > +void print_supported_usbdevs(const struct usbdev_status *devs) > +{ > + int i; > + > + msg_pinfo("USB devices:\n"); > + for (i = 0; devs[i].vendor_name != NULL; i++) { > + msg_pinfo("%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) ? " (untested)" : ""); > + } > +} > + > +#if NEED_PCI == 1 > +void print_supported_pcidevs(const struct pcidev_status *devs) > +{ > + int i; > + > + for (i = 0; devs[i].vendor_name != NULL; i++) { > + msg_pinfo("%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) ? " (untested)" : ""); > + } > +} > +#endif > + > int print_supported(void) > { > + unsigned int i; > if (print_supported_chips()) > return 1; > > @@ -449,107 +473,31 @@ int print_supported(void) > msg_ginfo("\n"); > print_supported_boards_helper(laptops_known, "laptops"); > #endif > -#if CONFIG_DUMMY == 1 > - msg_ginfo("\nSupported devices for the %s programmer:\n", > - programmer_table[PROGRAMMER_DUMMY].name); > - /* FIXME */ > - msg_ginfo("Dummy device, does nothing and logs all accesses\n"); > -#endif > [...] > -#if CONFIG_LINUX_SPI == 1 > - msg_ginfo("\nSupported devices for the %s programmer:\n", > - programmer_table[PROGRAMMER_LINUX_SPI].name); > - msg_ginfo("Device files /dev/spidev*.*\n"); > + for (i = 0; i < PROGRAMMER_INVALID; i++) { > + const struct programmer_entry prog = programmer_table[i]; > + switch (prog.type) { NEED_USB again. > + case USB: > + msg_ginfo("\nSupported USB devices for the %s programmer:\n", prog.name); > + print_supported_usbdevs(prog.devices.usb); > + break; > +#if NEED_PCI == 1 > + case PCI: > + msg_ginfo("\nSupported PCI devices for the %s programmer:\n", prog.name); > + print_supported_pcidevs(prog.devices.pci); > + break; > #endif > + case OTHER: > + if (prog.devices.note == NULL) > + break; Interesting logic. I'm not saying it is wrong, but it's not immediately obvious that .note=NULL means the programmer won't be listed at all. I fear this might be forgotten by future programmer driver authors, but then again I should update my programmer code generation script and push it to svn so this won't be a problem in the future. > + msg_ginfo("\nSupported devices for the %s programmer:\n", prog.name); > + msg_ginfo("%s", prog.devices.note); > + break; > + default: > + msg_gerr("\n%s: %s: Uninitialized programmer type! Please report a bug at " > + "flashrom(a)flashrom.org\n", __func__, prog.name); > + break; > + } > + } > return 0; > } > > diff --git a/print_wiki.c b/print_wiki.c > index 617053c..17e2e85 100644 > --- a/print_wiki.c > +++ b/print_wiki.c > @@ -302,9 +298,18 @@ static void print_supported_chips_wiki(int cols) > printf("|}\n\n"); > } > > -/* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */ > -#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 > -static void print_supported_pcidevs_wiki(const struct pcidev_status *devs) > +/* Following functions are not needed when no PCI/USB programmers are compiled in, > + * but since print_wiki code has no size constraints we include it unconditionally. */ Heh. > +static int count_supported_pcidevs_wiki(const struct pcidev_status *devs) > +{ > + unsigned int count = 0; > + unsigned int i = 0; > + for (i = 0; devs[i].vendor_name != NULL; i++) AFAICS this should segfault in case a driver has prog.type=PCI and prog.devices.pci==NULL. Not a problem, but maybe we should catch this case (as well as the USB case) in a selftest function during startup? That would also help during programmer development. > + count++; > + return count; > +} > + > +static void print_supported_pcidevs_wiki_helper(const struct pcidev_status *devs) > { > int i = 0; > static int c = 0; > @@ -313,14 +318,81 @@ static void print_supported_pcidevs_wiki(const struct pcidev_status *devs) > c = !c; > > for (i = 0; devs[i].vendor_name != NULL; i++) { > - printf("|- bgcolor=\"#%s\"\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, > + printf("|- bgcolor=\"#%s\"\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 == NT) ? "?3" : "OK"); > } > } > -#endif > + > +static int count_supported_usbdevs_wiki(const struct usbdev_status *devs) > +{ > + unsigned int count = 0; > + unsigned int i = 0; > + for (i = 0; devs[i].vendor_name != NULL; i++) > + count++; > + return count; > +} > + > +static void print_supported_usbdevs_wiki_helper(const struct usbdev_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\"\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 == NT) ? "?3" : "OK"); > + } > +} > + > +static void print_supported_devs_wiki() > +{ > + unsigned int pci_count = 0; > + unsigned int usb_count = 0; > + unsigned int i; > + > + for (i = 0; i < PROGRAMMER_INVALID; i++) { > + const struct programmer_entry prog = programmer_table[i]; > + switch (prog.type) { > + case USB: > + usb_count += count_supported_usbdevs_wiki(prog.devices.usb); > + break; > + case PCI: > + pci_count += count_supported_pcidevs_wiki(prog.devices.pci); > + break; > + case OTHER: > + default: > + break; > + } > + } > + > + printf("\n== PCI Devices ==\n\n" > + "Total amount of supported PCI devices flashrom can use as a programmer: '''%d'''\n\n" > + "{%s%s", pci_count, th_start, programmer_th); > + > + for (i = 0; i < PROGRAMMER_INVALID; i++) { > + const struct programmer_entry prog = programmer_table[i]; > + if (prog.type == PCI) { > + print_supported_pcidevs_wiki_helper(prog.devices.pci); > + } > + } > + printf("\n|}\n\n|}\n"); > + > + printf("\n== USB Devices ==\n\n" > + "Total amount of supported USB devices flashrom can use as a programmer: '''%d'''\n\n" > + "{%s%s", usb_count, th_start, programmer_th); > + > + for (i = 0; i < PROGRAMMER_INVALID; i++) { > + const struct programmer_entry prog = programmer_table[i]; > + if (prog.type == USB) { > + print_supported_usbdevs_wiki_helper(prog.devices.usb); > + } > + } > + printf("\n|}\n\n|}\n"); > +} > > void print_supported_wiki(void) > { > @@ -332,41 +404,6 @@ void print_supported_wiki(void) > print_supported_chipsets_wiki(3); > print_supported_boards_wiki(); > #endif > - printf("%s%s%s", programmer_intro, th_start, programmer_th); > - > -#if CONFIG_NIC3COM == 1 > - print_supported_pcidevs_wiki(nics_3com); > -#endif > -#if CONFIG_NICREALTEK == 1 > - print_supported_pcidevs_wiki(nics_realtek); > -#endif > -#if CONFIG_NICNATSEMI == 1 > - print_supported_pcidevs_wiki(nics_natsemi); > -#endif > -#if CONFIG_GFXNVIDIA == 1 > - print_supported_pcidevs_wiki(gfx_nvidia); > -#endif > -#if CONFIG_DRKAISER == 1 > - print_supported_pcidevs_wiki(drkaiser_pcidev); > -#endif > -#if CONFIG_SATASII == 1 > - print_supported_pcidevs_wiki(satas_sii); > -#endif > -#if CONFIG_ATAHPT == 1 > - print_supported_pcidevs_wiki(ata_hpt); > -#endif > -#if CONFIG_NICINTEL == 1 > - print_supported_pcidevs_wiki(nics_intel); > -#endif > -#if CONFIG_NICINTEL_SPI == 1 > - print_supported_pcidevs_wiki(nics_intel_spi); > -#endif > -#if CONFIG_OGP_SPI == 1 > - print_supported_pcidevs_wiki(ogp_spi); > -#endif > -#if CONFIG_SATAMV == 1 > - print_supported_pcidevs_wiki(satas_mv); > -#endif > - printf("\n|}\n\n|}\n"); > + print_supported_devs_wiki(); > } > > diff --git a/programmer.h b/programmer.h > index dedec67..21fa707 100644 > --- a/programmer.h > +++ b/programmer.h > @@ -90,9 +90,21 @@ enum programmer { > PROGRAMMER_INVALID /* This must always be the last entry. */ > }; > > +enum programmer_type { > + PCI = 1, /* to detect uninitialized values */ > + USB, > + OTHER, > +}; > + > struct programmer_entry { > const char *vendor; > const char *name; > + const enum programmer_type type; > + union { > + const struct pcidev_status *const pci; > + const struct usbdev_status *const usb; > + const char *const note; Neat! > + } devices; > > int (*init) (void); > > @@ -221,13 +233,6 @@ void internal_delay(int usecs); > extern uint32_t io_base_addr; > extern struct pci_access *pacc; > extern struct pci_dev *pcidev_dev; > -struct pcidev_status { > - uint16_t vendor_id; > - uint16_t device_id; > - const enum test_state status; > - const char *vendor_name; > - const char *device_name; > -}; > uintptr_t pcidev_readbar(struct pci_dev *dev, int bar); > uintptr_t pcidev_init(int bar, const struct pcidev_status *devs); > /* rpci_write_* are reversible writes. The original PCI config space register > @@ -244,6 +249,21 @@ int rpci_write_long(struct pci_dev *dev, int reg, uint32_t data); > void print_supported_pcidevs(const struct pcidev_status *devs); > #endif > > +struct usbdev_status { > + uint16_t vendor_id; > + uint16_t device_id; > + const enum test_state status; > + const char *vendor_name; > + const char *device_name; > +}; > +struct pcidev_status { > + uint16_t vendor_id; > + uint16_t device_id; > + const enum test_state status; > + const char *vendor_name; > + const char *device_name; > +}; Hm. You moved the struct pcidev_status and usbdev_status outside the #ifdef protecting it. Given that this has no impact on code generation, I don't have a big problem with it. This is a question we should eventually decide: Do we want unused struct declarations inside #ifdef or not? Such a decision should not hold up merging this code, I just wanted to mention it. > + > #if CONFIG_INTERNAL == 1 > /* board_enable.c */ > int board_parse_parameter(const char *boardstring, const char **vendor, const char **model); > @@ -422,13 +442,6 @@ extern const struct pcidev_status ata_hpt[]; > > /* ft2232_spi.c */ > #if CONFIG_FT2232_SPI == 1 > -struct usbdev_status { > - uint16_t vendor_id; > - uint16_t device_id; > - const enum test_state status; > - const char *vendor_name; > - const char *device_name; > -}; > int ft2232_spi_init(void); > extern const struct usbdev_status devs_ft2232spi[]; > void print_supported_usbdevs(const struct usbdev_status *devs); Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

Need help with failed flash. part 2.1
by Simon Riget Dec. 1, 2012

Dec. 1, 2012

Biso was flashed with backup and are hopefully restored. flashrom -p internal -V: http://paste.flashrom.org/view.php?id=1442 lspci -nnvvvxxx: http://paste.flashrom.org/view.php?id=1443 superiotool -deV : http://paste.flashrom.org/view.php?id=1444 flashrom -p internal -r readout.rom: http://paste.flashrom.org/view.php?id=1445 Best regards Simon Riget

4 10

GA-MA785GT-UD3H (rev. 1.0)
by Андрей Булаев Dec. 1, 2012

Dec. 1, 2012

GA-MA785GT-UD3H (rev. 1.0) ? http://www.gigabyte.com/products/product-page.aspx?pid=3154#ov

3 2