flashrom September 2011

flashrom@flashrom.org

41 participants
161 discussions

Start a nNew thread

ReportFlashrom
by Boris Klimenko 14 Sep '11

14 Sep '11

Best regards! Boris Bishkek, Kyrgyzstan

1 0

Re: [flashrom] [PATCH] Make the laptop warning less scary if unsure
by Carl-Daniel Hailfinger 14 Sep '11

14 Sep '11

Am 20.08.2011 15:14 schrieb Stefan Tauner: > Telling the user to use "force_I_want_a_brick" if it is not even a > laptop, is a bit over-the-top. Introduce a new laptop parameter > "this_is_not_a_laptop" that allows to force operation, but only if > the detection is not sure. > > --- > > complicates the whole thing a bit. could do without the extra > variable and new part of the if condition, if we allow the > this_is_not_a_laptop parameter to always work, not only if the > laptop detection is uncertain. it will be undocumented and only > visible to the user together with the warning anyway... > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > internal.c | 14 ++++++++------ > 1 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/internal.c b/internal.c > index 846cf1e..5ff605e 100644 > --- a/internal.c > +++ b/internal.c > @@ -170,9 +171,11 @@ int internal_init(void) > free(arg); > > arg = extract_programmer_param("laptop"); > - if (arg && !strcmp(arg,"force_I_want_a_brick")) { > + if (arg && !strcmp(arg,"force_I_want_a_brick")) While you're touching that line, can you add a space after the comma? > force_laptop = 1; > - } else if (arg && !strlen(arg)) { > + else if (arg && !strcmp(arg,"this_is_not_a_laptop")) Same here. > + not_a_laptop = 1; > + else if (arg && !strlen(arg)) { > msg_perr("Missing argument for laptop.\n"); > free(arg); > return 1; > @@ -251,9 +254,8 @@ int internal_init(void) > "You have been warned.\n" > "========================================================================\n"); > > - if (force_laptop) { > - msg_perr("Proceeding anyway because user specified " > - "laptop=force_I_want_a_brick\n"); > + if (force_laptop || (not_a_laptop && (is_laptop != 1))) { What about is_laptop == 2 instead? > + msg_perr("Proceeding anyway because user forced us to.\n"); > } else { > msg_perr("Aborting.\n"); > exit(1); Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1440 - trunk
by repository service 14 Sep '11

14 Sep '11

Author: stefanct Date: Wed Sep 14 01:14:25 2011 New Revision: 1440 URL: http://flashrom.org/trac/flashrom/changeset/1440 Log: Make the laptop warning less scary if unsure Telling the user to use "force_I_want_a_brick" if it is not even a laptop, is a bit over-the-top. Introduce a new laptop parameter "this_is_not_a_laptop" that allows to force operation, but only if the detection is not sure. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/internal.c Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Wed Sep 14 00:05:44 2011 (r1439) +++ trunk/internal.c Wed Sep 14 01:14:25 2011 (r1440) @@ -139,6 +139,7 @@ int ret = 0; #endif int force_laptop = 0; + int not_a_laptop = 0; char *arg; arg = extract_programmer_param("boardenable"); @@ -170,9 +171,11 @@ free(arg); arg = extract_programmer_param("laptop"); - if (arg && !strcmp(arg,"force_I_want_a_brick")) { + if (arg && !strcmp(arg, "force_I_want_a_brick")) force_laptop = 1; - } else if (arg && !strlen(arg)) { + else if (arg && !strcmp(arg, "this_is_not_a_laptop")) + not_a_laptop = 1; + else if (arg && !strlen(arg)) { msg_perr("Missing argument for laptop.\n"); free(arg); return 1; @@ -237,7 +240,7 @@ msg_perr("WARNING! You may be running flashrom on an unsupported laptop. We could\n" "not detect this for sure because your vendor has not setup the SMBIOS\n" "tables correctly. You can enforce execution by adding\n" - "'-p internal:laptop=force_I_want_a_brick' to the command line, but\n" + "'-p internal:laptop=this_is_not_a_laptop' to the command line, but\n" "please read the following warning if you are not sure.\n\n"); } msg_perr("Laptops, notebooks and netbooks are difficult to support and we\n" @@ -251,9 +254,8 @@ "You have been warned.\n" "========================================================================\n"); - if (force_laptop) { - msg_perr("Proceeding anyway because user specified " - "laptop=force_I_want_a_brick\n"); + if (force_laptop || (not_a_laptop && (is_laptop == 2))) { + msg_perr("Proceeding anyway because user forced us to.\n"); } else { msg_perr("Aborting.\n"); exit(1);

1 0

[commit] r1439 - trunk
by repository service 14 Sep '11

14 Sep '11

Author: uwe Date: Wed Sep 14 00:05:44 2011 New Revision: 1439 URL: http://flashrom.org/trac/flashrom/changeset/1439 Log: Add probe/read support for the Catalyst CAT28F512 chip. Write and erase are NOT yet supported! Probe and read are tested by Andrew Morgan and Uwe Hermann on Intel NICs. Signed-off-by: Andrew Morgan <ziltro(a)ziltro.com> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/flashchips.c trunk/flashchips.h Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Tue Sep 13 00:55:01 2011 (r1438) +++ trunk/flashchips.c Wed Sep 14 00:05:44 2011 (r1439) @@ -2341,6 +2341,30 @@ }, { + .vendor = "Catalyst", + .name = "CAT28F512", + .bustype = BUS_PARALLEL, + .manufacture_id = CATALYST_ID, + .model_id = CATALYST_CAT28F512, + .total_size = 64, + .page_size = 0, /* unused */ + .feature_bits = 0, + .tested = TEST_OK_PR, + .probe = probe_jedec, /* FIXME! */ + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 1} }, + .block_erase = NULL, /* TODO */ + }, + }, + .write = NULL, /* TODO */ + .read = read_memmapped, + .voltage = {4500, 5500}, + }, + + { .vendor = "Bright", .name = "BM29F040", .bustype = BUS_PARALLEL, Modified: trunk/flashchips.h ============================================================================== --- trunk/flashchips.h Tue Sep 13 00:55:01 2011 (r1438) +++ trunk/flashchips.h Wed Sep 14 00:05:44 2011 (r1439) @@ -193,6 +193,7 @@ #define BRIGHT_BM29F400T 0xAD #define CATALYST_ID 0x31 /* Catalyst */ +#define CATALYST_CAT28F512 0xB8 #define EMST_ID 0x8C /* EMST / EFST Elite Flash Storage */ #define EMST_F25L008A 0x2014

1 0

[PATCH] Add support for the Macronix MX28F2000P chip (256KB parallel)
by Uwe Hermann 13 Sep '11

13 Sep '11

See patch for a first attempt to support the Macronix MX28F2000P. Some TODOs remain in the code, and it will be tested soon by Mete0 (IRC). However, the chip requires 12V for programming/erasing, we'll see if that'll work out of the box or maybe requires some board-enable. Also, there's a "DMI chassis-type is not specific enough.", thus the laptop=force_I_want_a_brick options is currently needed. http://paste.flashrom.org/view.php?id=789 http://paste.flashrom.org/view.php?id=787 Uwe. -- http://hermann-uwe.de | http://sigrok.org http://randomprojects.org | http://unmaintained-free-software.org

2 3

Re: [flashrom] [PATCH 1/2] reformat -L output and add printing of chip voltage ranges to print.c
by Carl-Daniel Hailfinger 13 Sep '11

13 Sep '11

Am 27.06.2011 06:30 schrieb Stefan Tauner: > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1438 - trunk
by repository service 13 Sep '11

13 Sep '11

Author: stefanct Date: Tue Sep 13 00:55:01 2011 New Revision: 1438 URL: http://flashrom.org/trac/flashrom/changeset/1438 Log: Reformat -L output and add printing of chip voltage ranges to print.c besides adding output for the voltage ranges, this patch also changes various aspects of the -L output: - sizes are right aligned now with a fixed length of 5 - space between columns is selectable with a constant - test results are always shown in the same column ("PR" and " R" instead of "PR" and "R ") - vendor and device names are split on a delimiter (currently '/') and spread over mutliple lines but only if the tokens are not too short. all other columns are printed on the first line of a chip. - voltage ranges are printed in verbose mode only it also gets rid of POS_PRINT and digits Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/print.c Modified: trunk/print.c ============================================================================== --- trunk/print.c Mon Sep 12 08:17:06 2011 (r1437) +++ trunk/print.c Tue Sep 13 00:55:01 2011 (r1438) @@ -58,40 +58,68 @@ return ret; } -#define POS_PRINT(x) do { pos += strlen(x); msg_ginfo(x); } while (0) - -static int digits(int n) -{ - int i; - - if (!n) - return 1; - - for (i = 0; n; ++i) - n /= 10; - - return i; -} - static void print_supported_chips(void) { - int okcol = 0, pos = 0, i, chipcount = 0; + const char *delim = "/"; + const int mintoklen = 5; + const int border = 2; + int i, chipcount = 0; int maxvendorlen = strlen("Vendor") + 1; int maxchiplen = strlen("Device") + 1; + int maxtypelen = strlen("Type") + 1; const struct flashchip *f; char *s; + char *tmpven, *tmpdev; + int tmpvenlen, tmpdevlen, curvenlen, curdevlen; + /* calculate maximum column widths and by iterating over all chips */ for (f = flashchips; f->name != NULL; f++) { /* Ignore "unknown XXXX SPI chip" entries. */ if (!strncmp(f->name, "unknown", 7)) continue; chipcount++; - maxvendorlen = max(maxvendorlen, strlen(f->vendor)); - maxchiplen = max(maxchiplen, strlen(f->name)); + + /* Find maximum vendor length (respecting line splitting). */ + tmpven = (char *)f->vendor; + do { + /* and take minimum token lengths into account */ + tmpvenlen = 0; + do { + tmpvenlen += strcspn(tmpven, delim); + /* skip to the address after the first token */ + tmpven += tmpvenlen; + if (tmpven[0] == '\0') + break; + tmpven++; + } while (tmpvenlen < mintoklen); + maxvendorlen = max(maxvendorlen, tmpvenlen); + if (tmpven[0] == '\0') + break; + } while (1); + + /* same for device name */ + tmpdev = (char *)f->name; + do { + tmpdevlen = 0; + do { + tmpdevlen += strcspn(tmpdev, delim); + tmpdev += tmpdevlen; + if (tmpdev[0] == '\0') + break; + tmpdev++; + } while (tmpdevlen < mintoklen); + maxchiplen = max(maxchiplen, tmpdevlen); + if (tmpdev[0] == '\0') + break; + } while (1); + + s = flashbuses_to_text(f->bustype); + maxtypelen = max(maxtypelen, strlen(s)); + free(s); } - maxvendorlen++; - maxchiplen++; - okcol = maxvendorlen + maxchiplen; + maxvendorlen += border; + maxchiplen += border; + maxtypelen += border; msg_ginfo("Supported flash chips (total: %d):\n\n", chipcount); msg_ginfo("Vendor"); @@ -101,10 +129,35 @@ for (i = strlen("Device"); i < maxchiplen; i++) msg_ginfo(" "); - msg_ginfo("Tested Known Size/kB: Type:\n"); - for (i = 0; i < okcol; i++) + msg_ginfo("Test"); + for (i = 0; i < border; i++) msg_ginfo(" "); - msg_ginfo("OK Broken\n\n"); + msg_ginfo("Known"); + for (i = 0; i < border; i++) + msg_ginfo(" "); + msg_ginfo(" Size"); + for (i = 0; i < border; i++) + msg_ginfo(" "); + + msg_ginfo("Type"); + for (i = strlen("Type"); i < maxtypelen; i++) + msg_ginfo(" "); + msg_gdbg("Voltage"); + msg_ginfo("\n"); + + for (i = 0; i < maxvendorlen + maxchiplen; i++) + msg_ginfo(" "); + msg_ginfo("OK "); + for (i = 0; i < border; i++) + msg_ginfo(" "); + msg_ginfo("Broken"); + for (i = 0; i < border; i++) + msg_ginfo(" "); + msg_ginfo("[kB]"); + for (i = 0; i < border + maxtypelen; i++) + msg_ginfo(" "); + msg_gdbg("range [V]"); + msg_ginfo("\n\n"); msg_ginfo("(P = PROBE, R = READ, E = ERASE, W = WRITE)\n\n"); for (f = flashchips; f->name != NULL; f++) { @@ -112,50 +165,156 @@ if (!strncmp(f->name, "unknown", 7)) continue; - msg_ginfo("%s", f->vendor); - for (i = strlen(f->vendor); i < maxvendorlen; i++) - msg_ginfo(" "); - msg_ginfo("%s", f->name); - for (i = strlen(f->name); i < maxchiplen; i++) - msg_ginfo(" "); + /* support for multiline vendor names: + * - make a copy of the original vendor name + * - use strok to put the first token in tmpven + * - keep track of the length of all tokens on the current line + * for ' '-padding in curvenlen + * - check if additional tokens should be printed on the current + * line + * - after all other values are printed print the surplus tokens + * on fresh lines + */ + tmpven = malloc(strlen(f->vendor) + 1); + if (tmpven == NULL) { + msg_gerr("Out of memory!\n"); + exit(1); + } + strcpy(tmpven, f->vendor); - pos = maxvendorlen + maxchiplen; - if ((f->tested & TEST_OK_MASK)) { - if ((f->tested & TEST_OK_PROBE)) - POS_PRINT("P "); - if ((f->tested & TEST_OK_READ)) - POS_PRINT("R "); - if ((f->tested & TEST_OK_ERASE)) - POS_PRINT("E "); - if ((f->tested & TEST_OK_WRITE)) - POS_PRINT("W "); + tmpven = strtok(tmpven, delim); + msg_ginfo("%s", tmpven); + curvenlen = strlen(tmpven); + while ((tmpven = strtok(NULL, delim)) != NULL) { + msg_ginfo("%s", delim); + curvenlen++; + tmpvenlen = strlen(tmpven); + if (tmpvenlen >= mintoklen) + break; /* big enough to be on its own line */ + msg_ginfo("%s", tmpven); + curvenlen += tmpvenlen; } - while (pos < okcol + 9) { + + for (i = curvenlen; i < maxvendorlen; i++) msg_ginfo(" "); - pos++; + + /* support for multiline device names as above */ + tmpdev = malloc(strlen(f->name) + 1); + if (tmpdev == NULL) { + msg_gerr("Out of memory!\n"); + exit(1); } - if ((f->tested & TEST_BAD_MASK)) { - if ((f->tested & TEST_BAD_PROBE)) - POS_PRINT("P "); - if ((f->tested & TEST_BAD_READ)) - POS_PRINT("R "); - if ((f->tested & TEST_BAD_ERASE)) - POS_PRINT("E "); - if ((f->tested & TEST_BAD_WRITE)) - POS_PRINT("W "); + strcpy(tmpdev, f->name); + + tmpdev = strtok(tmpdev, delim); + msg_ginfo("%s", tmpdev); + curdevlen = strlen(tmpdev); + while ((tmpdev = strtok(NULL, delim)) != NULL) { + msg_ginfo("%s", delim); + curdevlen++; + tmpdevlen = strlen(tmpdev); + if (tmpdevlen >= mintoklen) + break; /* big enough to be on its own line */ + msg_ginfo("%s", tmpdev); + curdevlen += tmpdevlen; } - while (pos < okcol + 18) { + for (i = curdevlen; i < maxchiplen; i++) msg_ginfo(" "); - pos++; - } - msg_ginfo("%d", f->total_size); - for (i = 0; i < 10 - digits(f->total_size); i++) + + if ((f->tested & TEST_OK_PROBE)) + msg_ginfo("P"); + else + msg_ginfo(" "); + if ((f->tested & TEST_OK_READ)) + msg_ginfo("R"); + else + msg_ginfo(" "); + if ((f->tested & TEST_OK_ERASE)) + msg_ginfo("E"); + else + msg_ginfo(" "); + if ((f->tested & TEST_OK_WRITE)) + msg_ginfo("W"); + else + msg_ginfo(" "); + for (i = 0; i < border; i++) + msg_ginfo(" "); + + if ((f->tested & TEST_BAD_PROBE)) + msg_ginfo("P"); + else + msg_ginfo(" "); + if ((f->tested & TEST_BAD_READ)) + msg_ginfo("R"); + else + msg_ginfo(" "); + if ((f->tested & TEST_BAD_ERASE)) + msg_ginfo("E"); + else + msg_ginfo(" "); + if ((f->tested & TEST_BAD_WRITE)) + msg_ginfo("W"); + else + msg_ginfo(" "); + for (i = 0; i < border + 1; i++) + msg_ginfo(" "); + + msg_ginfo("%5d", f->total_size); + for (i = 0; i < border; i++) msg_ginfo(" "); s = flashbuses_to_text(f->bustype); - msg_ginfo("%s\n", s); + msg_ginfo("%s", s); + for (i = strlen(s); i < maxtypelen; i++) + msg_ginfo(" "); free(s); + + if (f->voltage.min == 0 && f->voltage.max == 0) + msg_gdbg("no info"); + else + msg_gdbg("%0.02f;%0.02f", + f->voltage.min/(double)1000, + f->voltage.max/(double)1000); + + /* print surplus vendor and device name tokens */ + while (tmpven != NULL || tmpdev != NULL) { + msg_ginfo("\n"); + if (tmpven != NULL){ + msg_ginfo("%s", tmpven); + curvenlen = strlen(tmpven); + while ((tmpven = strtok(NULL, delim)) != NULL) { + msg_ginfo("%s", delim); + curvenlen++; + tmpvenlen = strlen(tmpven); + /* big enough to be on its own line */ + if (tmpvenlen >= mintoklen) + break; + msg_ginfo("%s", tmpven); + curvenlen += tmpvenlen; + } + } else + curvenlen = 0; + + for (i = curvenlen; i < maxvendorlen; i++) + msg_ginfo(" "); + + if (tmpdev != NULL){ + msg_ginfo("%s", tmpdev); + curdevlen = strlen(tmpdev); + while ((tmpdev = strtok(NULL, delim)) != NULL) { + msg_ginfo("%s", delim); + curdevlen++; + tmpdevlen = strlen(tmpdev); + /* big enough to be on its own line */ + if (tmpdevlen >= mintoklen) + break; + msg_ginfo("%s", tmpdev); + curdevlen += tmpdevlen; + } + } + } + msg_ginfo("\n"); } }

1 0

Flashing of BIOS failed - UPDATE works now! (ASUS M2N-E-SLI)
by jorgen＠kinsarvik.net 12 Sep '11

12 Sep '11

Hi again, after manually installing flashrom v0.9.4-r1395 and reflashing the BIOS everything was reported ok. So my first mail can be safely ignored. I included this time also the motherboard type, ASUS M2N-E-SLI Also a log of the writing and reading of the BIOS chip is included. ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.

2 1

[commit] r1437 - trunk
by repository service 12 Sep '11

12 Sep '11

Author: hailfinger Date: Mon Sep 12 08:17:06 2011 New Revision: 1437 URL: http://flashrom.org/trac/flashrom/changeset/1437 Log: Add support for Xilinx parallel III (DLC5) programing cable The rayer_spi driver defaults to the RayeR cable, but selecting other predefined pin layouts with the type= parameter is possible: flashrom -p rayer_spi:type=xilinx Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/flashrom.8 trunk/rayer_spi.c Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Mon Sep 12 00:08:58 2011 (r1436) +++ trunk/flashrom.8 Mon Sep 12 08:17:06 2011 (r1437) @@ -210,8 +210,8 @@ .sp .BR "* dediprog" " (for SPI flash ROMs attached to a Dediprog SF100)" .sp -.BR "* rayer_spi" " (for SPI flash ROMs attached to a RayeR parport \ -based programmer)" +.BR "* rayer_spi" " (for SPI flash ROMs attached to a RayeR parport " +or Xilinx DLC5 compatible cable) .sp .BR "* nicintel_spi" " (for SPI flash ROMs on Intel Gigabit network cards)" .sp @@ -512,8 +512,22 @@ is base I/O port address of the parallel port, which must be a multiple of four. Make sure to not forget the "0x" prefix for hexadecimal port addresses. .sp -More information about the hardware is available at -.BR http://rayer.ic.cz/elektro/spipgm.htm . +The default cable type is the RayeR cable. You can use the optional +.B type +parameter to specify the cable type with the +.sp +.B " flashrom \-p rayer_spi:type=model" +.sp +syntax where +.B model +can be +.BR rayer " for the RayeR cable or " xilinx " for the Xilinx Parallel Cable III +(DLC 5). +.sp +More information about the RayeR hardware is available at +.BR "http://rayer.ic.cz/elektro/spipgm.htm " . +The schematic of the Xilinx DLC 5 was published at +.BR "http://www.xilinx.com/itp/xilinx4/data/docs/pac/appendixb.html " . .TP .BR "ogp_spi " programmer The flash ROM chip to access must be specified with the Modified: trunk/rayer_spi.c ============================================================================== --- trunk/rayer_spi.c Mon Sep 12 00:08:58 2011 (r1436) +++ trunk/rayer_spi.c Mon Sep 12 08:17:06 2011 (r1437) @@ -31,18 +31,25 @@ #if defined(__i386__) || defined(__x86_64__) #include <stdlib.h> +#include <string.h> #include "flash.h" #include "programmer.h" +enum rayer_type { + TYPE_RAYER, + TYPE_XILINX_DLC5, +}; + /* We have two sets of pins, out and in. The numbers for both sets are * independent and are bitshift values, not real pin numbers. + * Default settings are for the the RayeR hardware. */ /* Pins for master->slave direction */ -#define SPI_CS_PIN 5 -#define SPI_SCK_PIN 6 -#define SPI_MOSI_PIN 7 +static int rayer_cs_bit = 5; +static int rayer_sck_bit = 6; +static int rayer_mosi_bit = 7; /* Pins for slave->master direction */ -#define SPI_MISO_PIN 6 +static int rayer_miso_bit = 6; static uint16_t lpt_iobase; @@ -51,22 +58,22 @@ static void rayer_bitbang_set_cs(int val) { - lpt_outbyte &= ~(1 << SPI_CS_PIN); - lpt_outbyte |= (val << SPI_CS_PIN); + lpt_outbyte &= ~(1 << rayer_cs_bit); + lpt_outbyte |= (val << rayer_cs_bit); OUTB(lpt_outbyte, lpt_iobase); } static void rayer_bitbang_set_sck(int val) { - lpt_outbyte &= ~(1 << SPI_SCK_PIN); - lpt_outbyte |= (val << SPI_SCK_PIN); + lpt_outbyte &= ~(1 << rayer_sck_bit); + lpt_outbyte |= (val << rayer_sck_bit); OUTB(lpt_outbyte, lpt_iobase); } static void rayer_bitbang_set_mosi(int val) { - lpt_outbyte &= ~(1 << SPI_MOSI_PIN); - lpt_outbyte |= (val << SPI_MOSI_PIN); + lpt_outbyte &= ~(1 << rayer_mosi_bit); + lpt_outbyte |= (val << rayer_mosi_bit); OUTB(lpt_outbyte, lpt_iobase); } @@ -75,7 +82,7 @@ uint8_t tmp; tmp = INB(lpt_iobase + 1); - tmp = (tmp >> SPI_MISO_PIN) & 0x1; + tmp = (tmp >> rayer_miso_bit) & 0x1; return tmp; } @@ -89,14 +96,15 @@ int rayer_spi_init(void) { - char *portpos = NULL; + char *arg = NULL; + enum rayer_type rayer_type = TYPE_RAYER; /* Non-default port requested? */ - portpos = extract_programmer_param("iobase"); - if (portpos) { + arg = extract_programmer_param("iobase"); + if (arg) { char *endptr = NULL; unsigned long tmp; - tmp = strtoul(portpos, &endptr, 0); + tmp = strtoul(arg, &endptr, 0); /* Port 0, port >0x10000, unaligned ports and garbage strings * are rejected. */ @@ -109,7 +117,7 @@ msg_perr("Error: iobase= specified, but the I/O base " "given was invalid.\nIt must be a multiple of " "0x4 and lie between 0x100 and 0xfffc.\n"); - free(portpos); + free(arg); return 1; } else { lpt_iobase = (uint16_t)tmp; @@ -120,11 +128,44 @@ /* Pick a default value for the I/O base. */ lpt_iobase = 0x378; } - free(portpos); + free(arg); msg_pdbg("Using address 0x%x as I/O base for parallel port access.\n", lpt_iobase); + arg = extract_programmer_param("type"); + if (arg) { + if (!strcasecmp(arg, "rayer")) { + rayer_type = TYPE_RAYER; + } else if (!strcasecmp(arg, "xilinx")) { + rayer_type = TYPE_XILINX_DLC5; + } else { + msg_perr("Error: Invalid device type specified.\n"); + free(arg); + return 1; + } + } + free(arg); + switch (rayer_type) { + case TYPE_RAYER: + msg_pdbg("Using RayeR SPIPGM pinout.\n"); + /* Bits for master->slave direction */ + rayer_cs_bit = 5; + rayer_sck_bit = 6; + rayer_mosi_bit = 7; + /* Bits for slave->master direction */ + rayer_miso_bit = 6; + break; + case TYPE_XILINX_DLC5: + msg_pdbg("Using Xilinx Parallel Cable III (DLC 5) pinout.\n"); + /* Bits for master->slave direction */ + rayer_cs_bit = 2; + rayer_sck_bit = 1; + rayer_mosi_bit = 0; + /* Bits for slave->master direction */ + rayer_miso_bit = 4; + } + get_io_perms(); /* Get the initial value before writing to any line. */

3 2

Re: [flashrom] flashrom ERASE FAILED
by Stefan Tauner 12 Sep '11

12 Sep '11

On Mon, 12 Sep 2011 11:33:43 -0700 Rohit Vijapure <dbnk83(a)motorola.com> wrote: > Hi Stefan > > Many thanks for your prompt reply. The -m option worked just fine for me. I > will test it locally on couple of machine today. flashrom utility is > awesome. Kudos to you and the team. > Here is the output of the commands. > […] hello again and thanks for the logs from the lspci output it looks like ibase has mainly reused intel's IDs for subsystems. we refrain from using those for identification because they are very generic and do not identify boards uniquely enough. we could match on some of those plus the firewire or marvell GbE controller, but those could be turned off or may not be on all versions of the board. we normally fall back to identify the boards via DMI strings when PCI IDs are not enough... > DMI string system-manufacturer: " " > DMI string system-product-name: " " > DMI string system-version: " " > DMI string baseboard-manufacturer: " " > DMI string baseboard-product-name: "945GM" > DMI string baseboard-version: " " does not look very good either... that's probably the reason why autodetection is disabled. please continue to use the -m option, thanks. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom September 2011