- flashrom - mail.coreboot.org

[commit] r1930 - trunk
by repository service 19 Feb '16

19 Feb '16

Author: hailfinger Date: Fri Feb 19 00:11:52 2016 New Revision: 1930 URL: http://flashrom.org/trac/flashrom/changeset/1930 Log: Fix chip size limiting in atapromise The current code is checking model_id to remember if a chip has already been limited, but if flashchips.c contains two subsequent chips with different vendor_id but identical model_id the adjustment will not be done. Switch to checking the chip size instead. If a chip has multiple whole-chip erase functions, only one will be modified. Fix that. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Tested-by: Joseph C. Lehner <joseph.c.lehner(a)gmail.com> Acked-by: Urja Rannikko <urjaman(a)gmail.com> Modified: trunk/atapromise.c Modified: trunk/atapromise.c ============================================================================== --- trunk/atapromise.c Thu Feb 18 22:42:49 2016 (r1929) +++ trunk/atapromise.c Fri Feb 19 00:11:52 2016 (r1930) @@ -79,38 +79,35 @@ static void atapromise_limit_chip(struct flashchip *chip) { - static uint32_t last_model_id = 0; unsigned int i, size; - - if (chip->model_id == last_model_id) - return; + unsigned int usable_erasers = 0; size = chip->total_size * 1024; - if (size > rom_size) { - /* Undefine all block_erasers that don't operate on the whole chip, - * and adjust the eraseblock size of the one that does. - */ - for (i = 0; i < NUM_ERASEFUNCTIONS; ++i) { - if (chip->block_erasers[i].eraseblocks[0].size != size) { - chip->block_erasers[i].eraseblocks[0].count = 0; - chip->block_erasers[i].block_erase = NULL; - } else { - chip->block_erasers[i].eraseblocks[0].size = rom_size; - break; - } - } - if (i != NUM_ERASEFUNCTIONS) { - chip->total_size = rom_size / 1024; - if (chip->page_size > rom_size) - chip->page_size = rom_size; + /* Chip is small enough or already limited. */ + if (size <= rom_size) + return; + + /* Undefine all block_erasers that don't operate on the whole chip, + * and adjust the eraseblock size of those which do. + */ + for (i = 0; i < NUM_ERASEFUNCTIONS; ++i) { + if (chip->block_erasers[i].eraseblocks[0].size != size) { + chip->block_erasers[i].eraseblocks[0].count = 0; + chip->block_erasers[i].block_erase = NULL; } else { - msg_pdbg("Failed to adjust size of chip \"%s\" (%d kB).\n", chip->name, - chip->total_size); + chip->block_erasers[i].eraseblocks[0].size = rom_size; + usable_erasers++; } } - last_model_id = chip->model_id; + if (usable_erasers) { + chip->total_size = rom_size / 1024; + if (chip->page_size > rom_size) + chip->page_size = rom_size; + } else { + msg_pdbg("Failed to adjust size of chip \"%s\" (%d kB).\n", chip->name, chip->total_size); + } } int atapromise_init(void)

1 0

BIOS update using flashrom on an UEFI system
by Lakesh_Sharma＠DELL.com 18 Feb '16

18 Feb '16

In an UEFI based system (x86_64, Rangeley cpu), the bios bootup option shows each UEFI partition. Where as in legacy bios mode, the bios bootup menu would show just SSD, USB etc. In case of UEFI system, the boot-order, boot-current etc (i.e. UEFI config data) is stored in bios area ? When we update bios using flashrom, we are seeing that the UEFI config data is getting lost/over-written. Because of which, bios does not know that it is running on uefi system and probably tries to invoke grub using legacy way, which hangs. How can we instruct flashrom to not over-write UEFI config data in bios area. regards lakesh

2 1

Re: [flashrom] Problem with dumping my Bios FW
by Márton Miklós 18 Feb '16

18 Feb '16

Hello Marco, If I have found the correct schematic* the SPI flash is connected directly to the Intel PCH, and the EC is a IT8586E, so the flash should not be shared. You can bypass the laptop warning by running the flashrom with -p internal:laptop=force_I_want_a_brickoptions. ME will most likely trick you. Read operation should not cause any problems, but I cannot guarantee anything. You have been warned! *Intel Haswell Processor with DDRIII + Lynx point PCH nVIDIA N14P GT + 2nd VGA N14P GT Regards, Miklos 2016-02-18 22:42 keltezéssel, flashrom-request(a)flashrom.org írta: > Hi, > I downloaded your software because I would dump my BIOS firmware image. I > tried to use it using the internal programmer but the software replied me > with: > "WARNING! You seem to be running flashrom on an unsupported laptop. > Laptops, notebooks and netbooks are difficult to support and we > recommend to use the vendor flashing utility. The embedded controller > (EC) in these machines often interacts badly with flashing. > See the manpage and http://www.flashrom.org/Laptops for details. > > If flash is shared with the EC, erase is guaranteed to brick your laptop > and write may brick your laptop. > Read and probe may irritate your EC and cause fan failure, backlight > failure and sudden poweroff. > You have been warned." > I'm on a Lenovo Y510P and I'm running Ubuntu 15.10. How I have to configure > your software to dump my BIOS image? > I've already tried to contact someone on IRC channel but nobody replied me. > > Best regards > Marco Mancini >

1 0

Re: [flashrom] [PATCH 3/3] dediprog: port to libusb1 and use asynchronous bulk transfers for reading.
by Stefan Tauner 18 Feb '16

18 Feb '16

On Sun, 24 Jan 2016 23:50:20 +0100 Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> wrote: > This patch is based on Nico Huber's original version that was rebased > by David Hendricks for Chromium OS in > Change-Id: I84384b9d8ed53911657cf2293733531a6e11fd23 > > Signed-off-by: Nico Huber <nico.huber(a)secunet.com> > Signed-off-by: David Hendricks <dhendrix(a)chromium.org> > Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Self-acked and committed in r1929. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH 2/3] dediprog: use command 0x0B (set voltage) only on older SF100s.
by Stefan Tauner 18 Feb '16

18 Feb '16

On Sun, 24 Jan 2016 23:50:19 +0100 Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> wrote: > As per e-mail with Dediprog, command 0x0B (which is not listed in the > command spec) is used to set voltage level on older Dediprogs. SF100 > V6.0.0 and newer as well as all SF600 programmers do not support it. > > This patch renames dediprog_device_init() to something more > appropriate and adds comments for clarity, and only runs it > conditionally if we cannot query the devicestring initially. > > Based on ChromiumOS' > Change-Id: I42de7d28401d7ad5be8fcf8a8c165e2614a45960 > > Signed-off-by: David Hendricks <dhendrix(a)chromium.org> > Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Self-acked and committed in r1928. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH 1/3] dediprog: add support for SF600.
by Stefan Tauner 18 Feb '16

18 Feb '16

On Sun, 24 Jan 2016 23:50:18 +0100 Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> wrote: > This patch is based on a number of changes by David Woodhouse and > David Hendricks. > > SF600 uses two bulk endpoints, 1 for out and 2 for in unlike the > SF100 that uses only a single one. This patch make endpoint usage > more explicit and sets the in/out endpoint(s) appropriately for > SF100 and SF600. > > Also, change all SF100-specific strings in messages and. > leave standalone mode on SF600s. > > Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> > Signed-off-by: David Hendricks <dhendrix(a)chromium.org> > Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> I have committed this patch set in r1927ff. Please test it one hardware if you can soon-ish to make sure it ends up in 0.9.9 in a working state. Thanks! -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1929 - trunk
by repository service 18 Feb '16

18 Feb '16

Author: stefanct Date: Thu Feb 18 22:42:49 2016 New Revision: 1929 URL: http://flashrom.org/trac/flashrom/changeset/1929 Log: dediprog: port to libusb1 and use asynchronous bulk transfers for reading. This patch is based on Nico Huber's original version that was rebased by David Hendricks for Chromium OS in Change-Id: I84384b9d8ed53911657cf2293733531a6e11fd23 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/Makefile trunk/dediprog.c trunk/flashrom.8.tmpl trunk/pickit2_spi.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Thu Feb 18 22:42:41 2016 (r1928) +++ trunk/Makefile Thu Feb 18 22:42:49 2016 (r1929) @@ -742,7 +742,7 @@ ifeq ($(CONFIG_DEDIPROG), yes) FEATURE_CFLAGS += -D'CONFIG_DEDIPROG=1' PROGRAMMER_OBJS += dediprog.o -NEED_LIBUSB0 += CONFIG_DEDIPROG +NEED_LIBUSB1 += CONFIG_DEDIPROG endif ifeq ($(CONFIG_SATAMV), yes) Modified: trunk/dediprog.c ============================================================================== --- trunk/dediprog.c Thu Feb 18 22:42:41 2016 (r1928) +++ trunk/dediprog.c Thu Feb 18 22:42:49 2016 (r1929) @@ -26,25 +26,28 @@ #include <string.h> #include <limits.h> #include <errno.h> - -#if IS_WINDOWS -#include <lusb0_usb.h> -#else -#include <usb.h> -#endif - +#include <libusb.h> #include "flash.h" #include "chipdrivers.h" #include "programmer.h" #include "spi.h" +/* LIBUSB_CALL ensures the right calling conventions on libusb callbacks. + * However, the macro is not defined everywhere. m( + */ +#ifndef LIBUSB_CALL +#define LIBUSB_CALL +#endif + #define FIRMWARE_VERSION(x,y,z) ((x << 16) | (y << 8) | z) #define DEFAULT_TIMEOUT 3000 -#define REQTYPE_OTHER_OUT (USB_ENDPOINT_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER) /* 0x43 */ -#define REQTYPE_OTHER_IN (USB_ENDPOINT_IN | USB_TYPE_VENDOR | USB_RECIP_OTHER) /* 0xC3 */ -#define REQTYPE_EP_OUT (USB_ENDPOINT_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT) /* 0x42 */ -#define REQTYPE_EP_IN (USB_ENDPOINT_IN | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT) /* 0xC2 */ -static usb_dev_handle *dediprog_handle; +#define DEDIPROG_ASYNC_TRANSFERS 8 /* at most 8 asynchronous transfers */ +#define REQTYPE_OTHER_OUT (LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_OTHER) /* 0x43 */ +#define REQTYPE_OTHER_IN (LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_OTHER) /* 0xC3 */ +#define REQTYPE_EP_OUT (LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_ENDPOINT) /* 0x42 */ +#define REQTYPE_EP_IN (LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_ENDPOINT) /* 0xC2 */ +struct libusb_context *usb_ctx; +static libusb_device_handle *dediprog_handle; static int dediprog_in_endpoint; static int dediprog_out_endpoint; @@ -144,6 +147,22 @@ static int dediprog_firmwareversion = FIRMWARE_VERSION(0, 0, 0); enum dediprog_devtype dediprog_devicetype = DEV_UNKNOWN; +#if defined(LIBUSB_MAJOR) && defined(LIBUSB_MINOR) && defined(LIBUSB_MICRO) && \ + LIBUSB_MAJOR <= 1 && LIBUSB_MINOR == 0 && LIBUSB_MICRO < 9 +/* Quick and dirty replacement for missing libusb_error_name in libusb < 1.0.9 */ +const char * LIBUSB_CALL libusb_error_name(int error_code) +{ + if (error_code >= INT16_MIN && error_code <= INT16_MAX) { + /* 18 chars for text, rest for number (16 b should be enough), sign, nullbyte. */ + static char my_libusb_error[18 + 5 + 2]; + sprintf(my_libusb_error, "libusb error code %i", error_code); + return my_libusb_error; + } else { + return "UNKNOWN"; + } +} +#endif + /* Returns true if firmware (and thus hardware) supports the "new" protocol */ static bool is_new_prot(void) { @@ -157,35 +176,93 @@ } } +struct dediprog_transfer_status { + int error; /* OK if 0, ERROR else */ + unsigned int queued_idx; + unsigned int finished_idx; +}; + +static void LIBUSB_CALL dediprog_bulk_read_cb(struct libusb_transfer *const transfer) +{ + struct dediprog_transfer_status *const status = (struct dediprog_transfer_status *)transfer->user_data; + if (transfer->status != LIBUSB_TRANSFER_COMPLETED) { + status->error = 1; + msg_perr("SPI bulk read failed!\n"); + } + ++status->finished_idx; +} + +static int dediprog_bulk_read_poll(const struct dediprog_transfer_status *const status, const int finish) +{ + if (status->finished_idx >= status->queued_idx) + return 0; + + do { + struct timeval timeout = { 10, 0 }; + const int ret = libusb_handle_events_timeout(usb_ctx, &timeout); + if (ret < 0) { + msg_perr("Polling read events failed: %i %s!\n", ret, libusb_error_name(ret)); + return 1; + } + } while (finish && (status->finished_idx < status->queued_idx)); + return 0; +} + static int dediprog_read(enum dediprog_cmds cmd, unsigned int value, unsigned int idx, uint8_t *bytes, size_t size) { - return usb_control_msg(dediprog_handle, REQTYPE_EP_IN, cmd, value, idx, - (char *)bytes, size, DEFAULT_TIMEOUT); + return libusb_control_transfer(dediprog_handle, REQTYPE_EP_IN, cmd, value, idx, + (unsigned char *)bytes, size, DEFAULT_TIMEOUT); } static int dediprog_write(enum dediprog_cmds cmd, unsigned int value, unsigned int idx, const uint8_t *bytes, size_t size) { - return usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, cmd, value, idx, - (char *)bytes, size, DEFAULT_TIMEOUT); + return libusb_control_transfer(dediprog_handle, REQTYPE_EP_OUT, cmd, value, idx, + (unsigned char *)bytes, size, DEFAULT_TIMEOUT); } -/* Might be useful for other USB devices as well. static for now. */ -/* device parameter allows user to specify one device of multiple installed */ -static struct usb_device *get_device_by_vid_pid(uint16_t vid, uint16_t pid, unsigned int device) -{ - struct usb_bus *bus; - struct usb_device *dev; - - for (bus = usb_get_busses(); bus; bus = bus->next) - for (dev = bus->devices; dev; dev = dev->next) - if ((dev->descriptor.idVendor == vid) && - (dev->descriptor.idProduct == pid)) { - if (device == 0) - return dev; - device--; + +/* Might be useful for other USB devices as well. static for now. + * num parameter allows user to specify one device of multiple installed */ +static struct libusb_device_handle *get_device_by_vid_pid_number(uint16_t vid, uint16_t pid, unsigned int num) +{ + struct libusb_device **list; + ssize_t count = libusb_get_device_list(usb_ctx, &list); + if (count < 0) { + msg_perr("Getting the USB device list failed (%s)!\n", libusb_error_name(count)); + return NULL; + } + + struct libusb_device_handle *handle = NULL; + ssize_t i = 0; + for (i = 0; i < count; i++) { + struct libusb_device *dev = list[i]; + struct libusb_device_descriptor desc; + int err = libusb_get_device_descriptor(dev, &desc); + if (err != 0) { + msg_perr("Reading the USB device descriptor failed (%s)!\n", libusb_error_name(err)); + libusb_free_device_list(list, 1); + return NULL; + } + if ((desc.idVendor == vid) && (desc.idProduct == pid)) { + msg_pdbg("Found USB device %04"PRIx16":%04"PRIx16" at address %d-%d.\n", + desc.idVendor, desc.idProduct, + libusb_get_bus_number(dev), libusb_get_device_address(dev)); + if (num == 0) { + err = libusb_open(dev, &handle); + if (err != 0) { + msg_perr("Opening the USB device failed (%s)!\n", + libusb_error_name(err)); + libusb_free_device_list(list, 1); + return NULL; + } + break; } + num--; + } + } + libusb_free_device_list(list, 1); - return NULL; + return handle; } /* This function sets the GPIOs connected to the LEDs as well as IO1-IO4. */ @@ -219,7 +296,7 @@ } if (ret != 0x0) { - msg_perr("Command Set LED 0x%x failed (%s)!\n", leds, usb_strerror()); + msg_perr("Command Set LED 0x%x failed (%s)!\n", leds, libusb_error_name(ret)); return 1; } @@ -332,10 +409,16 @@ */ static int dediprog_spi_bulk_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { + int err = 1; + /* chunksize must be 512, other sizes will NOT work at all. */ const unsigned int chunksize = 512; const unsigned int count = len / chunksize; + struct dediprog_transfer_status status = { 0, 0, 0 }; + struct libusb_transfer *transfers[DEDIPROG_ASYNC_TRANSFERS] = { NULL, }; + struct libusb_transfer *transfer; + if ((start % chunksize) || (len % chunksize)) { msg_perr("%s: Unaligned start=%i, len=%i! Please report a bug at flashrom(a)flashrom.org\n", __func__, start, len); @@ -352,23 +435,59 @@ int ret = dediprog_write(CMD_READ, value, idx, data_packet, sizeof(data_packet)); if (ret != sizeof(data_packet)) { - msg_perr("Command Read SPI Bulk failed, %i %s!\n", ret, usb_strerror()); + msg_perr("Command Read SPI Bulk failed, %i %s!\n", ret, libusb_error_name(ret)); return 1; } + /* + * Ring buffer of bulk transfers. + * Poll until at least one transfer is ready, + * schedule next transfers until buffer is full. + */ + + /* Allocate bulk transfers. */ unsigned int i; - for (i = 0; i < count; i++) { - ret = usb_bulk_read(dediprog_handle, 0x80 | dediprog_in_endpoint, - (char *)buf + i * chunksize, chunksize, - DEFAULT_TIMEOUT); - if (ret != chunksize) { - msg_perr("SPI bulk read %i failed, expected %i, got %i %s!\n", - i, chunksize, ret, usb_strerror()); - return 1; + for (i = 0; i < min(DEDIPROG_ASYNC_TRANSFERS, count); ++i) { + transfers[i] = libusb_alloc_transfer(0); + if (!transfers[i]) { + msg_perr("Allocating libusb transfer %i failed: %s!\n", i, libusb_error_name(ret)); + goto err_free; + } + } + + /* Now transfer requested chunks using libusb's asynchronous interface. */ + while (!status.error && (status.queued_idx < count)) { + while ((status.queued_idx - status.finished_idx) < DEDIPROG_ASYNC_TRANSFERS) { + transfer = transfers[status.queued_idx % DEDIPROG_ASYNC_TRANSFERS]; + libusb_fill_bulk_transfer(transfer, dediprog_handle, 0x80 | dediprog_in_endpoint, + (unsigned char *)buf + status.queued_idx * chunksize, chunksize, + dediprog_bulk_read_cb, &status, DEFAULT_TIMEOUT); + transfer->flags |= LIBUSB_TRANSFER_SHORT_NOT_OK; + ret = libusb_submit_transfer(transfer); + if (ret < 0) { + msg_perr("Submitting SPI bulk read %i failed: %s!\n", + status.queued_idx, libusb_error_name(ret)); + goto err_free; + } + ++status.queued_idx; } + if (dediprog_bulk_read_poll(&status, 0)) + goto err_free; } - - return 0; + /* Wait for transfers to finish. */ + if (dediprog_bulk_read_poll(&status, 1)) + goto err_free; + /* Check if everything has been transmitted. */ + if ((status.finished_idx < count) || status.error) + goto err_free; + + err = 0; + +err_free: + dediprog_bulk_read_poll(&status, 1); + for (i = 0; i < DEDIPROG_ASYNC_TRANSFERS; ++i) + if (transfers[i]) libusb_free_transfer(transfers[i]); + return err; } static int dediprog_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) @@ -455,19 +574,20 @@ fill_rw_cmd_payload(data_packet, count, dedi_spi_cmd, &value, &idx, start); int ret = dediprog_write(CMD_WRITE, value, idx, data_packet, sizeof(data_packet)); if (ret != sizeof(data_packet)) { - msg_perr("Command Write SPI Bulk failed, %i %s!\n", ret, - usb_strerror()); + msg_perr("Command Write SPI Bulk failed, %s!\n", libusb_error_name(ret)); return 1; } unsigned int i; for (i = 0; i < count; i++) { - char usbbuf[512]; + unsigned char usbbuf[512]; memcpy(usbbuf, buf + i * chunksize, chunksize); memset(usbbuf + chunksize, 0xff, sizeof(usbbuf) - chunksize); // fill up with 0xFF - ret = usb_bulk_write(dediprog_handle, dediprog_out_endpoint, usbbuf, 512, DEFAULT_TIMEOUT); - if (ret != 512) { - msg_perr("SPI bulk write failed, expected %i, got %i %s!\n", 512, ret, usb_strerror()); + int transferred; + ret = libusb_bulk_transfer(dediprog_handle, dediprog_out_endpoint, usbbuf, 512, &transferred, + DEFAULT_TIMEOUT); + if ((ret < 0) || (transferred != 512)) { + msg_perr("SPI bulk write failed, expected %i, got %s!\n", 512, libusb_error_name(ret)); return 1; } } @@ -568,7 +688,7 @@ ret = dediprog_write(CMD_TRANSCEIVE, value, idx, writearr, writecnt); if (ret != writecnt) { msg_perr("Send SPI failed, expected %i, got %i %s!\n", - writecnt, ret, usb_strerror()); + writecnt, ret, libusb_error_name(ret)); return 1; } if (readcnt == 0) // If we don't require a response, we are done here @@ -584,7 +704,7 @@ } ret = dediprog_read(CMD_TRANSCEIVE, value, idx, readarr, readcnt); if (ret != readcnt) { - msg_perr("Receive SPI failed, expected %i, got %i %s!\n", readcnt, ret, usb_strerror()); + msg_perr("Receive SPI failed, expected %i, got %i %s!\n", readcnt, ret, libusb_error_name(ret)); return 1; } return 0; @@ -640,11 +760,11 @@ * than V6.0.0. Newer programmers (including all SF600s) do not support it. */ static int dediprog_set_voltage(void) { - char buf[1] = {0}; - int ret = usb_control_msg(dediprog_handle, REQTYPE_OTHER_IN, CMD_SET_VOLTAGE, 0x0, 0x0, + unsigned char buf[1] = {0}; + int ret = libusb_control_transfer(dediprog_handle, REQTYPE_OTHER_IN, CMD_SET_VOLTAGE, 0x0, 0x0, buf, 0x1, DEFAULT_TIMEOUT); if (ret < 0) { - msg_perr("Command Set Voltage failed (%s)!\n", usb_strerror()); + msg_perr("Command Set Voltage failed (%s)!\n", libusb_error_name(ret)); return 1; } if ((ret != 1) || (buf[0] != 0x6f)) { @@ -665,7 +785,7 @@ msg_pdbg2("Disabling standalone mode.\n"); ret = dediprog_write(CMD_SET_STANDALONE, LEAVE_STANDALONE_MODE, 0, NULL, 0); if (ret) { - msg_perr("Failed to disable standalone mode: %s\n", usb_strerror()); + msg_perr("Failed to disable standalone mode: %s\n", libusb_error_name(ret)); return 1; } @@ -685,7 +805,7 @@ ret = usb_control_msg(dediprog_handle, REQTYPE_OTHER_IN, 0x7, 0x0, 0xef00, buf, 0x3, DEFAULT_TIMEOUT); if (ret < 0) { - msg_perr("Command B failed (%s)!\n", usb_strerror()); + msg_perr("Command B failed (%s)!\n", libusb_error_name(ret)); return 1; } if ((ret != 0x3) || (buf[0] != 0xff) || (buf[1] != 0xff) || @@ -700,10 +820,9 @@ static int set_target_flash(enum dediprog_target target) { - int ret = usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, CMD_SET_TARGET, target, 0, - NULL, 0, DEFAULT_TIMEOUT); + int ret = dediprog_write(CMD_SET_TARGET, target, 0, NULL, 0); if (ret != 0) { - msg_perr("set_target_flash failed (%s)!\n", usb_strerror()); + msg_perr("set_target_flash failed (%s)!\n", libusb_error_name(ret)); return 1; } return 0; @@ -717,7 +836,7 @@ int ret = usb_control_msg(dediprog_handle, REQTYPE_EP_IN, CMD_GET_BUTTON, 0, 0, buf, 0x1, DEFAULT_TIMEOUT); if (ret != 0) { - msg_perr("Could not get button state (%s)!\n", usb_strerror()); + msg_perr("Could not get button state (%s)!\n", libusb_error_name(ret)); return 1; } return buf[0] != 1; @@ -792,20 +911,18 @@ if (dediprog_set_spi_voltage(0x0)) return 1; - if (usb_release_interface(dediprog_handle, 0)) { + if (libusb_release_interface(dediprog_handle, 0)) { msg_perr("Could not release USB interface!\n"); return 1; } - if (usb_close(dediprog_handle)) { - msg_perr("Could not close USB device!\n"); - return 1; - } + libusb_close(dediprog_handle); + libusb_exit(usb_ctx); + return 0; } int dediprog_init(void) { - struct usb_device *dev; char *voltage, *device, *spispeed, *target_str; int spispeed_idx = 1; int millivolt = 3500; @@ -887,35 +1004,29 @@ free(target_str); /* Here comes the USB stuff. */ - usb_init(); - usb_find_busses(); - usb_find_devices(); - dev = get_device_by_vid_pid(0x0483, 0xdada, (unsigned int) usedevice); - if (!dev) { - msg_perr("Could not find a Dediprog SF100 on USB!\n"); + libusb_init(&usb_ctx); + if (!usb_ctx) { + msg_perr("Could not initialize libusb!\n"); return 1; } - msg_pdbg("Found USB device (%04x:%04x).\n", - dev->descriptor.idVendor, dev->descriptor.idProduct); - dediprog_handle = usb_open(dev); + dediprog_handle = get_device_by_vid_pid_number(0x0483, 0xdada, (unsigned int) usedevice); if (!dediprog_handle) { - msg_perr("Could not find a Dediprog programmer on USB: %s\n", usb_strerror()); + msg_perr("Could not find a Dediprog programmer on USB.\n"); + libusb_exit(usb_ctx); return 1; } - ret = usb_set_configuration(dediprog_handle, 1); - if (ret < 0) { - msg_perr("Could not set USB device configuration: %i %s\n", - ret, usb_strerror()); - if (usb_close(dediprog_handle)) - msg_perr("Could not close USB device!\n"); + ret = libusb_set_configuration(dediprog_handle, 1); + if (ret != 0) { + msg_perr("Could not set USB device configuration: %i %s\n", ret, libusb_error_name(ret)); + libusb_close(dediprog_handle); + libusb_exit(usb_ctx); return 1; } - ret = usb_claim_interface(dediprog_handle, 0); + ret = libusb_claim_interface(dediprog_handle, 0); if (ret < 0) { - msg_perr("Could not claim USB device interface %i: %i %s\n", - 0, ret, usb_strerror()); - if (usb_close(dediprog_handle)) - msg_perr("Could not close USB device!\n"); + msg_perr("Could not claim USB device interface %i: %i %s\n", 0, ret, libusb_error_name(ret)); + libusb_close(dediprog_handle); + libusb_exit(usb_ctx); return 1; } @@ -959,4 +1070,3 @@ return 0; } - Modified: trunk/flashrom.8.tmpl ============================================================================== --- trunk/flashrom.8.tmpl Thu Feb 18 22:42:41 2016 (r1928) +++ trunk/flashrom.8.tmpl Thu Feb 18 22:42:49 2016 (r1929) @@ -1082,11 +1082,11 @@ .B buspirate_spi needs userspace access to a serial port. .sp -.BR dediprog ", " ft2232_spi ", " usbblaster_spi " and " pickit2_spi +.BR ft2232_spi ", " usbblaster_spi " and " pickit2_spi need access to the respective USB device via libusb API version 0.1. .sp -.BR ch341a_spi -needs access to the respective USB device via libusb API version 1.0. +.BR ch341a_spi " and " dediprog +need access to the respective USB device via libusb API version 1.0. .sp .B dummy needs no access permissions at all. Modified: trunk/pickit2_spi.c ============================================================================== --- trunk/pickit2_spi.c Thu Feb 18 22:42:41 2016 (r1928) +++ trunk/pickit2_spi.c Thu Feb 18 22:42:49 2016 (r1929) @@ -95,9 +95,8 @@ #define SCR_VDD_OFF 0xFE #define SCR_VDD_ON 0xFF -/* Copied from dediprog.c */ -/* Might be useful for other USB devices as well. static for now. */ -/* device parameter allows user to specify one device of multiple installed */ +/* Might be useful for other USB devices as well. static for now. + * device parameter allows user to specify one device of multiple installed */ static struct usb_device *get_device_by_vid_pid(uint16_t vid, uint16_t pid, unsigned int device) { struct usb_bus *bus;

1 0

[commit] r1928 - trunk
by repository service 18 Feb '16

18 Feb '16

Author: stefanct Date: Thu Feb 18 22:42:41 2016 New Revision: 1928 URL: http://flashrom.org/trac/flashrom/changeset/1928 Log: dediprog: use command 0x0B (set voltage) only on older SF100s. As per e-mail with Dediprog, command 0x0B (which is not listed in the command spec) is need on older Dediprogs only. SF100 with firmware V6.0.0 and newer as well as all SF600 programmers do not support it. The original wording by Dediprog was: "0x0B is used to adjust voltage level, but it's available for some version of SF100 only. SF100 of firmware V6.x.x and all version of SF600/SF600Plus not support this command. If you have old version of SF100, 0x0B is still needed." This patch renames dediprog_device_init() to something more appropriate and adds comments for clarity, and only runs it conditionally if we cannot query the devicestring initially. Based on ChromiumOS' Change-Id: I42de7d28401d7ad5be8fcf8a8c165e2614a45960 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/dediprog.c Modified: trunk/dediprog.c ============================================================================== --- trunk/dediprog.c Thu Feb 18 22:42:15 2016 (r1927) +++ trunk/dediprog.c Thu Feb 18 22:42:41 2016 (r1928) @@ -82,6 +82,7 @@ CMD_READ_PROG_INFO = 0x08, CMD_SET_VCC = 0x09, CMD_SET_STANDALONE = 0x0A, + CMD_SET_VOLTAGE = 0x0B, /* Only in firmware older than 6.0.0 */ CMD_GET_BUTTON = 0x11, CMD_GET_UID = 0x12, CMD_SET_CS = 0x14, @@ -628,22 +629,29 @@ return 0; } -static int dediprog_device_init(void) -{ - int ret; - char buf[0x1]; +/* + * This command presumably sets the voltage for the SF100 itself (not the + * SPI flash). Only use this command with firmware older than V6.0.0. Newer + * (including all SF600s) do not support it. + */ - memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, REQTYPE_OTHER_IN, 0x0B, 0x0, 0x0, +/* This command presumably sets the voltage for the SF100 itself (not the SPI flash). + * Only use dediprog_set_voltage on SF100 programmers with firmware older + * than V6.0.0. Newer programmers (including all SF600s) do not support it. */ +static int dediprog_set_voltage(void) +{ + char buf[1] = {0}; + int ret = usb_control_msg(dediprog_handle, REQTYPE_OTHER_IN, CMD_SET_VOLTAGE, 0x0, 0x0, buf, 0x1, DEFAULT_TIMEOUT); if (ret < 0) { - msg_perr("Command A failed (%s)!\n", usb_strerror()); + msg_perr("Command Set Voltage failed (%s)!\n", usb_strerror()); return 1; } - if ((ret != 0x1) || (buf[0] != 0x6f)) { + if ((ret != 1) || (buf[0] != 0x6f)) { msg_perr("Unexpected response to init!\n"); return 1; } + return 0; } @@ -914,11 +922,14 @@ if (register_shutdown(dediprog_shutdown, NULL)) return 1; - /* Perform basic setup. */ - if (dediprog_device_init()) - return 1; - if (dediprog_check_devicestring()) - return 1; + /* Try reading the devicestring. If that fails and the device is old (FW < 6.0.0, which we can not know) + * then we need to try the "set voltage" command and then attempt to read the devicestring again. */ + if (dediprog_check_devicestring()) { + if (dediprog_set_voltage()) + return 1; + if (dediprog_check_devicestring()) + return 1; + } /* SF100 only has 1 endpoint for in/out, SF600 uses two separate endpoints instead. */ dediprog_in_endpoint = 2;

1 0

[commit] r1927 - trunk
by repository service 18 Feb '16

18 Feb '16

Author: stefanct Date: Thu Feb 18 22:42:15 2016 New Revision: 1927 URL: http://flashrom.org/trac/flashrom/changeset/1927 Log: dediprog: add support for SF600. This patch is based on a number of changes by David Woodhouse and David Hendricks. SF600 uses two bulk endpoints, 1 for out and 2 for in unlike the SF100 that uses only a single one. This patch make endpoint usage more explicit and sets the in/out endpoint(s) appropriately for SF100 and SF600. Also, change all SF100-specific strings in messages and leave standalone mode on SF600s. Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/dediprog.c Modified: trunk/dediprog.c ============================================================================== --- trunk/dediprog.c Wed Feb 17 23:25:12 2016 (r1926) +++ trunk/dediprog.c Thu Feb 18 22:42:15 2016 (r1927) @@ -45,7 +45,14 @@ #define REQTYPE_EP_OUT (USB_ENDPOINT_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT) /* 0x42 */ #define REQTYPE_EP_IN (USB_ENDPOINT_IN | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT) /* 0xC2 */ static usb_dev_handle *dediprog_handle; -static int dediprog_endpoint; +static int dediprog_in_endpoint; +static int dediprog_out_endpoint; + +enum dediprog_devtype { + DEV_UNKNOWN = 0, + DEV_SF100 = 100, + DEV_SF600 = 600, +}; enum dediprog_leds { LED_INVALID = -1, @@ -127,16 +134,26 @@ WRITE_MODE_4B_ADDR_256B_PAGE_PGM_FLAGS = 12, }; +enum dediprog_standalone_mode { + ENTER_STANDALONE_MODE = 0, + LEAVE_STANDALONE_MODE = 1, +}; + static int dediprog_firmwareversion = FIRMWARE_VERSION(0, 0, 0); +enum dediprog_devtype dediprog_devicetype = DEV_UNKNOWN; /* Returns true if firmware (and thus hardware) supports the "new" protocol */ static bool is_new_prot(void) { - /* if (SF100) */ - return dediprog_firmwareversion >= FIRMWARE_VERSION(5, 5, 0); - /* else if (SF600) - return dediprog_firmwareversion >= FIRMWARE_VERSION(6, 9, 0); */ + switch (dediprog_devicetype) { + case DEV_SF100: + return dediprog_firmwareversion >= FIRMWARE_VERSION(5, 5, 0); + case DEV_SF600: + return dediprog_firmwareversion >= FIRMWARE_VERSION(6, 9, 0); + default: + return 0; + } } static int dediprog_read(enum dediprog_cmds cmd, unsigned int value, unsigned int idx, uint8_t *bytes, size_t size) @@ -340,7 +357,7 @@ unsigned int i; for (i = 0; i < count; i++) { - ret = usb_bulk_read(dediprog_handle, 0x80 | dediprog_endpoint, + ret = usb_bulk_read(dediprog_handle, 0x80 | dediprog_in_endpoint, (char *)buf + i * chunksize, chunksize, DEFAULT_TIMEOUT); if (ret != chunksize) { @@ -447,7 +464,7 @@ char usbbuf[512]; memcpy(usbbuf, buf + i * chunksize, chunksize); memset(usbbuf + chunksize, 0xff, sizeof(usbbuf) - chunksize); // fill up with 0xFF - ret = usb_bulk_write(dediprog_handle, dediprog_endpoint, usbbuf, 512, DEFAULT_TIMEOUT); + ret = usb_bulk_write(dediprog_handle, dediprog_out_endpoint, usbbuf, 512, DEFAULT_TIMEOUT); if (ret != 512) { msg_perr("SPI bulk write failed, expected %i, got %i %s!\n", 512, ret, usb_strerror()); return 1; @@ -575,7 +592,6 @@ static int dediprog_check_devicestring(void) { int ret; - int fw[3]; char buf[0x11]; /* Command Receive Device String. */ @@ -586,16 +602,24 @@ } buf[0x10] = '\0'; msg_pdbg("Found a %s\n", buf); - if (memcmp(buf, "SF100", 0x5) != 0) { - msg_perr("Device not a SF100!\n"); + if (memcmp(buf, "SF100", 0x5) == 0) + dediprog_devicetype = DEV_SF100; + else if (memcmp(buf, "SF600", 0x5) == 0) + dediprog_devicetype = DEV_SF600; + else { + msg_perr("Device not a SF100 or SF600!\n"); return 1; } - if (sscanf(buf, "SF100 V:%d.%d.%d ", &fw[0], &fw[1], &fw[2]) != 3) { + + int sfnum; + int fw[3]; + if (sscanf(buf, "SF%d V:%d.%d.%d ", &sfnum, &fw[0], &fw[1], &fw[2]) != 4 || + sfnum != dediprog_devicetype) { msg_perr("Unexpected firmware version string '%s'\n", buf); return 1; } /* Only these major versions were tested. */ - if (fw[0] < 2 || fw[0] > 6) { + if (fw[0] < 2 || fw[0] > 7) { msg_perr("Unexpected firmware version %d.%d.%d!\n", fw[0], fw[1], fw[2]); return 1; } @@ -623,6 +647,23 @@ return 0; } +static int dediprog_standalone_mode(void) +{ + int ret; + + if (dediprog_devicetype != DEV_SF600) + return 0; + + msg_pdbg2("Disabling standalone mode.\n"); + ret = dediprog_write(CMD_SET_STANDALONE, LEAVE_STANDALONE_MODE, 0, NULL, 0); + if (ret) { + msg_perr("Failed to disable standalone mode: %s\n", usb_strerror()); + return 1; + } + + return 0; +} + #if 0 /* Something. * Present in eng_detect_blink.log with firmware 3.1.8 @@ -737,6 +778,7 @@ static int dediprog_shutdown(void *data) { dediprog_firmwareversion = FIRMWARE_VERSION(0, 0, 0); + dediprog_devicetype = DEV_UNKNOWN; /* URB 28. Command Set SPI Voltage to 0. */ if (dediprog_set_spi_voltage(0x0)) @@ -849,7 +891,7 @@ dev->descriptor.idVendor, dev->descriptor.idProduct); dediprog_handle = usb_open(dev); if (!dediprog_handle) { - msg_perr("Could not open USB device: %s\n", usb_strerror()); + msg_perr("Could not find a Dediprog programmer on USB: %s\n", usb_strerror()); return 1; } ret = usb_set_configuration(dediprog_handle, 1); @@ -868,7 +910,6 @@ msg_perr("Could not close USB device!\n"); return 1; } - dediprog_endpoint = 2; if (register_shutdown(dediprog_shutdown, NULL)) return 1; @@ -879,6 +920,13 @@ if (dediprog_check_devicestring()) return 1; + /* SF100 only has 1 endpoint for in/out, SF600 uses two separate endpoints instead. */ + dediprog_in_endpoint = 2; + if (dediprog_devicetype == DEV_SF100) + dediprog_out_endpoint = 2; + else + dediprog_out_endpoint = 1; + /* Set all possible LEDs as soon as possible to indicate activity. * Because knowing the firmware version is required to set the LEDs correctly we need to this after * dediprog_check_devicestring() has queried the device and set dediprog_firmwareversion. */ @@ -892,6 +940,9 @@ return 1; } + if (dediprog_standalone_mode()) + return 1; + if (register_spi_master(&spi_master_dediprog) || dediprog_set_leds(LED_NONE)) return 1;

1 0

[PATCH] fix chip size limiting in atapromise
by Carl-Daniel Hailfinger 18 Feb '16

18 Feb '16

Atapromise chip size limiting has two bugs I didn't catch during review, but only in the moment of commit. The current code is checking model_id to remember if a chip has already been limited, but if flashchips.c contains two subsequent chips with different vendor_id but identical model_id the adjustment will not be done. Switch to checking the chip size instead. If a chip has multiple whole-chip erase functions, only one will be modified. Fix that. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-atapromise_fix_limit_chip/atapromise.c =================================================================== --- flashrom-atapromise_fix_limit_chip/atapromise.c (Revision 1916) +++ flashrom-atapromise_fix_limit_chip/atapromise.c (Arbeitskopie) @@ -79,38 +79,35 @@ static void atapromise_limit_chip(struct flashchip *chip) { - static uint32_t last_model_id = 0; unsigned int i, size; + unsigned int usable_erasers = 0; - if (chip->model_id == last_model_id) - return; - size = chip->total_size * 1024; - if (size > rom_size) { - /* Undefine all block_erasers that don't operate on the whole chip, - * and adjust the eraseblock size of the one that does. - */ - for (i = 0; i < NUM_ERASEFUNCTIONS; ++i) { - if (chip->block_erasers[i].eraseblocks[0].size != size) { - chip->block_erasers[i].eraseblocks[0].count = 0; - chip->block_erasers[i].block_erase = NULL; - } else { - chip->block_erasers[i].eraseblocks[0].size = rom_size; - break; - } - } - if (i != NUM_ERASEFUNCTIONS) { - chip->total_size = rom_size / 1024; - if (chip->page_size > rom_size) - chip->page_size = rom_size; + /* Chip is small enough or already limited. */ + if (size <= rom_size) + return; + + /* Undefine all block_erasers that don't operate on the whole chip, + * and adjust the eraseblock size of those which do. + */ + for (i = 0; i < NUM_ERASEFUNCTIONS; ++i) { + if (chip->block_erasers[i].eraseblocks[0].size != size) { + chip->block_erasers[i].eraseblocks[0].count = 0; + chip->block_erasers[i].block_erase = NULL; } else { - msg_pdbg("Failed to adjust size of chip \"%s\" (%d kB).\n", chip->name, - chip->total_size); + chip->block_erasers[i].eraseblocks[0].size = rom_size; + usable_erasers++; } } - last_model_id = chip->model_id; + if (usable_erasers) { + chip->total_size = rom_size / 1024; + if (chip->page_size > rom_size) + chip->page_size = rom_size; + } else { + msg_pdbg("Failed to adjust size of chip \"%s\" (%d kB).\n", chip->name, chip->total_size); + } } int atapromise_init(void)

3 2

[PATCH] Makefile: fix overriding of make command line arguments.
by Stefan Tauner 18 Feb '16

18 Feb '16

Command line arguments given when executing make should not stop us from setting commonly user-configurable variables like CPPFLAGS or LDFLAGS. Without this patch 'make CPPFLAGS="-Ifail"' would fail to find libusb1 headers and abort. Add override statements where we append mandatory options to these variables to make (Debian) packagers more happy. Also, r1920 introduced some explicit calls to pkg-config instead of $(PKG_CONFIG). This patch corrects that as well. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- Makefile | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 11888d5..4d6b40f 100644 --- a/Makefile +++ b/Makefile @@ -67,14 +67,14 @@ CFLAGS += -Werror endif ifdef LIBS_BASE -CPPFLAGS += -I$(LIBS_BASE)/include -LDFLAGS += -L$(LIBS_BASE)/lib -Wl,-rpath -Wl,$(LIBS_BASE)/lib PKG_CONFIG_LIBDIR ?= $(LIBS_BASE)/lib/pkgconfig +override CPPFLAGS += -I$(LIBS_BASE)/include +override LDFLAGS += -L$(LIBS_BASE)/lib -Wl,-rpath -Wl,$(LIBS_BASE)/lib endif ifeq ($(CONFIG_STATIC),yes) -PKG_CONFIG += --static -LDFLAGS += -static +override PKG_CONFIG += --static +override LDFLAGS += -static endif # Set LC_ALL=C to minimize influences of the locale. @@ -112,28 +112,28 @@ endif override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) ifeq ($(TARGET_OS), Darwin) -CPPFLAGS += -I/opt/local/include -I/usr/local/include -LDFLAGS += -L/opt/local/lib -L/usr/local/lib +override CPPFLAGS += -I/opt/local/include -I/usr/local/include +override LDFLAGS += -L/opt/local/lib -L/usr/local/lib endif ifeq ($(TARGET_OS), FreeBSD) -CPPFLAGS += -I/usr/local/include -LDFLAGS += -L/usr/local/lib +override CPPFLAGS += -I/usr/local/include +override LDFLAGS += -L/usr/local/lib endif ifeq ($(TARGET_OS), OpenBSD) -CPPFLAGS += -I/usr/local/include -LDFLAGS += -L/usr/local/lib +override CPPFLAGS += -I/usr/local/include +override LDFLAGS += -L/usr/local/lib endif ifeq ($(TARGET_OS), NetBSD) -CPPFLAGS += -I/usr/pkg/include -LDFLAGS += -L/usr/pkg/lib +override CPPFLAGS += -I/usr/pkg/include +override LDFLAGS += -L/usr/pkg/lib endif ifeq ($(TARGET_OS), DragonFlyBSD) -CPPFLAGS += -I/usr/local/include -LDFLAGS += -L/usr/local/lib +override CPPFLAGS += -I/usr/local/include +override LDFLAGS += -L/usr/local/lib endif ifeq ($(TARGET_OS), DOS) @@ -821,11 +821,11 @@ ifeq ($(TARGET_OS),$(filter $(TARGET_OS),FreeBSD DragonFlyBSD)) USB1LIBS += -lusb else ifeq ($(TARGET_OS),NetBSD) -CPPFLAGS += -I/usr/pkg/include/libusb-1.0 +override CPPFLAGS += -I/usr/pkg/include/libusb-1.0 USB1LIBS += -lusb-1.0 else -USB1LIBS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; pkg-config --libs libusb-1.0 || printf "%s" "-lusb-1.0") -CPPFLAGS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; pkg-config --cflags-only-I libusb-1.0 || printf "%s" "-I/usr/include/libusb-1.0") +USB1LIBS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; $(PKG_CONFIG) --libs libusb-1.0 || printf "%s" "-lusb-1.0") +override CPPFLAGS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; $(PKG_CONFIG) --cflags-only-I libusb-1.0 || printf "%s" "-I/usr/include/libusb-1.0") endif endif endif -- Kind regards, Stefan Tauner

1 0

[PATCH] List affected features for missing libraries
by Carl-Daniel Hailfinger 17 Feb '16

17 Feb '16

List affected features for missing libraries If libpci, libusb0 or libusb1 are missing, make will now tell you which currently enabled features require those libraries. Example output: Checking for libusb-0.1/libusb-compat headers... not found. The following features require libusb-0.1/libusb-compat: CONFIG_PICKIT2_SPI CONFIG_DEDIPROG. Please install libusb-0.1 headers or libusb-compat headers. See README for more information. A followup patch will allow blanket disabling of all affected features. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-libpci_libusb_report_requirements/Makefile =================================================================== --- flashrom-libpci_libusb_report_requirements/Makefile (Revision 1924) +++ flashrom-libpci_libusb_report_requirements/Makefile (Arbeitskopie) @@ -586,7 +586,7 @@ endif else endif -NEED_PCI := yes +NEED_PCI += CONFIG_INTERNAL endif ifeq ($(CONFIG_SERPROG), yes) @@ -600,7 +600,7 @@ FEATURE_CFLAGS += -D'CONFIG_RAYER_SPI=1' PROGRAMMER_OBJS += rayer_spi.o # Actually, NEED_PCI is wrong. NEED_IOPORT_ACCESS would be more correct. -NEED_PCI := yes +NEED_PCI += CONFIG_RAYER_SPI endif ifeq ($(CONFIG_PONY_SPI), yes) @@ -617,43 +617,43 @@ ifeq ($(CONFIG_NIC3COM), yes) FEATURE_CFLAGS += -D'CONFIG_NIC3COM=1' PROGRAMMER_OBJS += nic3com.o -NEED_PCI := yes +NEED_PCI += CONFIG_NIC3COM endif ifeq ($(CONFIG_GFXNVIDIA), yes) FEATURE_CFLAGS += -D'CONFIG_GFXNVIDIA=1' PROGRAMMER_OBJS += gfxnvidia.o -NEED_PCI := yes +NEED_PCI += CONFIG_GFXNVIDIA endif ifeq ($(CONFIG_SATASII), yes) FEATURE_CFLAGS += -D'CONFIG_SATASII=1' PROGRAMMER_OBJS += satasii.o -NEED_PCI := yes +NEED_PCI += CONFIG_SATASII endif ifeq ($(CONFIG_ATAHPT), yes) FEATURE_CFLAGS += -D'CONFIG_ATAHPT=1' PROGRAMMER_OBJS += atahpt.o -NEED_PCI := yes +NEED_PCI += CONFIG_ATAHPT endif ifeq ($(CONFIG_ATAVIA), yes) FEATURE_CFLAGS += -D'CONFIG_ATAVIA=1' PROGRAMMER_OBJS += atavia.o -NEED_PCI := yes +NEED_PCI += CONFIG_ATAVIA endif ifeq ($(CONFIG_ATAPROMISE), yes) FEATURE_CFLAGS += -D'CONFIG_ATAPROMISE=1' PROGRAMMER_OBJS += atapromise.o -NEED_PCI := yes +NEED_PCI += CONFIG_ATAPROMISE endif ifeq ($(CONFIG_IT8212), yes) FEATURE_CFLAGS += -D'CONFIG_IT8212=1' PROGRAMMER_OBJS += it8212.o -NEED_PCI := yes +NEED_PCI += CONFIG_IT8212 endif ifeq ($(CONFIG_FT2232_SPI), yes) @@ -673,7 +673,7 @@ ifeq ($(CONFIG_PICKIT2_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_PICKIT2_SPI=1' PROGRAMMER_OBJS += pickit2_spi.o -NEED_USB := yes +NEED_LIBUSB0 += CONFIG_PICKIT2_SPI endif ifeq ($(NEED_FTDI), yes) @@ -682,7 +682,7 @@ FTDI_INCLUDES := $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" ; $(PKG_CONFIG) --cflags-only-I libftdi1) FEATURE_CFLAGS += $(FTDI_INCLUDES) FEATURE_LIBS += $(call debug_shell,grep -q "FTDISUPPORT := yes" .features && printf "%s" "$(FTDILIBS)") -# We can't set NEED_USB here because that would transform libftdi auto-enabling +# We can't set NEED_LIBUSB0 here because that would transform libftdi auto-enabling # into a hard requirement for libusb, defeating the purpose of auto-enabling. endif @@ -694,43 +694,43 @@ ifeq ($(CONFIG_DRKAISER), yes) FEATURE_CFLAGS += -D'CONFIG_DRKAISER=1' PROGRAMMER_OBJS += drkaiser.o -NEED_PCI := yes +NEED_PCI += CONFIG_DRKAISER endif ifeq ($(CONFIG_NICREALTEK), yes) FEATURE_CFLAGS += -D'CONFIG_NICREALTEK=1' PROGRAMMER_OBJS += nicrealtek.o -NEED_PCI := yes +NEED_PCI += CONFIG_NICREALTEK endif ifeq ($(CONFIG_NICNATSEMI), yes) FEATURE_CFLAGS += -D'CONFIG_NICNATSEMI=1' PROGRAMMER_OBJS += nicnatsemi.o -NEED_PCI := yes +NEED_PCI += CONFIG_NICNATSEMI endif ifeq ($(CONFIG_NICINTEL), yes) FEATURE_CFLAGS += -D'CONFIG_NICINTEL=1' PROGRAMMER_OBJS += nicintel.o -NEED_PCI := yes +NEED_PCI += CONFIG_NICINTEL endif ifeq ($(CONFIG_NICINTEL_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_NICINTEL_SPI=1' PROGRAMMER_OBJS += nicintel_spi.o -NEED_PCI := yes +NEED_PCI += CONFIG_NICINTEL_SPI endif ifeq ($(CONFIG_NICINTEL_EEPROM), yes) FEATURE_CFLAGS += -D'CONFIG_NICINTEL_EEPROM=1' PROGRAMMER_OBJS += nicintel_eeprom.o -NEED_PCI := yes +NEED_PCI += CONFIG_NICINTEL_EEPROM endif ifeq ($(CONFIG_OGP_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_OGP_SPI=1' PROGRAMMER_OBJS += ogp_spi.o -NEED_PCI := yes +NEED_PCI += CONFIG_OGP_SPI endif ifeq ($(CONFIG_BUSPIRATE_SPI), yes) @@ -742,13 +742,13 @@ ifeq ($(CONFIG_DEDIPROG), yes) FEATURE_CFLAGS += -D'CONFIG_DEDIPROG=1' PROGRAMMER_OBJS += dediprog.o -NEED_USB := yes +NEED_LIBUSB0 += CONFIG_DEDIPROG endif ifeq ($(CONFIG_SATAMV), yes) FEATURE_CFLAGS += -D'CONFIG_SATAMV=1' PROGRAMMER_OBJS += satamv.o -NEED_PCI := yes +NEED_PCI += CONFIG_SATAMV endif ifeq ($(CONFIG_LINUX_SPI), yes) @@ -767,7 +767,7 @@ ifeq ($(CONFIG_CH341A_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_CH341A_SPI=1' PROGRAMMER_OBJS += ch341a_spi.o -NEED_LIBUSB1 := yes +NEED_LIBUSB1 += CONFIG_CH341A_SPI endif ifeq ($(NEED_SERIAL), yes) @@ -780,7 +780,7 @@ endif endif -ifeq ($(NEED_PCI), yes) +ifneq ($(NEED_PCI), ) CHECK_LIBPCI = yes FEATURE_CFLAGS += -D'NEED_PCI=1' FEATURE_CFLAGS += $(call debug_shell,grep -q "OLD_PCI_GET_DEV := yes" .libdeps && printf "%s" "-D'OLD_PCI_GET_DEV=1'") @@ -807,13 +807,13 @@ endif endif -ifeq ($(NEED_USB), yes) +ifneq ($(NEED_LIBUSB0), ) CHECK_LIBUSB0 = yes -FEATURE_CFLAGS += -D'NEED_USB=1' +FEATURE_CFLAGS += -D'NEED_LIBUSB0=1' USBLIBS := $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" ; $(PKG_CONFIG) --libs libusb || printf "%s" "-lusb") endif -ifeq ($(NEED_LIBUSB1), yes) +ifneq ($(NEED_LIBUSB1), ) CHECK_LIBUSB1 = yes FEATURE_CFLAGS += -D'NEED_LIBUSB1=1' # FreeBSD and DragonflyBSD use a reimplementation of libusb-1.0 that is simply called libusb @@ -970,7 +970,6 @@ endef export LIBUSB0_TEST - define LIBUSB1_TEST #include <stddef.h> #include <libusb.h> @@ -992,6 +991,7 @@ @printf "\nexec: %s\n" "$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o" >>$(BUILD_DETAILS_FILE) @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ + echo "The following features require libpci: $(NEED_PCI)."; \ echo "Please install libpci headers."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @@ -1009,6 +1009,7 @@ { printf "\nexec: %s\n" "$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) -lz" >>$(BUILD_DETAILS_FILE) ; \ $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) -lz >&2 && \ echo "yes." && echo "NEEDLIBZ := yes" > .libdeps } || { echo "no."; echo; \ + echo "The following features require libpci: $(NEED_PCI)."; \ echo "Please install libpci (package pciutils) and/or libz."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1; }; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @@ -1020,6 +1021,7 @@ @printf "\nexec: %s\n" "$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o" >>$(BUILD_DETAILS_FILE) @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ + echo "The following features require libusb-0.1/libusb-compat: $(NEED_LIBUSB0)."; \ echo "Please install libusb-0.1 headers or libusb-compat headers."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @@ -1027,6 +1029,7 @@ @printf "\nexec: %s\n" "$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USBLIBS)" >>$(BUILD_DETAILS_FILE) @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USBLIBS) >&2 && \ echo "yes." || { echo "no."; \ + echo "The following features require libusb-0.1/libusb-compat: $(NEED_LIBUSB0)."; \ echo "Please install libusb-0.1 or libusb-compat."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @@ -1038,6 +1041,7 @@ @printf "\nexec: %s\n" "$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o" >>$(BUILD_DETAILS_FILE) @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ + echo "The following features require libusb-1.0: $(NEED_LIBUSB1)."; \ echo "Please install libusb-1.0 headers."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @@ -1045,6 +1049,7 @@ @printf "\nexec: %s\n" "$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USB1LIBS)" >>$(BUILD_DETAILS_FILE) @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USB1LIBS) >&2 && \ echo "yes." || { echo "no."; \ + echo "The following features require libusb-1.0: $(NEED_LIBUSB1)."; \ echo "Please install libusb-1.0."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1

3 5

[commit] r1926 - trunk
by repository service 17 Feb '16

17 Feb '16

Author: hailfinger Date: Wed Feb 17 23:25:12 2016 New Revision: 1926 URL: http://flashrom.org/trac/flashrom/changeset/1926 Log: List affected features for missing libraries If libpci, libusb0 or libusb1 are missing, make will now tell you which currently enabled features require those libraries. Example output: Checking for libusb-0.1/libusb-compat headers... not found. The following features require libusb-0.1/libusb-compat: CONFIG_PICKIT2_SPI CONFIG_DEDIPROG. Please install libusb-0.1 headers or libusb-compat headers. See README for more information. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Urja Rannikko <urjaman(a)gmail.com> Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Feb 14 16:46:00 2016 (r1925) +++ trunk/Makefile Wed Feb 17 23:25:12 2016 (r1926) @@ -586,27 +586,27 @@ endif else endif -NEED_PCI := yes +NEED_LIBPCI += CONFIG_INTERNAL endif ifeq ($(CONFIG_SERPROG), yes) FEATURE_CFLAGS += -D'CONFIG_SERPROG=1' PROGRAMMER_OBJS += serprog.o -NEED_SERIAL := yes -NEED_NET := yes +NEED_SERIAL += CONFIG_SERPROG +NEED_POSIX_SOCKETS += CONFIG_SERPROG endif ifeq ($(CONFIG_RAYER_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_RAYER_SPI=1' PROGRAMMER_OBJS += rayer_spi.o -# Actually, NEED_PCI is wrong. NEED_IOPORT_ACCESS would be more correct. -NEED_PCI := yes +# Actually, NEED_LIBPCI is wrong. NEED_IOPORT_ACCESS would be more correct. +NEED_LIBPCI += CONFIG_RAYER_SPI endif ifeq ($(CONFIG_PONY_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_PONY_SPI=1' PROGRAMMER_OBJS += pony_spi.o -NEED_SERIAL := yes +NEED_SERIAL += CONFIG_PONY_SPI endif ifeq ($(CONFIG_BITBANG_SPI), yes) @@ -617,72 +617,72 @@ ifeq ($(CONFIG_NIC3COM), yes) FEATURE_CFLAGS += -D'CONFIG_NIC3COM=1' PROGRAMMER_OBJS += nic3com.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_NIC3COM endif ifeq ($(CONFIG_GFXNVIDIA), yes) FEATURE_CFLAGS += -D'CONFIG_GFXNVIDIA=1' PROGRAMMER_OBJS += gfxnvidia.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_GFXNVIDIA endif ifeq ($(CONFIG_SATASII), yes) FEATURE_CFLAGS += -D'CONFIG_SATASII=1' PROGRAMMER_OBJS += satasii.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_SATASII endif ifeq ($(CONFIG_ATAHPT), yes) FEATURE_CFLAGS += -D'CONFIG_ATAHPT=1' PROGRAMMER_OBJS += atahpt.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_ATAHPT endif ifeq ($(CONFIG_ATAVIA), yes) FEATURE_CFLAGS += -D'CONFIG_ATAVIA=1' PROGRAMMER_OBJS += atavia.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_ATAVIA endif ifeq ($(CONFIG_ATAPROMISE), yes) FEATURE_CFLAGS += -D'CONFIG_ATAPROMISE=1' PROGRAMMER_OBJS += atapromise.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_ATAPROMISE endif ifeq ($(CONFIG_IT8212), yes) FEATURE_CFLAGS += -D'CONFIG_IT8212=1' PROGRAMMER_OBJS += it8212.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_IT8212 endif ifeq ($(CONFIG_FT2232_SPI), yes) # This is a totally ugly hack. FEATURE_CFLAGS += $(call debug_shell,grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'CONFIG_FT2232_SPI=1'") -NEED_FTDI := yes +NEED_LIBFTDI += CONFIG_FT2232_SPI PROGRAMMER_OBJS += ft2232_spi.o endif ifeq ($(CONFIG_USBBLASTER_SPI), yes) # This is a totally ugly hack. FEATURE_CFLAGS += $(call debug_shell,grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'CONFIG_USBBLASTER_SPI=1'") -NEED_FTDI := yes +NEED_LIBFTDI += CONFIG_USBBLASTER_SPI PROGRAMMER_OBJS += usbblaster_spi.o endif ifeq ($(CONFIG_PICKIT2_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_PICKIT2_SPI=1' PROGRAMMER_OBJS += pickit2_spi.o -NEED_USB := yes +NEED_LIBUSB0 += CONFIG_PICKIT2_SPI endif -ifeq ($(NEED_FTDI), yes) +ifneq ($(NEED_LIBFTDI), ) FTDILIBS := $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" ; $(PKG_CONFIG) --libs libftdi1 || $(PKG_CONFIG) --libs libftdi || printf "%s" "-lftdi -lusb") FEATURE_CFLAGS += $(call debug_shell,grep -q "FT232H := yes" .features && printf "%s" "-D'HAVE_FT232H=1'") FTDI_INCLUDES := $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" ; $(PKG_CONFIG) --cflags-only-I libftdi1) FEATURE_CFLAGS += $(FTDI_INCLUDES) FEATURE_LIBS += $(call debug_shell,grep -q "FTDISUPPORT := yes" .features && printf "%s" "$(FTDILIBS)") -# We can't set NEED_USB here because that would transform libftdi auto-enabling +# We can't set NEED_LIBUSB0 here because that would transform libftdi auto-enabling # into a hard requirement for libusb, defeating the purpose of auto-enabling. endif @@ -694,61 +694,61 @@ ifeq ($(CONFIG_DRKAISER), yes) FEATURE_CFLAGS += -D'CONFIG_DRKAISER=1' PROGRAMMER_OBJS += drkaiser.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_DRKAISER endif ifeq ($(CONFIG_NICREALTEK), yes) FEATURE_CFLAGS += -D'CONFIG_NICREALTEK=1' PROGRAMMER_OBJS += nicrealtek.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_NICREALTEK endif ifeq ($(CONFIG_NICNATSEMI), yes) FEATURE_CFLAGS += -D'CONFIG_NICNATSEMI=1' PROGRAMMER_OBJS += nicnatsemi.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_NICNATSEMI endif ifeq ($(CONFIG_NICINTEL), yes) FEATURE_CFLAGS += -D'CONFIG_NICINTEL=1' PROGRAMMER_OBJS += nicintel.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_NICINTEL endif ifeq ($(CONFIG_NICINTEL_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_NICINTEL_SPI=1' PROGRAMMER_OBJS += nicintel_spi.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_NICINTEL_SPI endif ifeq ($(CONFIG_NICINTEL_EEPROM), yes) FEATURE_CFLAGS += -D'CONFIG_NICINTEL_EEPROM=1' PROGRAMMER_OBJS += nicintel_eeprom.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_NICINTEL_EEPROM endif ifeq ($(CONFIG_OGP_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_OGP_SPI=1' PROGRAMMER_OBJS += ogp_spi.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_OGP_SPI endif ifeq ($(CONFIG_BUSPIRATE_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_BUSPIRATE_SPI=1' PROGRAMMER_OBJS += buspirate_spi.o -NEED_SERIAL := yes +NEED_SERIAL += CONFIG_BUSPIRATE_SPI endif ifeq ($(CONFIG_DEDIPROG), yes) FEATURE_CFLAGS += -D'CONFIG_DEDIPROG=1' PROGRAMMER_OBJS += dediprog.o -NEED_USB := yes +NEED_LIBUSB0 += CONFIG_DEDIPROG endif ifeq ($(CONFIG_SATAMV), yes) FEATURE_CFLAGS += -D'CONFIG_SATAMV=1' PROGRAMMER_OBJS += satamv.o -NEED_PCI := yes +NEED_LIBPCI += CONFIG_SATAMV endif ifeq ($(CONFIG_LINUX_SPI), yes) @@ -760,27 +760,27 @@ ifeq ($(CONFIG_MSTARDDC_SPI), yes) # This is a totally ugly hack. FEATURE_CFLAGS += $(call debug_shell,grep -q "LINUX_I2C_SUPPORT := yes" .features && printf "%s" "-D'CONFIG_MSTARDDC_SPI=1'") -NEED_LINUX_I2C := yes +NEED_LINUX_I2C += CONFIG_MSTARDDC_SPI PROGRAMMER_OBJS += mstarddc_spi.o endif ifeq ($(CONFIG_CH341A_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_CH341A_SPI=1' PROGRAMMER_OBJS += ch341a_spi.o -NEED_LIBUSB1 := yes +NEED_LIBUSB1 += CONFIG_CH341A_SPI endif -ifeq ($(NEED_SERIAL), yes) +ifneq ($(NEED_SERIAL), ) LIB_OBJS += serial.o endif -ifeq ($(NEED_NET), yes) +ifneq ($(NEED_POSIX_SOCKETS), ) ifeq ($(TARGET_OS), SunOS) LIBS += -lsocket endif endif -ifeq ($(NEED_PCI), yes) +ifneq ($(NEED_LIBPCI), ) CHECK_LIBPCI = yes FEATURE_CFLAGS += -D'NEED_PCI=1' FEATURE_CFLAGS += $(call debug_shell,grep -q "OLD_PCI_GET_DEV := yes" .libdeps && printf "%s" "-D'OLD_PCI_GET_DEV=1'") @@ -807,13 +807,13 @@ endif endif -ifeq ($(NEED_USB), yes) +ifneq ($(NEED_LIBUSB0), ) CHECK_LIBUSB0 = yes -FEATURE_CFLAGS += -D'NEED_USB=1' +FEATURE_CFLAGS += -D'NEED_LIBUSB0=1' USBLIBS := $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" ; $(PKG_CONFIG) --libs libusb || printf "%s" "-lusb") endif -ifeq ($(NEED_LIBUSB1), yes) +ifneq ($(NEED_LIBUSB1), ) CHECK_LIBUSB1 = yes FEATURE_CFLAGS += -D'NEED_LIBUSB1=1' # FreeBSD and DragonflyBSD use a reimplementation of libusb-1.0 that is simply called libusb @@ -970,7 +970,6 @@ endef export LIBUSB0_TEST - define LIBUSB1_TEST #include <stddef.h> #include <libusb.h> @@ -992,6 +991,7 @@ @printf "\nexec: %s\n" "$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o" >>$(BUILD_DETAILS_FILE) @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ + echo "The following features require libpci: $(NEED_LIBPCI)."; \ echo "Please install libpci headers."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @@ -1009,6 +1009,7 @@ { printf "\nexec: %s\n" "$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) -lz" >>$(BUILD_DETAILS_FILE) ; \ $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) -lz >&2 && \ echo "yes." && echo "NEEDLIBZ := yes" > .libdeps } || { echo "no."; echo; \ + echo "The following features require libpci: $(NEED_LIBPCI)."; \ echo "Please install libpci (package pciutils) and/or libz."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1; }; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @@ -1020,6 +1021,7 @@ @printf "\nexec: %s\n" "$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o" >>$(BUILD_DETAILS_FILE) @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ + echo "The following features require libusb-0.1/libusb-compat: $(NEED_LIBUSB0)."; \ echo "Please install libusb-0.1 headers or libusb-compat headers."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @@ -1027,6 +1029,7 @@ @printf "\nexec: %s\n" "$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USBLIBS)" >>$(BUILD_DETAILS_FILE) @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USBLIBS) >&2 && \ echo "yes." || { echo "no."; \ + echo "The following features require libusb-0.1/libusb-compat: $(NEED_LIBUSB0)."; \ echo "Please install libusb-0.1 or libusb-compat."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @@ -1038,6 +1041,7 @@ @printf "\nexec: %s\n" "$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o" >>$(BUILD_DETAILS_FILE) @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ + echo "The following features require libusb-1.0: $(NEED_LIBUSB1)."; \ echo "Please install libusb-1.0 headers."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @@ -1045,6 +1049,7 @@ @printf "\nexec: %s\n" "$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USB1LIBS)" >>$(BUILD_DETAILS_FILE) @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USB1LIBS) >&2 && \ echo "yes." || { echo "no."; \ + echo "The following features require libusb-1.0: $(NEED_LIBUSB1)."; \ echo "Please install libusb-1.0."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @@ -1127,7 +1132,7 @@ features: compiler @echo "FEATURES := yes" > .features.tmp -ifeq ($(NEED_FTDI), yes) +ifneq ($(NEED_LIBFTDI), ) @printf "Checking for FTDI support... " | tee -a $(BUILD_DETAILS_FILE) @echo "$$FTDI_TEST" > .featuretest.c @printf "\nexec: %s\n" "$(CC) $(CPPFLAGS) $(CFLAGS) $(FTDI_INCLUDES) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) $(FTDILIBS) $(LIBS)" >>$(BUILD_DETAILS_FILE) @@ -1152,7 +1157,7 @@ ( echo "no."; echo "LINUX_SPI_SUPPORT := no" >> .features.tmp ) } \ 2>>$(BUILD_DETAILS_FILE) | tee -a $(BUILD_DETAILS_FILE) endif -ifeq ($(NEED_LINUX_I2C), yes) +ifneq ($(NEED_LINUX_I2C), ) @printf "Checking if Linux I2C headers are present... " | tee -a $(BUILD_DETAILS_FILE) @echo "$$LINUX_I2C_TEST" > .featuretest.c @printf "\nexec: %s\n" "$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX)" >>$(BUILD_DETAILS_FILE)

1 0

Problem with dumping my Bios FW
by Marco Mancini 17 Feb '16

17 Feb '16

Hi, I downloaded your software because I would dump my BIOS firmware image. I tried to use it using the internal programmer but the software replied me with: "WARNING! You seem to be running flashrom on an unsupported laptop. Laptops, notebooks and netbooks are difficult to support and we recommend to use the vendor flashing utility. The embedded controller (EC) in these machines often interacts badly with flashing. See the manpage and http://www.flashrom.org/Laptops for details. If flash is shared with the EC, erase is guaranteed to brick your laptop and write may brick your laptop. Read and probe may irritate your EC and cause fan failure, backlight failure and sudden poweroff. You have been warned." I'm on a Lenovo Y510P and I'm running Ubuntu 15.10. How I have to configure your software to dump my BIOS image? I've already tried to contact someone on IRC channel but nobody replied me. Best regards Marco Mancini

1 0

Re: [flashrom] [PATCH 3/3] Add support for WCH CH341A as an SPI programmer.
by Stefan Tauner 14 Feb '16

14 Feb '16

On Wed, 27 Jan 2016 03:12:11 +0200 Urja Rannikko <urjaman(a)gmail.com> wrote: > Hi, > > Review-ish... with some only-commentary included too. > > On Mon, Jan 18, 2016 at 1:28 AM, Stefan Tauner > <stefan.tauner(a)alumni.tuwien.ac.at> wrote: > > Signed-off-by: Urja Rannikko <urjaman(a)gmail.com> > > Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> > > --- > > Makefile | 23 ++- > > ch341a_spi.c | 531 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > flashrom.8.tmpl | 12 +- > > flashrom.c | 12 ++ > > programmer.h | 13 ++ > > 5 files changed, 588 insertions(+), 3 deletions(-) > > create mode 100644 ch341a_spi.c > > > > + free_idx = (free_idx + 1) % USB_IN_TRANSFERS; /* Increment (and wrap around). */ > Yeah this obvious construct is something I didnt use because I'm such > an embedded guy that I'd never ever use % in performance related > code... (i think i had some if idx>=USB_IN_TRANSFERS) idx = 0 > thing)... thanks for making it saner. :) > I had a fancier delay implementation done (all the way upto ms scale > using the I2C commands), but since i didnt get that fully tested, this > one will do, i'll post it as an improvement later. Please do. I don't deem it that important but since you have investigated the whole issue in such detail it would be a waste to not exploit this knowledge. > > + unsigned int i; > > + for (i = 0; i < readcnt; i++) { > > + /* FIXME: does working on words instead of bytes improve speed? */ > ... drop the comment? i dont really care, but i think our consensus on > IRC was that a words-wide implementation would have more issues > (alignment and such) than performance. > Or make a comment with that info. It's gone. > > + *readarr++ = swap_byte(rbuf[writecnt + i]); > > + } > > + > > + return 0; > > +} > > + > > +static const struct spi_master spi_master_ch341a_spi = { > > + .type = SPI_CONTROLLER_CH341A_SPI, > > + /* TODO: flashrom's current maximum is 256 B. Device was tested on Linux to accept atleast 16 kB. */ > > + .max_data_read = 16 * 1024, > > + .max_data_write = 16 * 1024, > On linux. Not on windows usb "stack" i think... set these back to 1k? > Or test for the limit (maybe something like 4k?) and change the 1000ms > timeout, since i think the big packet would timeout on windows if > nothing else failed... As discussed, I have tested up to 128 kB on Windows (in VM) and on Linux with a bigger timeout and it works fine. We have agreed upon 4 kB chunks now and using VLAs (I had an intermediate version that used bigger chunks and relied on mallocs for them). > With atleast the limits dropped (or tested), this is: > Acked-by: Urja Rannikko <urjaman(a)gmail.com> Thanks, r1921. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

4 5

Re: [flashrom] [REVIEW] Add support for google servo board
by Stefan Tauner 14 Feb '16

14 Feb '16

On Sat, 13 Feb 2016 14:34:56 +0200 Urja Rannikko <urjaman(a)gmail.com> wrote: > Hi, > > So Stefan noted that there was something missing, namely man page > entries for the added parameters to ft2232_spi - > hatim helped out with them a little and i finished that part: > > https://github.com/urjaman/flashrom/commit/89bb8a87ca67a27d9a544579f4e4f63b… > > On Sat, Feb 13, 2016 at 1:00 PM, Hatim Kanchwala <hatim(a)hatimak.me> wrote: > > Hello, > > > > Here's the pull request https://github.com/stefanct/flashrom/pull/6 from Alex. It compiles perfectly against the most recent master (as of typing this :p). It looks fine. I had help from Urja reviewing it (although there wasn't much to review in this almost perfect patch ;)). > > > > Acked-by: Hatim Kanchwala <hatim(a)hatimak.me> > With that included, this series is: > Acked-by: Urja Rannikko <urjaman(a)gmail.com> Merged together and committed in r1925, thanks. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1925 - in trunk: . util
by repository service 14 Feb '16

14 Feb '16

Author: stefanct Date: Sun Feb 14 16:46:00 2016 New Revision: 1925 URL: http://flashrom.org/trac/flashrom/changeset/1925 Log: ft2232_spi: Add support for Google Servo boards (v1 + v2). This patch has been cherry-picked from various patches in the chromiumos tree denoted below. Change-Id: I4b679e23ab37a4357b1e3d23f6f65a1c31f7d71a Change-Id: Ibda56201ab4519315431c08206c61ceffb7c7e65 Change-Id: I540ad2d304dc69a7c79ca154beb744ef947ff808 Servo V2 has two FT4232H parts. The first one (denoted 'legacy') is dedicated to supporting orginal Servo V1 functionality. The second, residing at USB ID 0x18d1:5003 provides two other SPI interfaces on port A and B respectively. Additional changes by Alexandru Gagniuc, Hatim Kanchwala and Urja Rannikko: - The clock divisor is set to '6', as this creates a 10MHz SPI clock, which is the same SPI clock that the chromiumos branch produced. - Add udev rule for Google servo boards to util/flashrom.rules. - Add Google servo entry to manpage. Signed-off-by: Todd Broch <tbroch(a)chromium.org> Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Signed-off-by: Hatim Kanchwala <hatim(a)hatimak.me> Signed-off-by: Urja Rannikko <urjaman(a)gmail.com> Acked-by: Hatim Kanchwala <hatim(a)hatimak.me> Acked-by: Urja Rannikko <urjaman(a)gmail.com> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/flashrom.8.tmpl trunk/ft2232_spi.c trunk/util/z60_flashrom.rules Modified: trunk/flashrom.8.tmpl ============================================================================== --- trunk/flashrom.8.tmpl Sun Feb 7 04:35:04 2016 (r1924) +++ trunk/flashrom.8.tmpl Sun Feb 14 16:46:00 2016 (r1925) @@ -242,7 +242,7 @@ FTDI FT2232H Mini-Module, FTDI FT4232H Mini-Module, openbiosprog-spi, Amontec \ JTAGkey/JTAGkey-tiny/JTAGkey-2, Dangerous Prototypes Bus Blaster, \ Olimex ARM-USB-TINY/-H, Olimex ARM-USB-OCD/-H, TIAO/DIYGADGET USB -Multi-Protocol Adapter (TUMPA), TUMPA Lite, and GOEPEL PicoTAP. +Multi-Protocol Adapter (TUMPA), TUMPA Lite, GOEPEL PicoTAP and Google Servo v1/v2. .sp .BR "* serprog" " (for flash ROMs attached to a programmer speaking serprog, \ including Arduino-based devices as well as various programmers by Urja Rannikko, \ @@ -701,7 +701,8 @@ can be .BR 2232H ", " 4232H ", " 232H ", " jtagkey ", " busblaster ", " openmoko ", " \ arm-usb-tiny ", " arm-usb-tiny-h ", " arm-usb-ocd ", " arm-usb-ocd-h \ -", " tumpa ", " tumpalite ", or " picotap +", " tumpa ", " tumpalite ", " picotap ", " google-servo ", " google-servo-v2 \ +" or " google-servo-v2-legacy and .B interface can be Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Sun Feb 7 04:35:04 2016 (r1924) +++ trunk/ft2232_spi.c Sun Feb 14 16:46:00 2016 (r1925) @@ -58,6 +58,11 @@ #define OLIMEX_ARM_OCD_H_PID 0x002B #define OLIMEX_ARM_TINY_H_PID 0x002A +#define GOOGLE_VID 0x18D1 +#define GOOGLE_SERVO_PID 0x5001 +#define GOOGLE_SERVO_V2_PID0 0x5002 +#define GOOGLE_SERVO_V2_PID1 0x5003 + const struct dev_entry devs_ft2232spi[] = { {FTDI_VID, FTDI_FT2232H_PID, OK, "FTDI", "FT2232H"}, {FTDI_VID, FTDI_FT4232H_PID, OK, "FTDI", "FT4232H"}, @@ -66,6 +71,9 @@ {FTDI_VID, TIAO_TUMPA_LITE_PID, OK, "TIAO", "USB Multi-Protocol Adapter Lite"}, {FTDI_VID, AMONTEC_JTAGKEY_PID, OK, "Amontec", "JTAGkey"}, {GOEPEL_VID, GOEPEL_PICOTAP_PID, OK, "GOEPEL", "PicoTAP"}, + {GOOGLE_VID, GOOGLE_SERVO_PID, OK, "Google", "Servo"}, + {GOOGLE_VID, GOOGLE_SERVO_V2_PID0, OK, "Google", "Servo V2 Legacy"}, + {GOOGLE_VID, GOOGLE_SERVO_V2_PID1, OK, "Google", "Servo V2"}, {FIC_VID, OPENMOKO_DBGBOARD_PID, OK, "FIC", "OpenMoko Neo1973 Debug board (V2+)"}, {OLIMEX_VID, OLIMEX_ARM_OCD_PID, OK, "Olimex", "ARM-USB-OCD"}, {OLIMEX_VID, OLIMEX_ARM_TINY_PID, OK, "Olimex", "ARM-USB-TINY"}, @@ -254,6 +262,17 @@ ft2232_vid = OLIMEX_VID; ft2232_type = OLIMEX_ARM_TINY_H_PID; channel_count = 2; + } else if (!strcasecmp(arg, "google-servo")) { + ft2232_vid = GOOGLE_VID; + ft2232_type = GOOGLE_SERVO_PID; + } else if (!strcasecmp(arg, "google-servo-v2")) { + ft2232_vid = GOOGLE_VID; + ft2232_type = GOOGLE_SERVO_V2_PID1; + /* Default divisor is too fast, and chip ID fails */ + divisor = 6; + } else if (!strcasecmp(arg, "google-servo-v2-legacy")) { + ft2232_vid = GOOGLE_VID; + ft2232_type = GOOGLE_SERVO_V2_PID0; } else { msg_perr("Error: Invalid device type specified.\n"); free(arg); Modified: trunk/util/z60_flashrom.rules ============================================================================== --- trunk/util/z60_flashrom.rules Sun Feb 7 04:35:04 2016 (r1924) +++ trunk/util/z60_flashrom.rules Sun Feb 14 16:46:00 2016 (r1925) @@ -60,6 +60,12 @@ # http://www.goepel.com/jtagboundary-scan/hardware/picotap.html ATTRS{idVendor}=="096c", ATTRS{idProduct}=="1449", MODE="664", GROUP="plugdev" +# Google servo debug board +# https://www.chromium.org/chromium-os/servo +ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="5001", MODE="664", GROUP="plugdev" +ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="5002", MODE="664", GROUP="plugdev" +ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="5003", MODE="664", GROUP="plugdev" + # Olimex ARM-USB-OCD # http://olimex.com/dev/arm-usb-ocd.html ATTRS{idVendor}=="15ba", ATTRS{idProduct}=="0003", MODE="664", GROUP="plugdev"

1 0

Flash Rom fails
by Dave Hugh 13 Feb '16

13 Feb '16

Trying to flash my ROM to get a needed Bios update on an APU2B4 from PCENGINES. Booting into a USB tiny core image to perform the flash, get an error message which advises me to email this address. Can you help? Thanks in advance **** Log message ][root@box:/mnt/sdb]$ flashrom -w apu2_160120.rom -p internal flashrom v0.9.7-r1711-APU on Linux 3.8.13-tinycore (i686) flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... delay loop is unreliable, trying to continue OK. coreboot table found at 0xdffae000. Found chipset "AMD FCH". Enabling flash write... FCH device found but SMBus revision 0x42 does not match known values. Please report this to flashrom(a)flashrom.org and include this log and the output of lspci -nnvx, thanks!. OK. FIFO pointer corruption! Pointer is 0, wanted 3 Something else is accessing the flash chip and causes random corruption. Please stop all applications and drivers and IPMI which access the flash chip. No EEPROM/flash device found. Note: flashrom can never write if the flash chip isn't found automatically. **** Command output [][root@box:/mnt/sdb]$ lspci -nnvx 00:00.0 Host bridge [0600]: Advanced Micro Devices [AMD] Device [1022:1566] Subsystem: Advanced Micro Devices [AMD] Device [1022:1566] Flags: bus master, fast devsel, latency 0 00: 22 10 66 15 04 00 00 00 00 00 00 06 00 00 80 00 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 22 10 66 15 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00:02.0 Host bridge [0600]: Advanced Micro Devices [AMD] Device [1022:156b] Flags: fast devsel 00: 22 10 6b 15 00 00 00 00 00 00 00 06 00 00 80 00 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00:02.2 PCI bridge [0604]: Advanced Micro Devices [AMD] Device [1022:1439] (prog-if 00 [Normal decode]) Flags: bus master, fast devsel, latency 0 Bus: primary=00, secondary=01, subordinate=01, sec-latency=0 I/O behind bridge: 00001000-00001fff Memory behind bridge: fe500000-fe5fffff Capabilities: [50] Power Management version 3 Capabilities: [58] Express Root Port (Slot+), MSI 00 Capabilities: [a0] MSI: Enable+ Count=1/1 Maskable- 64bit+ Capabilities: [b0] Subsystem: Advanced Micro Devices [AMD] Device [1022:1234] Capabilities: [b8] HyperTransport: MSI Mapping Enable+ Fixed+ Capabilities: [100] Vendor Specific Information: ID=0001 Rev=1 Len=010 <?> Kernel driver in use: pcieport 00: 22 10 39 14 07 04 10 00 00 00 04 06 10 00 81 00 10: 00 00 00 00 00 00 00 00 00 01 01 00 11 11 00 00 20: 50 fe 50 fe f1 ff 01 00 00 00 00 00 00 00 00 00 30: 00 00 00 00 50 00 00 00 00 00 00 00 00 02 03 00 00:02.3 PCI bridge [0604]: Advanced Micro Devices [AMD] Device [1022:1439] (prog-if 00 [Normal decode]) Flags: bus master, fast devsel, latency 0 Bus: primary=00, secondary=02, subordinate=02, sec-latency=0 I/O behind bridge: 00002000-00002fff Memory behind bridge: fe600000-fe6fffff Capabilities: [50] Power Management version 3 Capabilities: [58] Express Root Port (Slot+), MSI 00 Capabilities: [a0] MSI: Enable+ Count=1/1 Maskable- 64bit+ Capabilities: [b0] Subsystem: Advanced Micro Devices [AMD] Device [1022:1234] Capabilities: [b8] HyperTransport: MSI Mapping Enable+ Fixed+ Capabilities: [100] Vendor Specific Information: ID=0001 Rev=1 Len=010 <?> Kernel driver in use: pcieport 00: 22 10 39 14 07 04 10 00 00 00 04 06 10 00 81 00 10: 00 00 00 00 00 00 00 00 00 02 02 00 21 21 00 00 20: 60 fe 60 fe f1 ff 01 00 00 00 00 00 00 00 00 00 30: 00 00 00 00 50 00 00 00 00 00 00 00 00 03 03 00 00:02.4 PCI bridge [0604]: Advanced Micro Devices [AMD] Device [1022:1439] (prog-if 00 [Normal decode]) Flags: bus master, fast devsel, latency 0 Bus: primary=00, secondary=03, subordinate=03, sec-latency=0 I/O behind bridge: 00003000-00003fff Memory behind bridge: fe700000-fe7fffff Capabilities: [50] Power Management version 3 Capabilities: [58] Express Root Port (Slot+), MSI 00 Capabilities: [a0] MSI: Enable+ Count=1/1 Maskable- 64bit+ Capabilities: [b0] Subsystem: Advanced Micro Devices [AMD] Device [1022:1234] Capabilities: [b8] HyperTransport: MSI Mapping Enable+ Fixed+ Capabilities: [100] Vendor Specific Information: ID=0001 Rev=1 Len=010 <?> Kernel driver in use: pcieport 00: 22 10 39 14 07 04 10 00 00 00 04 06 10 00 81 00 10: 00 00 00 00 00 00 00 00 00 03 03 00 31 31 00 00 20: 70 fe 70 fe f1 ff 01 00 00 00 00 00 00 00 00 00 30: 00 00 00 00 50 00 00 00 00 00 00 00 00 04 03 00 00:02.5 PCI bridge [0604]: Advanced Micro Devices [AMD] Device [1022:1439] (prog-if 00 [Normal decode]) Flags: bus master, fast devsel, latency 0 Bus: primary=00, secondary=04, subordinate=04, sec-latency=0 Memory behind bridge: fe800000-fe8fffff Capabilities: [50] Power Management version 3 Capabilities: [58] Express Root Port (Slot+), MSI 00 Capabilities: [a0] MSI: Enable+ Count=1/1 Maskable- 64bit+ Capabilities: [b0] Subsystem: Advanced Micro Devices [AMD] Device [1022:1234] Capabilities: [b8] HyperTransport: MSI Mapping Enable+ Fixed+ Capabilities: [100] Vendor Specific Information: ID=0001 Rev=1 Len=010 <?> Kernel driver in use: pcieport 00: 22 10 39 14 06 04 10 00 00 00 04 06 10 00 81 00 10: 00 00 00 00 00 00 00 00 00 04 04 00 f1 01 00 00 20: 80 fe 80 fe f1 ff 01 00 00 00 00 00 00 00 00 00 30: 00 00 00 00 50 00 00 00 00 00 00 00 00 01 03 00 00:08.0 Encryption controller [1080]: Advanced Micro Devices [AMD] Device [1022:1537] Subsystem: Advanced Micro Devices [AMD] Device [1022:1537] Flags: fast devsel Memory at feb00000 (64-bit, prefetchable) [size=128K] Memory at fe900000 (32-bit, non-prefetchable) [size=1M] Memory at feb24000 (32-bit, non-prefetchable) [size=4K] Memory at fea00000 (32-bit, non-prefetchable) [size=1M] Memory at feb20000 (32-bit, non-prefetchable) [size=8K] Capabilities: [50] MSI-X: Enable- Count=2 Masked- Capabilities: [5c] HyperTransport: MSI Mapping Enable+ Fixed+ Capabilities: [60] Power Management version 3 00: 22 10 37 15 02 00 10 00 00 00 80 10 00 00 00 00 10: 0c 00 b0 fe 00 00 00 00 00 00 90 fe 00 40 b2 fe 20: 00 00 a0 fe 00 00 b2 fe 00 00 00 00 22 10 37 15 30: 00 00 00 00 50 00 00 00 00 00 00 00 00 00 00 00 00:10.0 USB Controller [0c03]: Advanced Micro Devices [AMD] Device [1022:7814] (rev 11) (prog-if 30) Subsystem: Advanced Micro Devices [AMD] Device [1022:1410] Flags: bus master, fast devsel, latency 0, IRQ 18 Memory at feb22000 (64-bit, non-prefetchable) [size=8K] Capabilities: [50] Power Management version 3 Capabilities: [70] MSI: Enable- Count=1/8 Maskable- 64bit+ Capabilities: [90] MSI-X: Enable+ Count=8 Masked- Capabilities: [a0] Express Root Complex Integrated Endpoint, MSI 00 Capabilities: [100] #18 Kernel driver in use: xhci_hcd 00: 22 10 14 78 06 04 10 00 11 30 03 0c 10 00 00 00 10: 04 20 b2 fe 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 22 10 10 14 30: 00 00 00 00 50 00 00 00 00 00 00 00 00 01 00 00 00:11.0 SATA controller [0106]: Advanced Micro Devices [AMD] Hudson SATA Controller [IDE mode] [1022:7800] (rev 40) (prog-if 01 [AHCI 1.0]) Subsystem: Advanced Micro Devices [AMD] Hudson SATA Controller [IDE mode] [1022:7800] Flags: bus master, 66MHz, medium devsel, latency 64, IRQ 19 I/O ports at 4010 [size=8] I/O ports at 4020 [size=4] I/O ports at 4018 [size=8] I/O ports at 4024 [size=4] I/O ports at 4000 [size=16] Memory at feb25000 (32-bit, non-prefetchable) [size=1K] Capabilities: [60] Power Management version 3 Capabilities: [70] SATA HBA v1.0 Kernel driver in use: ahci 00: 22 10 00 78 07 00 30 02 40 01 06 01 10 40 00 00 10: 11 40 00 00 21 40 00 00 19 40 00 00 25 40 00 00 20: 01 40 00 00 00 50 b2 fe 00 00 00 00 22 10 00 78 30: 00 00 00 00 60 00 00 00 00 00 00 00 00 01 00 00 00:13.0 USB Controller [0c03]: Advanced Micro Devices [AMD] Hudson USB EHCI Controller [1022:7808] (rev 39) (prog-if 20 [EHCI]) Subsystem: Advanced Micro Devices [AMD] Hudson USB EHCI Controller [1022:7808] Flags: bus master, 66MHz, medium devsel, latency 64, IRQ 18 Memory at feb25400 (32-bit, non-prefetchable) [size=256] Capabilities: [c0] Power Management version 2 Capabilities: [e4] Debug port: BAR=1 offset=00e0 Kernel driver in use: ehci-pci 00: 22 10 08 78 16 00 b0 02 39 20 03 0c 10 40 00 00 10: 00 54 b2 fe 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 22 10 08 78 30: 00 00 00 00 c0 00 00 00 00 00 00 00 00 01 00 00 00:14.0 SMBus [0c05]: Advanced Micro Devices [AMD] Hudson SMBus Controller [1022:780b] (rev 42) Subsystem: Advanced Micro Devices [AMD] Hudson SMBus Controller [1022:780b] Flags: 66MHz, medium devsel 00: 22 10 0b 78 03 04 20 02 42 00 05 0c 00 00 80 00 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 22 10 0b 78 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00:14.3 ISA bridge [0601]: Advanced Micro Devices [AMD] Hudson LPC Bridge [1022:780e] (rev 11) Subsystem: Advanced Micro Devices [AMD] Hudson LPC Bridge [1022:780e] Flags: bus master, 66MHz, medium devsel, latency 0 00: 22 10 0e 78 0f 00 20 02 11 00 01 06 00 00 80 00 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 22 10 0e 78 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00:14.7 SD Host controller [0805]: Advanced Micro Devices [AMD] Device [1022:7813] (rev 01) (prog-if 01) Subsystem: Advanced Micro Devices [AMD] Device [1022:7806] Flags: bus master, 66MHz, medium devsel, latency 71, IRQ 16 Memory at feb25500 (64-bit, non-prefetchable) [size=256] Kernel driver in use: sdhci-pci 00: 22 10 13 78 06 00 20 02 01 01 05 08 10 47 80 00 10: 04 55 b2 fe 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 22 10 06 78 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00:18.0 Host bridge [0600]: Advanced Micro Devices [AMD] Device [1022:1580] Flags: fast devsel 00: 22 10 80 15 00 00 10 00 00 00 00 06 00 00 80 00 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00:18.1 Host bridge [0600]: Advanced Micro Devices [AMD] Device [1022:1581] Flags: fast devsel 00: 22 10 81 15 00 00 00 00 00 00 00 06 00 00 80 00 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00:18.2 Host bridge [0600]: Advanced Micro Devices [AMD] Device [1022:1582] Flags: fast devsel 00: 22 10 82 15 00 00 00 00 00 00 00 06 00 00 80 00 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00:18.3 Host bridge [0600]: Advanced Micro Devices [AMD] Device [1022:1583] Flags: fast devsel Capabilities: [f0] Secure device <?> 00: 22 10 83 15 00 00 10 00 00 00 00 06 00 00 80 00 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 30: 00 00 00 00 f0 00 00 00 00 00 00 00 00 00 00 00 00:18.4 Host bridge [0600]: Advanced Micro Devices [AMD] Device [1022:1584] Flags: fast devsel 00: 22 10 84 15 00 00 00 00 00 00 00 06 00 00 80 00 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00:18.5 Host bridge [0600]: Advanced Micro Devices [AMD] Device [1022:1585] Flags: fast devsel 00: 22 10 85 15 00 00 00 00 00 00 00 06 00 00 80 00 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01:00.0 Ethernet controller [0200]: Intel Corporation Device [8086:157b] (rev 03) Subsystem: Intel Corporation Device [8086:0000] Flags: fast devsel Memory at fe500000 (32-bit, non-prefetchable) [size=128K] I/O ports at 1000 [size=32] Memory at fe520000 (32-bit, non-prefetchable) [size=16K] Capabilities: [40] Power Management version 3 Capabilities: [50] MSI: Enable- Count=1/1 Maskable+ 64bit+ Capabilities: [70] MSI-X: Enable- Count=5 Masked- Capabilities: [a0] Express Endpoint, MSI 00 Capabilities: [100] Advanced Error Reporting Capabilities: [140] Device Serial Number 00-0d-b9-ff-ff-40-80-68 Capabilities: [1a0] #17 00: 86 80 7b 15 03 00 10 00 03 00 00 02 10 00 00 00 10: 00 00 50 fe 00 00 00 00 01 10 00 00 00 00 52 fe 20: 00 00 00 00 00 00 00 00 00 00 00 00 86 80 00 00 30: 00 00 00 00 40 00 00 00 00 00 00 00 00 01 00 00 02:00.0 Ethernet controller [0200]: Intel Corporation Device [8086:157b] (rev 03) Subsystem: Intel Corporation Device [8086:0000] Flags: fast devsel Memory at fe600000 (32-bit, non-prefetchable) [size=128K] I/O ports at 2000 [size=32] Memory at fe620000 (32-bit, non-prefetchable) [size=16K] Capabilities: [40] Power Management version 3 Capabilities: [50] MSI: Enable- Count=1/1 Maskable+ 64bit+ Capabilities: [70] MSI-X: Enable- Count=5 Masked- Capabilities: [a0] Express Endpoint, MSI 00 Capabilities: [100] Advanced Error Reporting Capabilities: [140] Device Serial Number 00-0d-b9-ff-ff-40-80-69 Capabilities: [1a0] #17 00: 86 80 7b 15 03 00 10 00 03 00 00 02 10 00 00 00 10: 00 00 60 fe 00 00 00 00 01 20 00 00 00 00 62 fe 20: 00 00 00 00 00 00 00 00 00 00 00 00 86 80 00 00 30: 00 00 00 00 40 00 00 00 00 00 00 00 00 01 00 00 03:00.0 Ethernet controller [0200]: Intel Corporation Device [8086:157b] (rev 03) Subsystem: Intel Corporation Device [8086:0000] Flags: fast devsel Memory at fe700000 (32-bit, non-prefetchable) [size=128K] I/O ports at 3000 [size=32] Memory at fe720000 (32-bit, non-prefetchable) [size=16K] Capabilities: [40] Power Management version 3 Capabilities: [50] MSI: Enable- Count=1/1 Maskable+ 64bit+ Capabilities: [70] MSI-X: Enable- Count=5 Masked- Capabilities: [a0] Express Endpoint, MSI 00 Capabilities: [100] Advanced Error Reporting Capabilities: [140] Device Serial Number 00-0d-b9-ff-ff-40-80-6a Capabilities: [1a0] #17 00: 86 80 7b 15 03 00 10 00 03 00 00 02 10 00 00 00 10: 00 00 70 fe 00 00 00 00 01 30 00 00 00 00 72 fe 20: 00 00 00 00 00 00 00 00 00 00 00 00 86 80 00 00 30: 00 00 00 00 40 00 00 00 00 00 00 00 00 01 00 00 04:00.0 Network controller [0280]: Atheros Communications Inc. AR928X Wireless Network Adapter (PCI-Express) [168c:002a] (rev 01) Subsystem: Atheros Communications Inc. Device [168c:3099] Flags: fast devsel Memory at fe800000 (64-bit, non-prefetchable) [size=64K] Capabilities: [40] Power Management version 2 Capabilities: [50] MSI: Enable- Count=1/1 Maskable- 64bit- Capabilities: [60] Express Legacy Endpoint, MSI 00 Capabilities: [90] MSI-X: Enable- Count=1 Masked- Capabilities: [100] Advanced Error Reporting Capabilities: [140] Virtual Channel Capabilities: [160] Device Serial Number 00-00-00-00-00-00-00-00 00: 8c 16 2a 00 02 00 10 00 01 00 80 02 10 00 00 00 10: 04 00 80 fe 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 8c 16 99 30 30: 00 00 00 00 40 00 00 00 00 00 00 00 00 01 00 00

2 1

Re: [flashrom] [PATCH] Add support for GigaDevice GD25VQ41B
by Stefan Tauner 13 Feb '16

13 Feb '16

On Sat, 13 Feb 2016 14:38:07 +0200 Urja Rannikko <urjaman(a)gmail.com> wrote: > I had always assumed OTP means it has memory that does 1->0 but not 0->1, > which this technically isnt (it's erasable&writable until locked with > the high status register bit(s), > and then not writable at all). That would have made sense, but I am not sure I always tagged it like that... I am not sure that I made mistakes either. So maybe we should indeed tag it otherwise... but how? -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH] Add support for GigaDevice GD25VQ41B
by Stefan Tauner 13 Feb '16

13 Feb '16

On Fri, 12 Feb 2016 12:39:51 +0200 Urja Rannikko <urjaman(a)gmail.com> wrote: > >> + .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, > These arent "truly/100%" OTP, but one-time-lockable "security > registers" - the effect is most likely > the same (=if they're used they're most likely locked and that makes > them effectively ROM), so > I'm ok with the FEATURE_OTP, but maybe change the comment, my suggestion: > /* Lockable Security Registers: 3 * 512B pages, read 0x48, write 0x42, > erase 0x44 */ Hm... That is most likely my fault. I think there are quite some other chips where I deliberately added the OTP comment (and flag) in the same form although they are one-time-lock-only. Rationale: I wanted to make any chip with any permanently lockable bits easily recognizable before starting to work on adding support for it. Therefore I think the original comment is the way to go for the time being (no need to resend the patch though, Hatim). -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

[REVIEW] Add support for google servo board
by Hatim Kanchwala 13 Feb '16

13 Feb '16

Hello, Here's the pull request https://github.com/stefanct/flashrom/pull/6 from Alex. It compiles perfectly against the most recent master (as of typing this :p). It looks fine. I had help from Urja reviewing it (although there wasn't much to review in this almost perfect patch ;)). Acked-by: Hatim Kanchwala <hatim(a)hatimak.me> -- Regards, Hatim Kanchwala http://hatimak.me B. Tech. Electrical Engineering Indian Institute of Technology Patna

2 1

[PATCH] Add support for GigaDevice GD25VQ41B
by Hatim Kanchwala 12 Feb '16

12 Feb '16

Signed-off-by: Hatim Kanchwala <hatim(a)hatimak.me> --- flashchips.c | 40 ++++++++++++++++++++++++++++++++++++++++ flashchips.h | 1 + 2 files changed, 41 insertions(+) diff --git a/flashchips.c b/flashchips.c index c60514b..26a8d89 100644 --- a/flashchips.c +++ b/flashchips.c @@ -6246,20 +6246,60 @@ const struct flashchip flashchips[] = { } }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, .voltage = {2700, 3600}, }, { + .vendor = "GigaDevice", + .name = "GD25VQ41B", + .bustype = BUS_SPI, + .manufacture_id = GIGADEVICE_ID, + .model_id = GIGADEVICE_GD25VQ41B, + .total_size = 512, + .page_size = 256, + /* OTP: 3 * 512B total; read 0x48, write 0x42, erase 0x44 */ + .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { { 4 * 1024, 128} }, + .block_erase = spi_block_erase_20, + }. { + .eraseblocks = { { 32 * 1024, 16} }, + .block_erase = spi_block_erase_52, + }, { + .eraseblocks = { { 64 * 1024, 8} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = spi_block_erase_60, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + /* TODO: 2nd Status Register; read 0x35 */ + .printlock = spi_prettyprint_status_register_bp4_srwd, + .unlock = spi_disable_blockprotect_bp4_srwd, + .write = spi_chip_write_256, + .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .voltage = {2300, 3600}, + }, + + { .vendor = "Hyundai", .name = "HY29F002T", .bustype = BUS_PARALLEL, .manufacture_id = HYUNDAI_ID, .model_id = HYUNDAI_HY29F002T, .total_size = 256, .page_size = 256 * 1024, .feature_bits = FEATURE_EITHER_RESET, /* Some revisions may need FEATURE_ADDR_2AA */ .tested = TEST_OK_PRE, .probe = probe_jedec, diff --git a/flashchips.h b/flashchips.h index 74c44a0..e469363 100644 --- a/flashchips.h +++ b/flashchips.h @@ -371,20 +371,21 @@ #define GIGADEVICE_GD25Q16 0x4015 /* Same as GD25Q16B (which has OTP) */ #define GIGADEVICE_GD25Q32 0x4016 /* Same as GD25Q32B */ #define GIGADEVICE_GD25Q64 0x4017 /* Same as GD25Q64B */ #define GIGADEVICE_GD25Q128 0x4018 /* GD25Q128B only? */ #define GIGADEVICE_GD25LQ40 0x6013 #define GIGADEVICE_GD25LQ80 0x6014 #define GIGADEVICE_GD25LQ16 0x6015 #define GIGADEVICE_GD25LQ32 0x6016 #define GIGADEVICE_GD25LQ64 0x6017 /* Same as GD25LQ64B (which is faster) */ #define GIGADEVICE_GD25LQ128 0x6018 +#define GIGADEVICE_GD25VQ41B 0x4213 #define GIGADEVICE_GD29GL064CAB 0x7E0601 #define HYUNDAI_ID 0xAD /* Hyundai */ #define HYUNDAI_HY29F400T 0x23 /* Same as HY29F400AT */ #define HYUNDAI_HY29F800B 0x58 /* Same as HY29F800AB */ #define HYUNDAI_HY29LV800B 0x5B #define HYUNDAI_HY29F040A 0xA4 #define HYUNDAI_HY29F400B 0xAB /* Same as HY29F400AB */ #define HYUNDAI_HY29F002B 0x34 #define HYUNDAI_HY29F002T 0xB0 -- Regards, Hatim Kanchwala http://hatimak.me B. Tech. Electrical Engineering Indian Institute of Technology Patna

2 2

Fwd: Re: Cannot compile flashrom for windows
by Bio 09 Feb '16

09 Feb '16

Hello, Did you get have time to check my last message ? I was wondering if you know why i still get an error on last version when trying to open port B And to make flashrom detect and read/write my flash, i know that i must add my flash into flashchips.c After reading the data sheet of my flash MX25L25635F i understood that the 24 bit address protocol of Flash can only access up to 128Mb this is why 32bit is needed. The thing is i only need to access the first 128Mb (in fact i really only need the first 32Mb to be exact), buy using the 24 bit adresse protocol i should be able to read that no ? Sorry again for the questions, i'm doing a lot of reading and trying to understand all this and i just need someone to tell me if i'm going in the right direction or not Best Regards, -------- Message transféré -------- Sujet : Re: [flashrom] Cannot compile flashrom for windows Date : Wed, 3 Feb 2016 02:31:54 +0100 De : Zak <zackwarrior(a)gmail.com> Pour : flashrom(a)flashrom.org Hi there, First thanks for your reply, helped me out on where to look, it was libftdi So after doing some research here and there, it looks like the libftdi was not installed right (even tho all the files were in the correct place), anyway by doing a libftdi.pc and pointing to the files i was able to compile the last version of flashrom But i get the same thing problem... Microsoft Windows [version 10.0.10240] (c) 2015 Microsoft Corporation. Tous droits réservés. C:\flashrom>flashrom flashrom v0.9.8-r1888 on Windows 6.2 (x86) flashrom is free software, get the source code at http://www.flashrom.org Please select a programmer with the --programmer parameter. Previously this was not necessary because there was a default set. Valid choices are: dummy, ft2232_spi, serprog, buspirate_spi, pony_spi, usbblaster_spi, pickit2_spi. C:\flashrom>flashrom -p ft2232_spi:type=2232H,port=A flashrom v0.9.8-r1888 on Windows 6.2 (x86) flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. No EEPROM/flash device found. Note: flashrom can never write if the flash chip isn't found automatically. C:\flashrom>flashrom -p ft2232_spi:type=2232H,port=B flashrom v0.9.8-r1888 on Windows 6.2 (x86) flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Unable to reset FTDI device (USB device unavailable). Unable to set latency timer (USB device unavailable). Unable to set bitmode to SPI (USB device unavailable). ftdi_write_data: -666, USB device unavailable Error: Programmer initialization failed. Anyway now that i got it compiled and since it looks like port A works and not port B? i guess ? Could you give me advices on how to make flashrom work with my flash chip MACRONIX_MX25L25635F? I need to modify and add the informations to flashchips.c? What about the 24 and 32bits difference? Thanks again for your help Best Regards 2016-02-02 21:01 GMT+01:00 Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at <mailto:stefan.tauner@alumni.tuwien.ac.at>>: On Tue, 2 Feb 2016 19:43:26 +0100 Bio <zackwarrior(a)gmail.com <mailto:zackwarrior@gmail.com>> wrote: > Hello, > > I'm having trouble with flashrom, i have a working ft2232 board and i > correctly connected a spi flash on it on port A > I also correctly installed the libusb drivers for the board > So i found a compiled version of flashrom for windows v0.9.6.1-r1705 > I run it with this command > flashrom -p ft2232_spi:type=2232H,port=A > And i get this: > flashrom v0.9.6.1-r1704 on Windows 6.1 (x86) > flashrom is free software, get the source code at http://www.flashrom.org > > Calibrating delay loop... OK. > No EEPROM/flash device found. > Note: flashrom can never write if the flash chip isn't found automatically. That does not tell much... the suspicion you wrote further below is correct. > I then decided to try port B, so i wired the flash chip on port B and > used this command > flashrom -p ft2232_spi:type=2232H,port=B > And i get this: > flashrom v0.9.6.1-r1704 on Windows 6.1 (x86) > flashrom is free software, get the source code at http://www.flashrom.org > > Calibrating delay loop... OK. > Unable to reset FTDI device (USB device unavailable). > Unable to set latency timer (USB device unavailable). > Unable to set bitmode to SPI (USB device unavailable). > ftdi_write_data: -666, USB device unavailable > Error: Programmer initialization failed. That looks a bit fishy but might have been fixed in the meantime. I would like to see the output for the same command line with a current version... > The chip i'm trying to work with is a MACRONIX_MX25L25635F, specified in > the flashchips.h line 478 of the source code v0.9.8 > #define MACRONIX_MX25L25635F 0x2019 /* Same as MX25L25639F, but > the latter seems to not support REMS */ > > So i decided to cross compile the new version 0.9.8 for windows thinking > that maybe the v0.9.6.1 doesn't recognise my chip ? Yes, indeed. And the current one won't help you either. The problem is that this chip requires 32 bit addresses instead of the 24 bit address used up to now in SPI flash chips. flashrom does not support this yet and so supporting your chip is not feasibly right now. There exist some patches though that would make it work. > Anyway i installed mingw and used msys64 to get all the packages and > update everything correctly, i also put the libusb and libftdi in the > bin, lib and include directory, i think everything is installed > correctly but... > When i try to compileflashrom with make i get this error > $ make > Files don't seem to be under version control. Replacing all version > templates with 0.9.8-r1888. > Package libftdi was not found in the pkg-config search path. > Perhaps you should add the directory containing `libftdi.pc' > to the PKG_CONFIG_PATH environment variable > No package 'libftdi' found > Checking for a C compiler... found. > Target arch is x86 > Target OS is MinGW > Checking for libusb-0.1/libusb-compat headers... found. > Checking if libusb-0.1 is usable... yes. > Checking for FTDI support... found. > Checking for FT232H support in libftdi... not found. > Checking for utsname support... not found. > make[1]: Entering directory `/c/flashrom/util/ich_descriptors_tool' > make[1]: Nothing to be done for `all'. > make[1]: Leaving directory `/c/flashrom/util/ich_descriptors_tool' I don't see an error. The pkgconfig message is not an error.. > And if i try with make CC=i686-w64-mingw32-gcc i get this error > $ make CC=i686-w64-mingw32-gcc > Files don't seem to be under version control. Replacing all version > templates with 0.9.8-r1888. > Package libftdi was not found in the pkg-config search path. > Perhaps you should add the directory containing `libftdi.pc' > to the PKG_CONFIG_PATH environment variable > No package 'libftdi' found > Checking for a C compiler... found. > Target arch is x86 > Target OS is MinGW > Checking for libusb-0.1/libusb-compat headers... In file included from > c:/MinGW/i686-w64-mingw32/include/stddef.h:7:0, > from > c:/MinGW/lib/gcc/i686-w64-mingw32/5.2.0/include/stddef.h:1, > from c:/MinGW/include/stdlib.h:22, > from c:/MinGW/include/lusb0_usb.h:4, > from .test.c:3: > c:/MinGW/i686-w64-mingw32/include/crtdefs.h:123:19: error: expected '=', > ',', ';', 'asm' or '__attribute__' before 'typedef' > __MINGW_EXTENSION typedef __int64 __time64_t; > ^ > c:/MinGW/i686-w64-mingw32/include/crtdefs.h:138:9: error: unknown type > name '__time64_t' > typedef __time64_t time_t; > ^ > not found. > > Please install libusb-0.1 headers or libusb-compat headers. > See README for more information. > > make: *** [hwlibs] Error 1 > > Could you help me out to compile le latest version of flashrom please ? Sounds like a bug in mingw or libusb to me... cross-compiling with mingw under Linux for Windows should work fine since a long time ago. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

W836xx: 5015AH2 (LENOVO ThinkPad L520): flashrom -V
by Loic 08 Feb '16

08 Feb '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I just tested the following material who not yet supported: flashrom -V -p internal flashrom v0.9.7-r1852 on Linux 4.2.0-16-generic (x86_64) flashrom is free software, get the source code at http://www.flashrom.org flashrom was built with libpci 3.2.1, GCC 4.9.1, little endian Command line (3 args): flashrom -V -p internal Calibrating delay loop... OS timer resolution is 1 usecs, 1596M loops per second, 10 myus = 10 us, 100 myus = 100 us, 1000 myus = 1000 us, 10000 myus = 10010 us, 4 myus = 4 us, OK. Initializing internal programmer No coreboot table found. Using Internal DMI decoder. DMI string chassis-type: "Notebook" Laptop detected via DMI. DMI string system-manufacturer: "LENOVO" DMI string system-product-name: "5015AH2" DMI string system-version: "ThinkPad L520" DMI string baseboard-manufacturer: "LENOVO" DMI string baseboard-product-name: "5015AH2" DMI string baseboard-version: "Not Available" W836xx enter config mode worked or we were already in config mode. W836xx leave config mode had no effect. Active config mode, unknown reg 0x20 ID: 85. ... Found ITE EC, ID 0x8518, Rev 0x02 on port 0x2e. Aborting. Error: Programmer initialization failed. I am at your disposal for further testing if-necessary. Thanks - -- Best regards, Loic -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQYcBAEBAgAGBQJWuNplAAoJEOU2PAjT6toDhScv/0HC174AdSVYJr0VMF30sIW7 k67mEXjlmWFml2lsaWgId7hFV/eDtcMCJBvKKvp3yrdDKP3xftvkw1OBKlvNiIC0 NmXB3+oK4Wv1hSmqLa2+C+O0u87qcVkrMyJowootVtrX7EDSBNyRAkDNLBT+0T7A WAvzOBCXHy1b68x2jTse0HlkoKXqfmjzEmu80MM75oGFYaar2OVlrMuAQ9ExOQsJ k9hw7f0VRjPTrqFIF6T9CriimFporX2xguVR2Ah2gNQ2zgx74YA3++BhnWhVMvmx fCnsw1WV6JqfMm0M88/xM3dFlWh3RilxQImDhdxLlD8savqq67Qe8uV7pxyZ9KpU 0xdIVkRHpVell5BZdFXoDWKIJcYob4zNCdZDSwZfvTZRSf2E80Gp3dYix9puM+w7 7DJqTfAGicAOZ33oo1LIITcns3jcD7snBgfpRSPtt8v3SecU3/ex7359LgSNnWn+ D2xE/7osKtTt0eILbKpGnFlpS81LYTAGwyuYsp9BIzvhdiqVUtDgYib7JJLaD4Z3 tp4lEbAbVVAwGrjUo+HkWBh2qhApAT6sbyJlGQPXHDG1LAvZOblDwyIRDYRLzXPS VJ5fxI2xtVPt0/AopeFTLArTaFR0lGrQm1WzOntS0wiH9VOb1Jvs0UxLkcroV163 qTHoJnWQUQef1Z6GCAKUQHFhkcPQAnNF63DowJiCFUK3WdcNGYqjtzzmjot0T90Z H2LTRJvThJj0+1e/oxMvVHdXEpGlQpkqLmWf74n+mdZcyCJ5MwrZkmLjCOXwtLqU AvCS7KfzCBk+0gs9dsxJ7mkww9cOQqo35bM2c+J3tW7Y6b+6sha2lWjWl4ubNkAx 8ItxNifQU6EjfI0R1L1/6K0f6PCdu/FtagM9p20np9L8Qyl1io8yHahKLkigtnVp T9Qq8BjuC73pVQ/M2VhVBNkqI9Q3ZtcZLs3P/i9Sch5K6ayL/DGShQQNVZxgEsug h2IPTLzLQ34OWWhGNdiwaUVtwtJk4t9nCuEjvZcfXQHsCJH2W+j6/qJYYYIgwbx9 UYkdg7Tb3l8SM7xqbXWmfUAWnuojMa46BUKsCbqaxOekMZL4n64fDL0CGND/UrQ3 lktXc8Su2uJ/j77+CEf3vfljamqCkOHJgMSw+i1fqQy+MHm2LIZ+4qh2Ize+gVNZ XvI0Z1LXzk61MRTQ7yA7srYOLHCSVzYjuHrDmXzmFI5SFaIeCrktSX3BGw1HJBV7 u9gH59dYUEaZBVx41gJ0+ZhTQm/ivFeA3ITnaVmiPOJ0uxzVWi8Qkw22ih7f21Bm ZxlFPshqOG/4kozm01azqXD0oWx6mqufc/lasvOZFbKt1bnpzKmKnH8VOkiWfsw/ EgZDet5+9Qr1ay/k+5XlonsmI5qMuFsIAceBJsI0MY7RNRYXlK5OG3zrOe/75gpG 50d97Luu0vLQx0sUxGhpvAbZe5/fAiiJEyUp6oS4fpiHXaGaqAxlJvAyuMnf7p2t dtquKOBai5iz20+6m/BnX/QdegSQmwCc4hw+KtEKuPR3J2NAunVo3B/ZCnR+S1Yc CP4E0Yb8HbzBwq5/9u6SAS2h/iTlqLrMlqz9cL/laHP4nkqHb+q/byPcnP3HgNIY OvcTgZU83ufORY6hc2Mayt2KGbEkEHIvKN8o8ADMX65VptuY53jiDu/Uiz1QsCYW mgLBKXl/GZiLrPX8fF/66v83yZQbccF51qn47TWnXbm4c0fGK62c2FOVelc+xiBU ZZRJ3BzVHUKOFcyBgZetn6t0mbk+mbKo4mX0ouQlNMXm+e5tl6tN7ov22kucPYa6 CjNC1TlTjbFJpqK6BibsYqZI5H46OKtTfD7Q+rVLXBroOP9zKPB0ifyAdHmtzhGj FsrKNGY2H/aAFf4CTPdtIy+GaWarEd3Ld1yuFT3AwfLBdFalfJulvqWMee6nmpDj S7foC4CIqtbBK54SIYf5T8F/B67xpoDt1XXghiQO2soG+V24Wwx/tzmGWZjuo5kP 6TQmw9lCBY2whvLaPK4YSkw4pXOhfZeoDbz1GmZorA== =9EMC -----END PGP SIGNATURE-----

1 0

Re: [flashrom] [PATCH] Fix compilation on non-i386 architectures on OpenBSD.
by Stefan Tauner 07 Feb '16

07 Feb '16

On Sat, 30 Jan 2016 12:31:49 +0100 Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> wrote: > We use a header for MSR accesses on AMD Geodes that does only exist > on 32 bit x86 machines. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Self-acked and committed in r1924. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom