flashrom September 2012

flashrom@flashrom.org

32 participants
137 discussions

[commit] r1609 - trunk
by repository service 26 Sep '12

26 Sep '12

Author: stefanct Date: Wed Sep 26 02:47:09 2012 New Revision: 1609 URL: http://flashrom.org/trac/flashrom/changeset/1609 Log: Add support for FT232H. For older versions of libftdi we define TYPE_232H ourselves and this seems to be enough to get at least basic support (and we don't need more than that AFAICT). Signed-off-by: Ilya A. Volynets-Evenbakh <ilya(a)total-knowledge.com> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/Makefile trunk/flashrom.8 trunk/ft2232_spi.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed Sep 26 02:46:02 2012 (r1608) +++ trunk/Makefile Wed Sep 26 02:47:09 2012 (r1609) @@ -477,6 +477,7 @@ FTDILIBS := $(shell pkg-config --libs libftdi 2>/dev/null || printf "%s" "-lftdi -lusb") # This is a totally ugly hack. FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'CONFIG_FT2232_SPI=1'") +FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FT232H := yes" .features && printf "%s" "-D'HAVE_FT232H=1'") FEATURE_LIBS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "$(FTDILIBS)") PROGRAMMER_OBJS += ft2232_spi.o endif @@ -731,6 +732,12 @@ endef export FTDI_TEST +define FTDI_232H_TEST +#include <ftdi.h> +enum ftdi_chip_type type = TYPE_232H; +endef +export FTDI_232H_TEST + define UTSNAME_TEST #include <sys/utsname.h> struct utsname osinfo; @@ -765,6 +772,11 @@ @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) $(FTDILIBS) $(LIBS) >/dev/null 2>&1 && \ ( echo "found."; echo "FTDISUPPORT := yes" >> .features.tmp ) || \ ( echo "not found."; echo "FTDISUPPORT := no" >> .features.tmp ) + @printf "Checking for FT232H support in libftdi... " + @echo "$$FTDI_232H_TEST" >> .featuretest.c + @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) $(FTDILIBS) $(LIBS) >/dev/null 2>&1 && \ + ( echo "found."; echo "FT232H := yes" >> .features.tmp ) || \ + ( echo "not found."; echo "FT232H := no" >> .features.tmp ) endif ifeq ($(CONFIG_LINUX_SPI), yes) @printf "Checking if Linux SPI headers are present... " Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Wed Sep 26 02:46:02 2012 (r1608) +++ trunk/flashrom.8 Wed Sep 26 02:47:09 2012 (r1609) @@ -15,7 +15,7 @@ using a supported mainboard. However, it also supports various external PCI/USB/parallel-port/serial-port based devices which can program flash chips, including some network cards (NICs), SATA/IDE controller cards, graphics cards, -the Bus Pirate device, various FTDI FT2232/FT4232H based USB devices, and more. +the Bus Pirate device, various FTDI FT2232/FT4232H/FT232H based USB devices, and more. .PP It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, TSOP40, TSOP48, and BGA chips, which use various protocols such as LPC, FWH, @@ -189,7 +189,7 @@ .sp .BR "* atahpt" " (for flash ROMs on Highpoint ATA/RAID controllers)" .sp -.BR "* ft2232_spi" " (for SPI flash ROMs attached to an FT2232/FT4232H family \ +.BR "* ft2232_spi" " (for SPI flash ROMs attached to an FT2232/FT4232H/FT232H family \ based USB SPI programmer), including the DLP Design DLP-USB1232H, \ FTDI FT2232H Mini-Module, FTDI FT4232H Mini-Module, openbiosprog-spi, Amontec \ JTAGkey/JTAGkey-tiny/JTAGkey-2, Dangerous Prototypes Bus Blaster, \ @@ -562,7 +562,7 @@ syntax where .B model can be -.BR 2232H ", " 4232H ", " jtagkey ", " busblaster ", " openmoko ", " \ +.BR 2232H ", " 4232H ", " 232H ", " jtagkey ", " busblaster ", " openmoko ", " \ arm-usb-tiny ", " arm-usb-tiny-h ", " arm-usb-ocd ", " arm-usb-ocd-h \ ", " tumpa ", or " picotap and Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Wed Sep 26 02:46:02 2012 (r1608) +++ trunk/ft2232_spi.c Wed Sep 26 02:47:09 2012 (r1609) @@ -30,11 +30,18 @@ #include "spi.h" #include <ftdi.h> +/* This is not defined in libftdi.h <0.20 (c7e4c09e68cfa6f5e112334aa1b3bb23401c8dc7 to be exact). + * Some tests indicate that his is the only change that it is needed to support the FT232H in flashrom. */ +#if !defined(HAVE_FT232H) +#define TYPE_232H 6 +#endif + /* Please keep sorted by vendor ID, then device ID. */ #define FTDI_VID 0x0403 #define FTDI_FT2232H_PID 0x6010 #define FTDI_FT4232H_PID 0x6011 +#define FTDI_FT232H_PID 0x6014 #define TIAO_TUMPA_PID 0x8a98 #define AMONTEC_JTAGKEY_PID 0xCFF8 @@ -53,6 +60,7 @@ const struct usbdev_status devs_ft2232spi[] = { {FTDI_VID, FTDI_FT2232H_PID, OK, "FTDI", "FT2232H"}, {FTDI_VID, FTDI_FT4232H_PID, OK, "FTDI", "FT4232H"}, + {FTDI_VID, FTDI_FT232H_PID, OK, "FTDI", "FT232H"}, {FTDI_VID, TIAO_TUMPA_PID, OK, "TIAO", "USB Multi-Protocol Adapter"}, {FTDI_VID, AMONTEC_JTAGKEY_PID, OK, "Amontec", "JTAGkey"}, {GOEPEL_VID, GOEPEL_PICOTAP_PID, OK, "GOEPEL", "PicoTAP"}, @@ -190,6 +198,9 @@ } else if (!strcasecmp(arg, "4232H")) { ft2232_type = FTDI_FT4232H_PID; channel_count = 4; + } else if (!strcasecmp(arg, "232H")) { + ft2232_type = FTDI_FT232H_PID; + channel_count = 1; } else if (!strcasecmp(arg, "jtagkey")) { ft2232_type = AMONTEC_JTAGKEY_PID; channel_count = 2; @@ -315,7 +326,7 @@ return -4; } - if (ftdic->type != TYPE_2232H && ftdic->type != TYPE_4232H) { + if (ftdic->type != TYPE_2232H && ftdic->type != TYPE_4232H && ftdic->type != TYPE_232H) { msg_pdbg("FTDI chip type %d is not high-speed\n", ftdic->type); clock_5x = 0;

1 0

[commit] r1608 - trunk
by repository service 26 Sep '12

26 Sep '12

Author: stefanct Date: Wed Sep 26 02:46:02 2012 New Revision: 1608 URL: http://flashrom.org/trac/flashrom/changeset/1608 Log: Add support for all 4 possible channels to the ft2232_spi programmer. Add a check to validate the selected channel/interface, which not even libftdi seems to do yet. This patch changes default behavior: the new default channel/interface is A. Also, this patch uses the word 'channel' in addition or in place of 'interface' where possible without too much hassle because it is the term FTDI uses. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/flashrom.8 trunk/ft2232_spi.c Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Tue Sep 25 23:24:55 2012 (r1607) +++ trunk/flashrom.8 Wed Sep 26 02:46:02 2012 (r1608) @@ -555,7 +555,7 @@ .SS .BR "ft2232_spi " programmer An optional parameter specifies the controller -type and interface/port it should support. For that you have to use the +type and channel/interface/port it should support. For that you have to use the .sp .B " flashrom \-p ft2232_spi:type=model,port=interface" .sp @@ -568,11 +568,11 @@ and .B interface can be -.BR A ", or " B . +.BR A ", " B ", " C ", or " D . The default model is .B 4232H and the default interface is -.BR B . +.BR A . .sp If there is more than one ft2232_spi-compatible device connected, you can select which one should be used by specifying its serial number with the Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Tue Sep 25 23:24:55 2012 (r1607) +++ trunk/ft2232_spi.c Wed Sep 26 02:46:02 2012 (r1608) @@ -161,7 +161,8 @@ unsigned char buf[512]; int ft2232_vid = FTDI_VID; int ft2232_type = FTDI_FT4232H_PID; - enum ftdi_interface ft2232_interface = INTERFACE_B; + int channel_count = 4; /* Stores the number of channels of the device. */ + enum ftdi_interface ft2232_interface = INTERFACE_A; /* * The 'H' chips can run with an internal clock of either 12 MHz or 60 MHz, * but the non-H chips can only run at 12 MHz. We enable the divide-by-5 @@ -183,53 +184,55 @@ arg = extract_programmer_param("type"); if (arg) { - if (!strcasecmp(arg, "2232H")) + if (!strcasecmp(arg, "2232H")) { ft2232_type = FTDI_FT2232H_PID; - else if (!strcasecmp(arg, "4232H")) + channel_count = 2; + } else if (!strcasecmp(arg, "4232H")) { ft2232_type = FTDI_FT4232H_PID; - else if (!strcasecmp(arg, "jtagkey")) { + channel_count = 4; + } else if (!strcasecmp(arg, "jtagkey")) { ft2232_type = AMONTEC_JTAGKEY_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; cs_bits = 0x18; pindir = 0x1b; } else if (!strcasecmp(arg, "picotap")) { ft2232_vid = GOEPEL_VID; ft2232_type = GOEPEL_PICOTAP_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; } else if (!strcasecmp(arg, "tumpa")) { /* Interface A is SPI1, B is SPI2. */ ft2232_type = TIAO_TUMPA_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; } else if (!strcasecmp(arg, "busblaster")) { /* In its default configuration it is a jtagkey clone */ ft2232_type = FTDI_FT2232H_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; cs_bits = 0x18; pindir = 0x1b; } else if (!strcasecmp(arg, "openmoko")) { ft2232_vid = FIC_VID; ft2232_type = OPENMOKO_DBGBOARD_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; } else if (!strcasecmp(arg, "arm-usb-ocd")) { ft2232_vid = OLIMEX_VID; ft2232_type = OLIMEX_ARM_OCD_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; cs_bits = 0x08; pindir = 0x1b; } else if (!strcasecmp(arg, "arm-usb-tiny")) { ft2232_vid = OLIMEX_VID; ft2232_type = OLIMEX_ARM_TINY_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; } else if (!strcasecmp(arg, "arm-usb-ocd-h")) { ft2232_vid = OLIMEX_VID; ft2232_type = OLIMEX_ARM_OCD_H_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; cs_bits = 0x08; pindir = 0x1b; } else if (!strcasecmp(arg, "arm-usb-tiny-h")) { ft2232_vid = OLIMEX_VID; ft2232_type = OLIMEX_ARM_TINY_H_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; } else { msg_perr("Error: Invalid device type specified.\n"); free(arg); @@ -245,14 +248,31 @@ break; case 'B': ft2232_interface = INTERFACE_B; + if (channel_count < 2) + channel_count = -1; + break; + case 'C': + ft2232_interface = INTERFACE_C; + if (channel_count < 3) + channel_count = -1; + break; + case 'D': + ft2232_interface = INTERFACE_D; + if (channel_count < 4) + channel_count = -1; break; default: - msg_perr("Error: Invalid port/interface specified.\n"); - free(arg); - return -2; + channel_count = -1; + break; } } + if (channel_count < 0 || strlen(arg) != 1) { + msg_perr("Error: Invalid channel/port/interface specified: \"%s\".\n", arg); + free(arg); + return -2; + } free(arg); + arg = extract_programmer_param("divisor"); if (arg && strlen(arg)) { unsigned int temp = 0; @@ -271,8 +291,10 @@ msg_pdbg("Using device type %s %s ", get_ft2232_vendorname(ft2232_vid, ft2232_type), get_ft2232_devicename(ft2232_vid, ft2232_type)); - msg_pdbg("interface %s\n", - (ft2232_interface == INTERFACE_A) ? "A" : "B"); + msg_pdbg("channel %s\n", + (ft2232_interface == INTERFACE_A) ? "A" : + (ft2232_interface == INTERFACE_B) ? "B" : + (ft2232_interface == INTERFACE_C) ? "C" : "D"); if (ftdi_init(ftdic) < 0) { msg_perr("ftdi_init failed\n"); @@ -280,7 +302,7 @@ } if (ftdi_set_interface(ftdic, ft2232_interface) < 0) { - msg_perr("Unable to select interface: %s\n", ftdic->error_str); + msg_perr("Unable to select channel: %s\n", ftdic->error_str); } arg = extract_programmer_param("serial");

1 0

Re: [flashrom] [PATCH] Introduce a compile time option to select a default programmer.
by Peter Stuge 25 Sep '12

25 Sep '12

Stefan Tauner wrote: > Heavily influenced by a discussion with (and based on code from) Peter Stuge. > --- > Peter Stuge argued all evening with me that the mandatory -p parameter > is a regression and should be fixed, because the common case is -p internal > and that was the default programmer for most of the installations especially > those users that dont know what they are doing. While i don't think that the > internal programmer should be the new default default (sic) programmer > i do see the point in having a default programmer and don't think that the > "some user used to one default programmer could easily break $stuff when > using another build" outweighs the freedom of maintainers to shoot their > users in the foot especially if they are the same person. ;) > > We can not force any distributor to have no default programmer anyway, a > patch that adds one is trivial. Having this build time option does not > neccessarily make us endorsing this option either: If we deem it worth it, > we could add a build warning and add a note in the Makefile/README to > make maintainers consider our arguments. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Peter Stuge <peter(a)stuge.se>

2 1

[commit] r1607 - trunk
by repository service 25 Sep '12

25 Sep '12

Author: stefanct Date: Tue Sep 25 23:24:55 2012 New Revision: 1607 URL: http://flashrom.org/trac/flashrom/changeset/1607 Log: Introduce a compile time option to select a default programmer. Heavily influenced by a discussion with (and based on code from) Peter Stuge. Please read the comment in the Makefile before using this option. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Peter Stuge <peter(a)stuge.se> Modified: trunk/Makefile trunk/cli_classic.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Tue Sep 25 23:08:41 2012 (r1606) +++ trunk/Makefile Tue Sep 25 23:24:55 2012 (r1607) @@ -39,6 +39,18 @@ EXPORTDIR ?= . AR ?= ar RANLIB ?= ranlib +# The following parameter changes the default programmer that will be used if there is no -p/--programmer +# argument given when running flashrom. The predefined setting does not enable any default so that every +# user has to declare the programmer he wants to use on every run. The rationale for this to be not set +# (to e.g. the internal programmer) is that forgetting to specify this when working with another programmer +# easily puts the system attached to the default programmer at risk (e.g. you want to flash coreboot to another +# system attached to an external programmer while the default programmer is set to the internal programmer, and +# you forget to use the -p parameter. This would (try to) overwrite the existing firmware of the computer +# running flashrom). Please do not enable this without thinking about the possible consequences. Possible +# values are those specified in enum programmer in programmer.h (which depend on other CONFIG_* options +# evaluated below, namely those that enable/disable the various programmers). +# Compilation will fail for unspecified values. +CONFIG_DEFAULT_PROGRAMMER ?= PROGRAMMER_INVALID # If your compiler spits out excessive warnings, run make WARNERROR=no # You shouldn't have to change this flag. @@ -399,6 +411,8 @@ ############################################################################### # Programmer drivers and programmer support infrastructure. +FEATURE_CFLAGS += -D'CONFIG_DEFAULT_PROGRAMMER=$(CONFIG_DEFAULT_PROGRAMMER)' + ifeq ($(CONFIG_INTERNAL), yes) FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o dmi.o internal.o Modified: trunk/cli_classic.c ============================================================================== --- trunk/cli_classic.c Tue Sep 25 23:08:41 2012 (r1606) +++ trunk/cli_classic.c Tue Sep 25 23:24:55 2012 (r1607) @@ -402,11 +402,17 @@ } if (prog == PROGRAMMER_INVALID) { - msg_perr("Please select a programmer with the --programmer parameter.\n" - "Valid choices are:\n"); - list_programmers_linebreak(0, 80, 0); - ret = 1; - goto out; + if (CONFIG_DEFAULT_PROGRAMMER != PROGRAMMER_INVALID) { + prog = CONFIG_DEFAULT_PROGRAMMER; + msg_pinfo("Using default programmer \"%s\".\n", + programmer_table[CONFIG_DEFAULT_PROGRAMMER].name); + } else { + msg_perr("Please select a programmer with the --programmer parameter.\n" + "Valid choices are:\n"); + list_programmers_linebreak(0, 80, 0); + ret = 1; + goto out; + } } /* FIXME: Delay calibration should happen in programmer code. */

1 0

Re: [flashrom] [PATCH] Whitelist known working Thinkpads.
by Paul Menzel 25 Sep '12

25 Sep '12

Dear Stefan, please add T60 and X60 to the commit summary too. Whitelist known working Thinkpads T60 and X60. Am Montag, den 24.09.2012, 23:38 +0200 schrieb Stefan Tauner: > This should get rid of the need to specify the laptop force parameter > on T60 and X60 that are using one of the Intel 94x northbridges and > are known to have no interfering EC. »Therefore for example the T60’s image can be read with the following command. $ sudo flashrom -V -r t60.image > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > board_enable.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/board_enable.c b/board_enable.c > index 28a8fcd..e512064 100644 > --- a/board_enable.c > +++ b/board_enable.c > @@ -2243,6 +2243,17 @@ static int p2_not_a_laptop(void) > return 0; > } > > +/* > + * Suited for all laptops, which are known to work. > + */ > +static int p2_whitelist_laptop(void) > +{ > + is_laptop = 1; > + laptop_ok = 1; > + msg_pdbg("Whitelisted laptop detected.\n"); > + return 0; > +} > + > #endif > > /* > @@ -2396,6 +2407,8 @@ const struct board_match board_matches[] = { > {0x8086, 0x7190, 0, 0, 0x8086, 0x7110, 0, 0, "^SE440BX-2$", NULL, NULL, P3, "Intel", "SE440BX-2", 0, NT, intel_piix4_gpo27_lower}, > {0x1022, 0x7468, 0, 0, 0x1022, 0x7460, 0, 0, NULL, "iwill", "dk8_htx", P3, "IWILL", "DK8-HTX", 0, OK, w83627hf_gpio24_raise_2e}, > {0x8086, 0x27A0, 0x8086, 0x27a0, 0x8086, 0x27b8, 0x8086, 0x27b8, NULL, "kontron", "986lcd-m", P3, "Kontron", "986LCD-M", 0, OK, board_kontron_986lcd_m}, > + {0x8086, 0x27a0, 0x17aa, 0x2017, 0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad T60", NULL, NULL, P2, "Lenovo", "T60", 0, OK, p2_whitelist_laptop}, > + {0x8086, 0x27a0, 0x17aa, 0x2017, 0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad X60", NULL, NULL, P2, "Lenovo", "X60", 0, OK, p2_whitelist_laptop}, > {0x8086, 0x2411, 0x8086, 0x2411, 0x8086, 0x7125, 0x0e11, 0xb165, NULL, NULL, NULL, P3, "Mitac", "6513WU", 0, OK, board_mitac_6513wu}, > {0x8086, 0x8186, 0x8086, 0x8186, 0x8086, 0x8800, 0x0000, 0x0000, "^MSC Vertriebs GmbH$", NULL, NULL, P2, "MSC", "Q7-TCTC", 0, OK, p2_not_a_laptop}, > {0x10DE, 0x005E, 0x1462, 0x7125, 0x10DE, 0x0052, 0x1462, 0x7125, NULL, NULL, NULL, P3, "MSI", "K8N Neo4-F", 0, OK, nvidia_mcp_gpio2_raise}, /* TODO: Should probably be K8N Neo4 Platinum, see http://www.coreboot.org/pipermail/flashrom/2010-August/004362.html. */ Acked-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Thanks, Paul

2 1

ASUS M2N-MX support
by Stefan Tauner 25 Sep '12

25 Sep '12

Hello! I am sending this email to you because you have send logs regarding the M2N-MX mainboard. For a long time we were missing the necessary infrastructure to add support for that board easily and later it seems to have been forgotten. To this day it was only possible to read from the flash chip but not to write to it. Sorry about that! I have attached a patch that hopefully enables erase/write on that board and would like you to test if it works if you still have access to that board. The patch has to be applied to the latest development code (r1573) of flashrom that can be found here: http://flashrom.org/Downloads After saving the patch file to the flashrom directory please run the following inside the flashrom directory to apply it: patch < 0001-Add-board-enable-for-ASUS-M2N-MX.patch After that you can compile with "make". It should create an executable file named "flashrom in that directory. Although i think it is pretty safe to try, please make at least a backup of the original flash contents with -r before trying to erase or write! If anything unexpected happens don't reboot or shut down, but contact us please. If you try to write please reply with the output of ./flashrom -V -p internal -w <new bios image> -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 6

[PATCH] Introduce a compile time option to select a default programmer.
by Stefan Tauner 25 Sep '12

25 Sep '12

Heavily influenced by a discussion with (and based on code from) Peter Stuge. --- Peter Stuge argued all evening with me that the mandatory -p parameter is a regression and should be fixed, because the common case is -p internal and that was the default programmer for most of the installations especially those users that dont know what they are doing. While i don't think that the internal programmer should be the new default default (sic) programmer i do see the point in having a default programmer and don't think that the "some user used to one default programmer could easily break $stuff when using another build" outweighs the freedom of maintainers to shoot their users in the foot especially if they are the same person. ;) We can not force any distributor to have no default programmer anyway, a patch that adds one is trivial. Having this build time option does not neccessarily make us endorsing this option either: If we deem it worth it, we could add a build warning and add a note in the Makefile/README to make maintainers consider our arguments. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- Makefile | 3 +++ cli_classic.c | 16 +++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9309ce5..dc435b7 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,7 @@ CFLAGS ?= -Os -Wall -Wshadow EXPORTDIR ?= . AR ?= ar RANLIB ?= ranlib +CONFIG_DEFAULT_PROGRAMMER ?= PROGRAMMER_INVALID # If your compiler spits out excessive warnings, run make WARNERROR=no # You shouldn't have to change this flag. @@ -399,6 +400,8 @@ endif ############################################################################### # Programmer drivers and programmer support infrastructure. +FEATURE_CFLAGS += -D'CONFIG_DEFAULT_PROGRAMMER=$(CONFIG_DEFAULT_PROGRAMMER)' + ifeq ($(CONFIG_INTERNAL), yes) FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o dmi.o internal.o diff --git a/cli_classic.c b/cli_classic.c index 58696ad..4ae375c 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -402,11 +402,17 @@ int main(int argc, char *argv[]) } if (prog == PROGRAMMER_INVALID) { - msg_perr("Please select a programmer with the --programmer parameter.\n" - "Valid choices are:\n"); - list_programmers_linebreak(0, 80, 0); - ret = 1; - goto out; + if (CONFIG_DEFAULT_PROGRAMMER != PROGRAMMER_INVALID) { + prog = CONFIG_DEFAULT_PROGRAMMER; + msg_pinfo("Using default programmer \"%s\".\n", + programmer_table[CONFIG_DEFAULT_PROGRAMMER].name); + } else { + msg_perr("Please select a programmer with the --programmer parameter.\n" + "Valid choices are:\n"); + list_programmers_linebreak(0, 80, 0); + ret = 1; + goto out; + } } /* FIXME: Delay calibration should happen in programmer code. */ -- Kind regards, Stefan Tauner

1 0

[PATCH] Whitelist known working Thinkpads.
by Stefan Tauner 24 Sep '12

24 Sep '12

This should get rid of the need to specify the laptop force parameter on T60 and X60 that are using one of the Intel 94x northbridges and are known to have no interfering EC. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- board_enable.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/board_enable.c b/board_enable.c index 28a8fcd..e512064 100644 --- a/board_enable.c +++ b/board_enable.c @@ -2243,6 +2243,17 @@ static int p2_not_a_laptop(void) return 0; } +/* + * Suited for all laptops, which are known to work. + */ +static int p2_whitelist_laptop(void) +{ + is_laptop = 1; + laptop_ok = 1; + msg_pdbg("Whitelisted laptop detected.\n"); + return 0; +} + #endif /* @@ -2396,6 +2407,8 @@ const struct board_match board_matches[] = { {0x8086, 0x7190, 0, 0, 0x8086, 0x7110, 0, 0, "^SE440BX-2$", NULL, NULL, P3, "Intel", "SE440BX-2", 0, NT, intel_piix4_gpo27_lower}, {0x1022, 0x7468, 0, 0, 0x1022, 0x7460, 0, 0, NULL, "iwill", "dk8_htx", P3, "IWILL", "DK8-HTX", 0, OK, w83627hf_gpio24_raise_2e}, {0x8086, 0x27A0, 0x8086, 0x27a0, 0x8086, 0x27b8, 0x8086, 0x27b8, NULL, "kontron", "986lcd-m", P3, "Kontron", "986LCD-M", 0, OK, board_kontron_986lcd_m}, + {0x8086, 0x27a0, 0x17aa, 0x2017, 0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad T60", NULL, NULL, P2, "Lenovo", "T60", 0, OK, p2_whitelist_laptop}, + {0x8086, 0x27a0, 0x17aa, 0x2017, 0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad X60", NULL, NULL, P2, "Lenovo", "X60", 0, OK, p2_whitelist_laptop}, {0x8086, 0x2411, 0x8086, 0x2411, 0x8086, 0x7125, 0x0e11, 0xb165, NULL, NULL, NULL, P3, "Mitac", "6513WU", 0, OK, board_mitac_6513wu}, {0x8086, 0x8186, 0x8086, 0x8186, 0x8086, 0x8800, 0x0000, 0x0000, "^MSC Vertriebs GmbH$", NULL, NULL, P2, "MSC", "Q7-TCTC", 0, OK, p2_not_a_laptop}, {0x10DE, 0x005E, 0x1462, 0x7125, 0x10DE, 0x0052, 0x1462, 0x7125, NULL, NULL, NULL, P3, "MSI", "K8N Neo4-F", 0, OK, nvidia_mcp_gpio2_raise}, /* TODO: Should probably be K8N Neo4 Platinum, see http://www.coreboot.org/pipermail/flashrom/2010-August/004362.html. */ -- Kind regards, Stefan Tauner

1 0

Re: [flashrom] [PATCH] Fix flashrom running on boards with coreboot.
by Stefan Tauner 24 Sep '12

24 Sep '12

On Sun, 16 Sep 2012 02:56:15 +0200 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > + if (board == NULL && cb_vendor != NULL && cb_model != NULL) { > + board = board_match_name(cb_vendor, cb_model); > + if (!board) { /* Failure is an option here, because many cb boards don't require an enable. */ > + msg_pdbg2("No board enable found matching coreboot IDs vendor=\"%s\", model=\"%s\".\n", > + vendor, model); > + } > + } I should have used cb_vendor and cb_model there, as Idwer pointed out. It was committed with this refinement in r1605 with Idwer's consent on IRC, thanks. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1605 - trunk
by repository service 24 Sep '12

24 Sep '12

Author: stefanct Date: Mon Sep 24 23:29:29 2012 New Revision: 1605 URL: http://flashrom.org/trac/flashrom/changeset/1605 Log: Fix flashrom running on boards with coreboot. In r1577 we removed the discrimination of coreboot IDs and user-specified mainboards. The problem is that the board enable code required to find a board enable if either of these model strings were set. Therefore boards running coreboot that do not need a board enable failed to execute flashrom since then. This patch fixes this by handling coreboot IDs and user-supplied IDs differently again. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Idwer Vollering <vidwer(a)gmail.com> Modified: trunk/board_enable.c trunk/internal.c trunk/programmer.h Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Sun Sep 23 14:14:28 2012 (r1604) +++ trunk/board_enable.c Mon Sep 24 23:29:29 2012 (r1605) @@ -2499,7 +2499,6 @@ if (partmatch) return partmatch; - msg_perr("No suitable board enable found for vendor=\"%s\", model=\"%s\".\n", vendor, model); return NULL; } @@ -2609,16 +2608,27 @@ board_handle_phase(P2); } -int board_flash_enable(const char *vendor, const char *model) +int board_flash_enable(const char *vendor, const char *model, const char *cb_vendor, const char *cb_model) { const struct board_match *board = NULL; int ret = 0; - if (vendor && model) { + if (vendor != NULL && model != NULL) { board = board_match_name(vendor, model); - if (!board) /* if a board was given it has to match, else we abort here. */ + if (!board) { /* If a board was given by the user it has to match, else we abort here. */ + msg_perr("No suitable board enable found for vendor=\"%s\", model=\"%s\".\n", + vendor, model); return 1; - } else { + } + } + if (board == NULL && cb_vendor != NULL && cb_model != NULL) { + board = board_match_name(cb_vendor, cb_model); + if (!board) { /* Failure is an option here, because many cb boards don't require an enable. */ + msg_pdbg2("No board enable found matching coreboot IDs vendor=\"%s\", model=\"%s\".\n", + cb_vendor, cb_model); + } + } + if (board == NULL) { board = board_match_pci_ids(P3); if (!board) /* i.e. there is just no board enable available for this board */ return 0; Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Sun Sep 23 14:14:28 2012 (r1604) +++ trunk/internal.c Mon Sep 24 23:29:29 2012 (r1605) @@ -257,12 +257,8 @@ } #if defined(__i386__) || defined(__x86_64__) - if (cb_parse_table(&cb_vendor, &cb_model) == 0) { /* coreboot IDs valid */ - /* If no -p internal:mainboard was given but there are valid coreboot IDs then use those. */ - if (board_vendor == NULL || board_model == NULL) { - board_vendor = cb_vendor; - board_model = cb_model; - } else if (strcasecmp(board_vendor, cb_vendor) || strcasecmp(board_model, cb_model)) { + if ((cb_parse_table(&cb_vendor, &cb_model) == 0) && (board_vendor != NULL) && (board_model != NULL)) { + if (strcasecmp(board_vendor, cb_vendor) || strcasecmp(board_model, cb_model)) { msg_pinfo("WARNING: The mainboard IDs set by -p internal:mainboard (%s:%s) do not\n" " match the current coreboot IDs of the mainboard (%s:%s).\n", board_vendor, board_model, cb_vendor, cb_model); @@ -339,7 +335,7 @@ init_superio_ite(); #endif - if (board_flash_enable(board_vendor, board_model)) { + if (board_flash_enable(board_vendor, board_model, cb_vendor, cb_model)) { msg_perr("Aborting to be safe.\n"); return 1; } Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Sun Sep 23 14:14:28 2012 (r1604) +++ trunk/programmer.h Mon Sep 24 23:29:29 2012 (r1605) @@ -256,7 +256,7 @@ void sio_mask(uint16_t port, uint8_t reg, uint8_t data, uint8_t mask); void board_handle_before_superio(void); void board_handle_before_laptop(void); -int board_flash_enable(const char *vendor, const char *model); +int board_flash_enable(const char *vendor, const char *model, const char *cb_vendor, const char *cb_model); /* chipset_enable.c */ int chipset_flash_enable(void);

1 0

← Newer
1
2
3
4
5
6
7
8
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom September 2012