Update flashrom to 0.9.7.

changes since 0.9.6:

==New major user-visible features==
* Warn if all blocks were skipped while writing.
* Fix evil twins of Macronix MX25L1605, MX25L3205, MX25L6405.
* Exit if there are unused programmer parameters.
=== Related to programmers ===
* internal:
** AMD Geode on OpenBSD
** Add safe support for the integrated micro controller (IMC) in AMD chipsets.
** Add full support for VX800/VX820, VX855/VX875 and VX900 (both SPI and LPC).
** Various new untested board enables (please don't run away without testing our work).
* serprog
** Add support for setting the SPI frequency.
** Add opcode to control the programmer's output drivers.
** Enable serprog on Windows.
* buspirate_spi
** Improvements to support different firmware versions safely.
** Support the new fast SPI mode present in Bus Pirate firmware v5.5 or newer.
** Add user interface to activate the Bus Pirate pull-up resistors.
* ftdi_spi
** Allow to select FTDI device by serial number.
** Add support for all 4 possible channels.
** Add support for FT232H.
* pony_spi: Add support for AJAWe.
* Add support for Realtek RTL8169.
* Add Altera USB-Blaster SPI programmer.
* dediprog:
** Add a "device" parameter to support multiple devices.
** Adds a programmer parameter 'spispeed'.

===New or refined chips===
* AMIC A25L(Q) series
* Atmel AT26DF041
* Atmel AT49(H)F010, AT49F080 and AT49F080T
* Atmel AT25F series (AT25F512, AT25F512A, AT25F512B, AT25F1024, AT25F1024A, AT25F2048, AT25F4096)
* Eon EN25F64
* Eon EN25S series
* More Eon EN25QH chips
* More GigaDevice GD25* devices
* Intel S33 series (QB25FxxxS33x8)
* Macronix MX25U1635E, MX25U3235E/F and MX25U6435E/F
* Micron (Numonyx) N25Q series
* Micron (ST) M45PE series
* Micron (ST) M25PX80
* Nantronics N25 series
* PMC Pm25LV and Pm25LD series
* Sanyo LE25FW series
* Spansion S25FL2 and S25FL...S series
* SST SST25WF512, SST25WF010, SST25WF020 and SST25WF040
* Winbond W39F010/W39L010/W39L020

changes since 0.9.5:

==User interface changes==
* The -p/--programmer parameter is now mandatory for all operations that access the programmer/chip.
*: Previously there was a default programmer selected at build time. This was convenient for most users, but created a danger for others that increased with the number of platforms and programmers supported, namely that they get used to a default programmer that later changes when they use another binary. It is very easy to brick a mainboard in case you do not notice you are writing its firmware instead of a device attached to an external programmer. The disadvantage is of course that many users have now to add '''-p internal''' to the command line when they want to do ''the obvious'' and flash their mainboards.
* It is now possible to let flashrom create log files directly (by using the new -o/--output option).
* flashrom now checks for duplicate -i/--image arguments (which are used together with layout files).

==New major user-visible features==
* Programmer support:
** new driver ''ponyprog'' for hardware similar to SI Prog
** native SPI AAI write support to the Dediprog SF100 driver
* Support for new chips:
** Atmel AT49F040
** Eon EN25QH32
** Eon EN29LV640B
** GigaDevice GD25QXX
** Numonyx N25Q064
** PMC Pm39LV512

==Infrastructural improvements and fixes==
* The dummy programmer got support for SFDP and now has a dedicated status register.
* Various minor refactorings of SPI-related code.
* The code generating the list of supported hardware for the wiki has been improved.
* Many exit() calls have been replaced by proper error handling.
* I/O permissions are now released automatically on shutdown.
* Preliminary work on Winbond W836xx and ITE IT8707F/IT8710F detection.

= Minor versions =
flashrom 0.9.6 had a small bug regarding the version string, which has been fixed in 0.9.6.1.

4 files changed, 6 insertions, 65 deletions

diff --git a/sysutils/flashrom/Makefile b/sysutils/flashrom/Makefile
index 8a4c3a4d49f..bbea3b02464 100644
--- a/sysutils/flashrom/Makefile
+++ b/sysutils/flashrom/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2012/10/23 19:51:02 asau Exp $
+# $NetBSD: Makefile,v 1.7 2013/12/09 18:54:24 jakllsch Exp $
 #
 
-DISTNAME=	flashrom-0.9.5.2
+DISTNAME=	flashrom-0.9.7
 PKGNAME=	${DISTNAME:S/-r/pre/}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.flashrom.org/releases/
diff --git a/sysutils/flashrom/distinfo b/sysutils/flashrom/distinfo
index 66664394f58..0a6831fd788 100644
--- a/sysutils/flashrom/distinfo
+++ b/sysutils/flashrom/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.6 2012/11/23 12:08:04 joerg Exp $
+$NetBSD: distinfo,v 1.7 2013/12/09 18:54:24 jakllsch Exp $
 
-SHA1 (flashrom-0.9.5.2.tar.bz2) = 483c16a4a8bb7ceec8ea439b13e2b97d669deb25
-RMD160 (flashrom-0.9.5.2.tar.bz2) = dba65b6f12370eb686321e937e00479aff4a3739
-Size (flashrom-0.9.5.2.tar.bz2) = 347242 bytes
-SHA1 (patch-bitbang__spi.c) = 63fa8611cf7ebe9fa5c8e669d860c7e21d1a1095
-SHA1 (patch-ichspi.c) = 6ef54e13e6075b665fb125dd99b53887a606fa8f
+SHA1 (flashrom-0.9.7.tar.bz2) = d08b4073ea3ebf63f03c3e502f4291f50ef348ee
+RMD160 (flashrom-0.9.7.tar.bz2) = e160e0ac1e0e138702f3f467707175df96b7e6b1
+Size (flashrom-0.9.7.tar.bz2) = 408883 bytes
diff --git a/sysutils/flashrom/patches/patch-bitbang__spi.c b/sysutils/flashrom/patches/patch-bitbang__spi.c
deleted file mode 100644
index e3513550daf..00000000000
--- a/sysutils/flashrom/patches/patch-bitbang__spi.c
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-bitbang__spi.c,v 1.1 2012/11/23 12:08:04 joerg Exp $
-
---- bitbang_spi.c.orig	2012-11-22 21:16:09.000000000 +0000
-+++ bitbang_spi.c
-@@ -26,33 +26,33 @@
- #include "spi.h"
- 
- /* Note that CS# is active low, so val=0 means the chip is active. */
--static void bitbang_spi_set_cs(const const struct bitbang_spi_master *master, int val)
-+static void bitbang_spi_set_cs(const struct bitbang_spi_master *master, int val)
- {
- 	master->set_cs(val);
- }
- 
--static void bitbang_spi_set_sck(const const struct bitbang_spi_master *master, int val)
-+static void bitbang_spi_set_sck(const struct bitbang_spi_master *master, int val)
- {
- 	master->set_sck(val);
- }
- 
--static void bitbang_spi_set_mosi(const const struct bitbang_spi_master *master, int val)
-+static void bitbang_spi_set_mosi(const struct bitbang_spi_master *master, int val)
- {
- 	master->set_mosi(val);
- }
- 
--static int bitbang_spi_get_miso(const const struct bitbang_spi_master *master)
-+static int bitbang_spi_get_miso(const struct bitbang_spi_master *master)
- {
- 	return master->get_miso();
- }
- 
--static void bitbang_spi_request_bus(const const struct bitbang_spi_master *master)
-+static void bitbang_spi_request_bus(const struct bitbang_spi_master *master)
- {
- 	if (master->request_bus)
- 		master->request_bus();
- }
- 
--static void bitbang_spi_release_bus(const const struct bitbang_spi_master *master)
-+static void bitbang_spi_release_bus(const struct bitbang_spi_master *master)
- {
- 	if (master->release_bus)
- 		master->release_bus();
diff --git a/sysutils/flashrom/patches/patch-ichspi.c b/sysutils/flashrom/patches/patch-ichspi.c
deleted file mode 100644
index be8fc61e948..00000000000
--- a/sysutils/flashrom/patches/patch-ichspi.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ichspi.c,v 1.1 2012/11/23 12:08:04 joerg Exp $
-
---- ichspi.c.orig	2012-11-22 21:15:44.000000000 +0000
-+++ ichspi.c
-@@ -1125,7 +1125,7 @@ static void ich_hwseq_set_addr(uint32_t 
- static uint32_t ich_hwseq_get_erase_block_size(unsigned int addr)
- {
- 	uint8_t enc_berase;
--	static const uint32_t const dec_berase[4] = {
-+	static const uint32_t dec_berase[4] = {
- 		256,
- 		4 * 1024,
- 		8 * 1024,