flashrom svn ver. 1850

- Add support for Winbond W25Q40.V chips - Add support for Macronix MX23L1654, MX23L6454 and MX23L12854 mask ROMs - Add support for Intel Wildcat Point PCH - Add support for Intel Silvermont: Bay Trail, Rangeley and Avoton - Add support for S25FL128P, S25FL129P chips - Add support for a bunch of 29GL parallel flash chips - Add support for Atmel AT49LH004 and AT49LH00B4 - Add new programmer for SPI EEPROMs attached to Intel 82580 NICs - Add support for AMD Bolton chipset - Add Board Enable for ASUS Vintage 2 PH1 (P5LD2-MQ) - Add support for Macronix MX29F022(N)B and MX29F022(N)T - Add support for Macronix MX25U12835F - Add support for Sanyo LE25FW106 - Add IT8212F PCI ATA controller as programmer - Add support for Atmel (now Adesto) AT25DL081 and AT25DL161 - Add VIA VT6421A LPC programmer driver - Add support for ESMT F25L32PA - Add support for Sanyo LE25FW406A - Add support for new AMD SPI controller (SPI 100) - Add support for Sanyo LE25FU406B - Add support for SST25LF020A - Add support for Spansion S25FL132K and S25FL164K - Add support for SST25WF08 - Add support for Macronix MX23L3254 mask ROM - Add support for TUMPA Lite - Add support for Intel 82574L - Add board enable for ASUS A7V8X-MX - Add board enable for ASUS P5LD2-VM DH - Add board enable for abit BF6 - Add support for SST25VF512A, ST25VF020, SST25VF020B chips - Add pinout for Wiggler LPT - Add pinout for Atmel STK200/300 - Add pinout for Altera ByteBlasterMV - Add support for ST M50LPW080 chip - Add an internal DMI decoder - Add board enable for Bcom WinNET P680 - Add support for AT45CS1282 chip - Add support for AT45DB321C - Add support for Atmel AT45DB* chips - Add support for Fujitsu MBM29LV160BE/TE - Add ability to select between chips on GIGABYTE DualBIOS boards - Temporarily disable ftdi support Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2014-09-11 22:48:16 +04:00 · 2014-09-11 22:48:16 +04:00 · 68abf3998f
commit 68abf3998f
parent 41cb1f2a1b
10 changed files with 221 additions and 160 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,3 +5,4 @@ flashrom-0.9.2.tar.bz2
 /flashrom-0.9.4.tar.bz2
 /flashrom-0.9.5.2.tar.bz2
 /flashrom-0.9.6.1.tar.bz2
+/flashrom-0.9.7.tar.bz2
--- a/flashrom-0001-Initial-commit-of-autotools-related-files.patch
+++ b/flashrom-0001-Initial-commit-of-autotools-related-files.patch
@ -1,35 +1,28 @@
-From b3d958119dea5580df83370d0c0bec5d581f5ea8 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Fri, 17 Sep 2010 18:58:28 +0400
-Subject: [PATCH 1/7] Initial commit of autotools-related files
+Subject: [PATCH] Initial commit of autotools-related files

 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
- Makefile.am  | 225 +++++++++++++++++++++++++++++++++++++
- bootstrap.sh |   4 +
- configure.ac | 361 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 590 insertions(+)
- create mode 100644 Makefile.am
- create mode 100755 bootstrap.sh
- create mode 100644 configure.ac

 diff --git a/Makefile.am b/Makefile.am
 new file mode 100644
-index 0000000..fb07af2
+index 0000000..ea25e2c
 --- /dev/null
 +++ b/Makefile.am
-@@ -0,0 +1,225 @@
+@@ -0,0 +1,252 @@
 +sbin_PROGRAMS = flashrom
 +
 +man_MANS = flashrom.8
 +
 +# FIXME use "config.h" in the future
-+DEFS += -DFLASHROM_VERSION=\"@VERSION@\" -DCONFIG_DEFAULT_PROGRAMMER=PROGRAMMER_INTERNAL
+DEFS += -DFLASHROM_VERSION=\"@VERSION@\" -DCONFIG_DEFAULT_PROGRAMMER=PROGRAMMER_INTERNAL -DSTANDALONE -DCONFIG_DEFAULT_PROGRAMMER_ARGS=\"\"
 +
 +if HAVE_DMIDECODE
-+DEFS += -DDMIDECODE_PATH=\"@DMIDECODE@\"
+if HAVE_DMIDECODE_EXT
+DEFS += -DCONFIG_INTERNAL_DMI=0 -DDMIDECODE_PATH=\"@DMIDECODE@\"
 +else
-+DEFS += -DSTANDALONE
+DEFS += -DCONFIG_INTERNAL_DMI=1 -DDMIDECODE_PATH=\"\"
+endif
 +endif
 +
 +
@ -39,12 +32,12 @@ index 0000000..fb07af2
 +	cbtable.c \
 +	coreboot_tables.h \
 +	chipset_enable.c \
-+	dmi.c \
 +	internal.c \
 +	processor_enable.c
 +if HAVE_X86_ONLY_INTERNAL
 +internal_x86_only_SOURCES = \
 +	amd_imc.c \
+	dmi.c \
 +	ich_descriptors.c \
 +	ich_descriptors.h \
 +	ichspi.c \
@ -102,6 +95,16 @@ index 0000000..fb07af2
 +DEFS += -DCONFIG_ATAHPT=1
 +endif
 +
+if HAVE_ATAVIA
+atavia_SOURCES = atavia.c
+DEFS += -DCONFIG_ATAVIA=1
+endif
+
+if HAVE_IT8212
+it8212_SOURCES = it8212.c
+DEFS += -DCONFIG_IT8212=1
+endif
+
 +if HAVE_FT2232_SPI
 +ft_2232_spi_SOURCES = ft2232_spi.c
 +DEFS += -DCONFIG_FT2232_SPI=1
@ -137,6 +140,12 @@ index 0000000..fb07af2
 +DEFS += -DCONFIG_NICINTEL_SPI=1
 +endif
 +
+if HAVE_NICINTEL_EEPROM
+nicintel_eeprom_SOURCES = nicintel_eeprom.c
+DEFS += -DCONFIG_NICINTEL_EEPROM=1
+endif
+
+
 +if HAVE_GFXOGP
 +gfxogp_SOURCES = ogp_spi.c
 +DEFS += -DCONFIG_OGP_SPI=1
@ -180,14 +189,13 @@ index 0000000..fb07af2
 +endif
 +
 +chip_SOURCES = 82802ab.c \
+	       at45db.c \
 +	       chipdrivers.h \
 +	       flashchips.c \
 +	       flashchips.h \
 +	       en29lv640b.c \
 +	       jedec.c \
-+	       m29f400bt.c \
 +	       opaque.c \
-+	       pm49fl00x.c \
 +	       sfdp.c \
 +	       spi.c \
 +	       spi.h \
@ -196,23 +204,25 @@ index 0000000..fb07af2
 +	       sst_fwhub.c \
 +	       sst28sf040.c \
 +	       sst49lfxxxc.c \
-+	       stm50flw0x0x.c \
+	       stm50.c \
 +	       w29ee011.c \
 +	       w39.c
 +
 +cli_SOURCES = \
-+	flashrom.c \
 +	cli_classic.c \
+	cli_common.c \
 +	cli_output.c \
 +	print.c
 +
-+lib_SOURCES = layout.c
+lib_SOURCES = flashrom.c \
+	      helpers.c \
+	      layout.c \
+	      programmer.c \
+	      programmer.h \
+	      udelay.c
 +
 +flashrom_SOURCES = \
 +	flash.h \
-+	programmer.c \
-+	programmer.h \
-+	udelay.c \
 +	$(internal_SOURCES) \
 +	$(internal_x86_only_SOURCES) \
 +	$(serprog_SOURCES) \
@ -224,12 +234,15 @@ index 0000000..fb07af2
 +	$(gfxnvidia_SOURCES) \
 +	$(satasii_SOURCES) \
 +	$(atahpt_SOURCES) \
+	$(atavia_SOURCES) \
+	$(it8212_SOURCES) \
 +	$(ft_2232_spi_SOURCES) \
 +	$(dummy_SOURCES) \
 +	$(drkaiser_SOURCES) \
 +	$(nicrealtek_SOURCES) \
 +	$(nicnatsemi_SOURCES) \
 +	$(nicintel_SOURCES) \
+	$(nicintel_eeprom_SOURCES) \
 +	$(nicintel_spi_SOURCES) \
 +	$(gfxogp_SOURCES) \
 +	$(buspirate_SOURCES) \
@ -243,7 +256,12 @@ index 0000000..fb07af2
 +	$(cli_SOURCES) \
 +	$(lib_SOURCES)
 +
-+EXTRA_DIST = COPYING Documentation README util arch.h os.h
+EXTRA_DIST = COPYING Documentation README util arch.h os.h util flashrom.8.tmpl
+
+BUILT_SOURCES = flashrom.8
+
+flashrom.8: flashrom.8.tmpl
+	@sed -e '1 s#".*".*#"$(shell ./util/getrevision.sh -d flashrom.8.tmpl)" "$(VERSION)"#' <$< >$@
 diff --git a/bootstrap.sh b/bootstrap.sh
 new file mode 100755
 index 0000000..0213288
@ -256,11 +274,11 @@ index 0000000..0213288
 +automake --add-missing --copy --force-missing
 diff --git a/configure.ac b/configure.ac
 new file mode 100644
-index 0000000..69044a1
+index 0000000..a8858ab
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,361 @@
-+AC_INIT([flashrom], [0.9.6.1-r1705], [flashrom@flashrom.org], [flashrom], [http://www.flashrom.org/])
+@@ -0,0 +1,400 @@
+AC_INIT([flashrom], [0.9.7-r1850], [flashrom@flashrom.org], [flashrom], [http://www.flashrom.org/])
 +
 +AC_PREREQ(2.59)
 +
@ -303,6 +321,14 @@ index 0000000..69044a1
 +	    AC_HELP_STRING([--with-atahpt],[Highpoint (HPT) ATA/RAID controller support. IMPORTANT: This code is not yet working!]),
 +	    [atahpt="$withval"],[atahpt="no"])
 +
+AC_ARG_WITH([atavia],
+	    AC_HELP_STRING([--with-atavia],[VIA VT6421A LPC programmer support.]),
+	    [atavia="$withval"],[atavia="no"])
+
+AC_ARG_WITH([it8212],
+	    AC_HELP_STRING([--with-it8212],[Innovision Multimedia IT8212F PCI PATA/RAID controller support.]),
+	    [it8212="$withval"],[it8212="no"])
+
 +AC_ARG_WITH([ft2232_spi],
 +	    AC_HELP_STRING([--with-ft2232-spi],[FT2232 SPI dongles support.]),
 +	    [ft2232_spi="$withval"],[ft2232_spi="yes"])
@ -331,6 +357,11 @@ index 0000000..69044a1
 +	    AC_HELP_STRING([--with-nicintel-spi],[SPI on Intel NICs support.]),
 +	    [nicintel_spi="$withval"],[nicintel_spi="yes"])
 +
+AC_ARG_WITH([nicintel_eeprom],
+	    AC_HELP_STRING([--with-nicintel-eeprom],[EEPROM on Intel NICs support.]),
+	    [nicintel_eeprom="$withval"],[nicintel_eeprom="yes"])
+
+
 +AC_ARG_WITH([gfxogp],
 +	    AC_HELP_STRING([--with-gfxogp],[The Open Graphics Project graphics card support.]),
 +	    [gfxogp="$withval"],[gfxogp="yes"])
@ -351,6 +382,13 @@ index 0000000..69044a1
 +	    AC_HELP_STRING([--with-satamv],[Marvell SATA controllers support.]),
 +	    [satamv="$withval"],[satamv="yes"])
 +
+AC_ARG_WITH([dmidecode],
+	    AC_HELP_STRING([--with-dmidecode],[Enable dmidecode (only for x86/x86_64).]),
+	    [dmidecode="$withval"],[dmidecode="yes"])
+AC_ARG_WITH([dmidecode_ext],
+	    AC_HELP_STRING([--with-dmidecode-external],[Use external dmidecode utility instead of internal one (only for x86/x86_64).]),
+	    [dmidecode_ext="$withval"],[dmidecode_ext="yes"])
+
 +# Specific for Flashrom Wiki
 +AC_ARG_WITH([print_wiki],
 +	    AC_HELP_STRING([--with-print-wiki],[enable wiki export support. It is only useful if you have Flashrom wiki access.]),
@ -371,7 +409,13 @@ index 0000000..69044a1
 +		else
 +			enable_x86_only_internal="no"
 +		fi
+
 +		AC_CHECK_HEADERS([sys/io.h])
+
+		if test "$dmidecode_ext" = 'yes'; then
+			AC_PATH_PROG([DMIDECODE], dmidecode, [], [$PATH$PATH_SEPARATOR/usr/sbin])
+		fi
+
 +		;;
 +	mips*|power*|arm*)
 +		enable_x86_only_internal="n/a"
@ -399,6 +443,11 @@ index 0000000..69044a1
 +			AC_MSG_WARN([Highpoint (HPT) ATA/RAID controller support is not supported for this target ($target_cpu). No PCI port I/O access on this architecture yet.])
 +			atahpt="no"
 +		fi
+		if test "$dmidecode" = 'yes' -o "$dmidecode_ext" = 'yes' ; then
+			AC_MSG_WARN([DMI handling is not supported for this target ($target_cpu).])
+			dmidecode="no"
+			dmidecode_ext=""
+		fi
 +		;;
 +	*)
 +		AC_MSG_ERROR([No support for this CPU ($target_cpu) yet])
@ -475,11 +524,14 @@ index 0000000..69044a1
 +	"$gfxnvidia" = 'yes' -o \
 +	"$satasii" = 'yes' -o \
 +	"$atahpt" = 'yes' -o \
+	"$atavia" = 'yes' -o \
+	"$it8212" = 'yes' -o \
 +	"$drkaiser" = 'yes' -o \
 +	"$nicrealtek" = 'yes' -o \
 +	"$nicnatsemi" = 'yes' -o \
 +	"$nicintel" = 'yes' -o \
 +	"$nicintel_spi" = 'yes' -o \
+	"$nicintel_eeprom" = 'yes' -o \
 +	"$gfxogp" = 'yes' -o \
 +	"$satamv" = 'yes' ; then
 +	pci="yes"
@ -500,8 +552,6 @@ index 0000000..69044a1
 +AC_PROG_INSTALL
 +AC_PROG_MAKE_SET
 +
-+AC_PATH_PROG([DMIDECODE], dmidecode, [], [$PATH$PATH_SEPARATOR/usr/sbin])
-+
 +# Checks for header files.
 +AC_CHECK_HEADERS([limits.h stddef.h stdint.h stdlib.h string.h sys/time.h sys/utsname.h])
 +
@ -553,7 +603,8 @@ index 0000000..69044a1
 +
 +# For Makefile.am
 +AM_CONDITIONAL(HAVE_INTERNAL, test "$internal" = "yes")
-+AM_CONDITIONAL(HAVE_DMIDECODE, test "$DMIDECODE" != "")
+AM_CONDITIONAL(HAVE_DMIDECODE, test "$dmidecode" = "yes")
+AM_CONDITIONAL(HAVE_DMIDECODE_EXT, test "$DMIDECODE" != "")
 +AM_CONDITIONAL(HAVE_X86_ONLY_INTERNAL, test "$enable_x86_only_internal" = "yes")
 +AM_CONDITIONAL(HAVE_SERPROG, test "$serprog" = "yes")
 +AM_CONDITIONAL(HAVE_LINUX_SPI, test "$linux_spi" = "yes")
@ -564,6 +615,8 @@ index 0000000..69044a1
 +AM_CONDITIONAL(HAVE_GFXNVIDIA, test "$gfxnvidia" = "yes")
 +AM_CONDITIONAL(HAVE_SATASII, test "$satasii" = "yes")
 +AM_CONDITIONAL(HAVE_ATAHPT, test "$atahpt" = "yes")
+AM_CONDITIONAL(HAVE_ATAVIA, test "$atavia" = "yes")
+AM_CONDITIONAL(HAVE_IT8212, test "$it8212" = "yes")
 +AM_CONDITIONAL(HAVE_FT2232_SPI, test "$ft2232_spi" = "yes")
 +AM_CONDITIONAL(HAVE_DUMMY, test "$dummy" = "yes")
 +AM_CONDITIONAL(HAVE_DRKAISER, test "$drkaiser" = "yes")
@ -571,6 +624,7 @@ index 0000000..69044a1
 +AM_CONDITIONAL(HAVE_NICNATSEMI, test "$nicnatsemi" = "yes")
 +AM_CONDITIONAL(HAVE_NICINTEL, test "$nicintel" = "yes")
 +AM_CONDITIONAL(HAVE_NICINTEL_SPI, test "$nicintel_spi" = "yes")
+AM_CONDITIONAL(HAVE_NICINTEL_EEPROM, test "$nicintel_eeprom" = "yes")
 +AM_CONDITIONAL(HAVE_GFXOGP, test "$gfxogp" = "yes")
 +AM_CONDITIONAL(HAVE_BUSPIRATE_SPI, test "$buspirate_spi" = "yes")
 +AM_CONDITIONAL(HAVE_USBBLASTER_SPI, test "$usbblaster_spi" = "yes")
@ -603,9 +657,10 @@ index 0000000..69044a1
 +      Bitbang SPI: .................. ${bitbang_spi}
 +      3COM NIC: ..................... ${nic3com}
 +      NVIDIA GFX: ................... ${gfxnvidia}
-+      Open Graphics Project GFX: .... ${gfxogp}
 +      Silicon Image SATA: ........... ${satasii}
 +      Highpoint ATA: ................ ${atahpt}
+      VIA VT6421A LPC: .............. ${atavia}
+      IT8212F PCI PATA/RAID: ........ ${it8212}
 +      FT232 SPI: .................... ${ft2232_spi}
 +      Dummy: ........................ ${dummy}
 +      Dr. Kaiser: ................... ${drkaiser}
@ -613,6 +668,8 @@ index 0000000..69044a1
 +      National Semiconductor NIC: ... ${nicnatsemi}
 +      Intel NIC: .................... ${nicintel}
 +      Intel NIC SPI: ................ ${nicintel_spi}
+      Intel NIC EEPROM: ............. ${nicintel_eeprom}
+      Open Graphics Project GFX: .... ${gfxogp}
 +      Bus Pirate SPI: ............... ${buspirate_spi}
 +      Altera USB-Blaster SPI: ....... ${usbblaster_spi}
 +      Dediprog SF100: ............... ${dediprog}
@ -621,6 +678,3 @@ index 0000000..69044a1
 +
 +------------------------------------------------------------------------
 +])
-- 
-1.8.3.1
-
--- a/flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch
+++ b/flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch
@ -1,26 +1,19 @@
-From e8b036673ed701e08391260009ca458acd494343 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Sat, 12 Jun 2010 22:13:53 +0400
-Subject: [PATCH 2/7] Use dmidecode path defined at configure stage
+Subject: [PATCH] Use dmidecode path defined at configure stage

 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
- dmi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/dmi.c b/dmi.c
-index 242889f..a10fc4f 100644
+index a7a9a61..093b9a2 100644
 --- a/dmi.c
 +++ b/dmi.c
-@@ -87,7 +87,7 @@ static const struct {
- };
+@@ -294,7 +294,7 @@ out:
+ #else /* CONFIG_INTERNAL_DMI */
 
- #define DMI_COMMAND_LEN_MAX 260
+ #define DMI_COMMAND_LEN_MAX 300
 -static const char *dmidecode_command = "dmidecode";
 +static const char *dmidecode_command = DMIDECODE_PATH;
 
- static char *dmistrings[ARRAY_SIZE(dmidecode_names)];
- 
-- 
-1.8.3.1
-
+ static char *get_dmi_string(const char *string_name)
+ {
--- a/flashrom-0003-Use-macros-from-configure-stage-instead-of-HAVE_UTSN.patch
+++ b/flashrom-0003-Use-macros-from-configure-stage-instead-of-HAVE_UTSN.patch
@ -1,15 +1,11 @@
-From 7b2370b38bacb4103857232c17baad7d66522744 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Sat, 18 Sep 2010 09:05:43 +0400
-Subject: [PATCH 3/7] Use macros from configure stage instead of HAVE_UTSNAME
+Subject: [PATCH] Use macros from configure stage instead of HAVE_UTSNAME

 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
- flashrom.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)

 diff --git a/flashrom.c b/flashrom.c
-index db5b1c7..bdd4aa6 100644
+index 9b82d4c..b0b97df 100644
 --- a/flashrom.c
 +++ b/flashrom.c
@@ -32,7 +32,8 @@
@ -22,7 +18,7 @@ index db5b1c7..bdd4aa6 100644
 #include <sys/utsname.h>
 #endif
 #include "flash.h"
-@@ -1603,7 +1604,7 @@ void print_sysinfo(void)
+@@ -1674,7 +1675,7 @@ void print_sysinfo(void)
 		msg_ginfo(" (unknown arch)");
 		break;
 	}
@ -31,6 +27,3 @@ index db5b1c7..bdd4aa6 100644
 	struct utsname osinfo;
 
 	uname(&osinfo);
-- 
-1.8.3.1
-
--- a/flashrom-0004-Kill-some-x86-related-ifdefs-in-code-this-is-now-con.patch
+++ b/flashrom-0004-Kill-some-x86-related-ifdefs-in-code-this-is-now-con.patch
@ -1,27 +1,9 @@
-From 87752ba22d3dbeedb93e2f8a299bf6377c6ba491 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Sat, 18 Sep 2010 09:40:01 +0400
-Subject: [PATCH 4/7] Kill some x86-related ifdefs in code - this is now
- controlled via autotools
+Subject: [PATCH] Kill some x86-related ifdefs in code - this is now controlled
+ via autotools

 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
- amd_imc.c         | 4 ----
- atahpt.c          | 6 ------
- ich_descriptors.c | 3 ---
- ich_descriptors.h | 2 --
- ichspi.c          | 4 ----
- it85spi.c         | 4 ----
- it87spi.c         | 4 ----
- mcp6x_spi.c       | 4 ----
- nic3com.c         | 6 ------
- nicnatsemi.c      | 6 ------
- nicrealtek.c      | 6 ------
- rayer_spi.c       | 5 -----
- satamv.c          | 5 -----
- sb600spi.c        | 4 ----
- wbsio_spi.c       | 4 ----
- 15 files changed, 67 deletions(-)

 diff --git a/amd_imc.c b/amd_imc.c
 index b05390c..9aabe3f 100644
@ -43,7 +25,7 @@ index b05390c..9aabe3f 100644
 -
 -#endif
 diff --git a/atahpt.c b/atahpt.c
-index f8be8c4..aa98711 100644
+index 5966be8..03627f4 100644
 --- a/atahpt.c
 +++ b/atahpt.c
@@ -18,8 +18,6 @@
@ -55,7 +37,7 @@ index f8be8c4..aa98711 100644
 #include <stdlib.h>
 #include <string.h>
 #include "flash.h"
-@@ -93,7 +91,3 @@ static uint8_t atahpt_chip_readb(const struct flashctx *flash,
+@@ -97,7 +95,3 @@ static uint8_t atahpt_chip_readb(const struct flashctx *flash,
 	OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR);
 	return INB(io_base_addr + BIOS_ROM_DATA);
 }
@ -63,8 +45,27 @@ index f8be8c4..aa98711 100644
 -#else
 -#error PCI port I/O access is not supported on this architecture yet.
 -#endif
+diff --git a/dmi.c b/dmi.c
+index 093b9a2..a37edea 100644
+--- a/dmi.c
+++ b/dmi.c
+@@ -30,8 +30,6 @@
+ #include "flash.h"
+ #include "programmer.h"
+ 
+-#if defined(__i386__) || defined(__x86_64__)
+-
+ /* Enable SMBIOS decoding. Currently legacy DMI decoding is enough. */
+ #define SM_SUPPORT 0
+ 
+@@ -482,5 +480,3 @@ int dmi_match(const char *pattern)
+ 
+ 	return 0;
+ }
+-
+-#endif // defined(__i386__) || defined(__x86_64__)
 diff --git a/ich_descriptors.c b/ich_descriptors.c
-index 528717b..b479b6a 100644
+index 1966f66..0e7675a 100644
 --- a/ich_descriptors.c
 +++ b/ich_descriptors.c
@@ -19,8 +19,6 @@
@ -76,13 +77,13 @@ index 528717b..b479b6a 100644
 #include "ich_descriptors.h"
 
 #ifdef ICH_DESCRIPTORS_FROM_DUMP
-@@ -821,4 +819,3 @@ int read_ich_descriptors_via_fdo(void *spibar, struct ich_descriptors *desc)
+@@ -923,4 +921,3 @@ int read_ich_descriptors_via_fdo(void *spibar, struct ich_descriptors *desc)
 	return ICH_RET_OK;
 }
 #endif /* ICH_DESCRIPTORS_FROM_DUMP */
 -#endif /* defined(__i386__) || defined(__x86_64__) */
 diff --git a/ich_descriptors.h b/ich_descriptors.h
-index 3a44740..3af4fe7 100644
+index c41f9d9..056e6e4 100644
 --- a/ich_descriptors.h
 +++ b/ich_descriptors.h
@@ -19,7 +19,6 @@
@ -93,13 +94,13 @@ index 3a44740..3af4fe7 100644
 #ifndef __ICH_DESCRIPTORS_H__
 #define __ICH_DESCRIPTORS_H__ 1
 
-@@ -572,4 +571,3 @@ int getFCBA_component_density(const struct ich_descriptors *desc, uint8_t idx);
+@@ -599,4 +598,3 @@ int getFCBA_component_density(enum ich_chipset cs, const struct ich_descriptors
 
 #endif /* ICH_DESCRIPTORS_FROM_DUMP */
 #endif /* __ICH_DESCRIPTORS_H__ */
 -#endif /* defined(__i386__) || defined(__x86_64__) */
 diff --git a/ichspi.c b/ichspi.c
-index 4f6a1b1..71a715b 100644
+index 0cd9c68..b7cc882 100644
 --- a/ichspi.c
 +++ b/ichspi.c
@@ -23,8 +23,6 @@
@ -111,14 +112,14 @@ index 4f6a1b1..71a715b 100644
 #include <string.h>
 #include <stdlib.h>
 #include "flash.h"
-@@ -1887,5 +1885,3 @@ int via_init_spi(struct pci_dev *dev, uint32_t mmio_base)
+@@ -1877,5 +1875,3 @@ int via_init_spi(struct pci_dev *dev, uint32_t mmio_base)
 
 	return 0;
 }
 -
 -#endif
 diff --git a/it85spi.c b/it85spi.c
-index 0b074eb..ec893da 100644
+index 1cc8730..55783ac 100644
 --- a/it85spi.c
 +++ b/it85spi.c
@@ -24,8 +24,6 @@
@ -130,14 +131,14 @@ index 0b074eb..ec893da 100644
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-@@ -370,5 +368,3 @@ static int it85xx_spi_send_command(struct flashctx *flash,
+@@ -373,5 +371,3 @@ static int it85xx_spi_send_command(struct flashctx *flash,
 
 	return 0;
 }
 -
 -#endif
 diff --git a/it87spi.c b/it87spi.c
-index 8e4e0ad..7fcf6d8 100644
+index 0a1e894..1218b41 100644
 --- a/it87spi.c
 +++ b/it87spi.c
@@ -23,8 +23,6 @@
@ -148,15 +149,15 @@ index 8e4e0ad..7fcf6d8 100644
 -
 #include <string.h>
 #include <stdlib.h>
- #include "flash.h"
-@@ -403,5 +401,3 @@ static int it8716f_spi_chip_write_256(struct flashctx *flash, uint8_t *buf,
+ #include <errno.h>
+@@ -434,5 +432,3 @@ static int it8716f_spi_chip_write_256(struct flashctx *flash, const uint8_t *buf
 
 	return 0;
 }
 -
 -#endif
 diff --git a/mcp6x_spi.c b/mcp6x_spi.c
-index ac40557..b40c3e8 100644
+index 38e9a8b..eb6bcd3 100644
 --- a/mcp6x_spi.c
 +++ b/mcp6x_spi.c
@@ -23,8 +23,6 @@
@ -168,14 +169,14 @@ index ac40557..b40c3e8 100644
 #include <stdlib.h>
 #include <ctype.h>
 #include "flash.h"
-@@ -169,5 +167,3 @@ int mcp6x_spi_init(int want_spi)
+@@ -164,5 +162,3 @@ int mcp6x_spi_init(int want_spi)
 
 	return 0;
 }
 -
 -#endif
 diff --git a/nic3com.c b/nic3com.c
-index 8d67b54..27c698c 100644
+index 4d4702a..1e10325 100644
 --- a/nic3com.c
 +++ b/nic3com.c
@@ -18,8 +18,6 @@
@ -187,7 +188,7 @@ index 8d67b54..27c698c 100644
 #include <stdlib.h>
 #include "flash.h"
 #include "programmer.h"
-@@ -139,7 +137,3 @@ static uint8_t nic3com_chip_readb(const struct flashctx *flash,
+@@ -142,7 +140,3 @@ static uint8_t nic3com_chip_readb(const struct flashctx *flash,
 	OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR);
 	return INB(io_base_addr + BIOS_ROM_DATA);
 }
@ -196,7 +197,7 @@ index 8d67b54..27c698c 100644
 -#error PCI port I/O access is not supported on this architecture yet.
 -#endif
 diff --git a/nicnatsemi.c b/nicnatsemi.c
-index d62a73f..5cf73ab 100644
+index ce22c94..3d11f28 100644
 --- a/nicnatsemi.c
 +++ b/nicnatsemi.c
@@ -18,8 +18,6 @@
@ -208,7 +209,7 @@ index d62a73f..5cf73ab 100644
 #include <stdlib.h>
 #include "flash.h"
 #include "programmer.h"
-@@ -106,7 +104,3 @@ static uint8_t nicnatsemi_chip_readb(const struct flashctx *flash,
+@@ -109,7 +107,3 @@ static uint8_t nicnatsemi_chip_readb(const struct flashctx *flash,
 	 */
 	return INB(io_base_addr + BOOT_ROM_DATA);
 }
@ -217,7 +218,7 @@ index d62a73f..5cf73ab 100644
 -#error PCI port I/O access is not supported on this architecture yet.
 -#endif
 diff --git a/nicrealtek.c b/nicrealtek.c
-index fb8e9e1..b504cf0 100644
+index 07910a8..1f52c42 100644
 --- a/nicrealtek.c
 +++ b/nicrealtek.c
@@ -18,8 +18,6 @@
@ -229,7 +230,7 @@ index fb8e9e1..b504cf0 100644
 #include <stdlib.h>
 #include "flash.h"
 #include "programmer.h"
-@@ -129,7 +127,3 @@ static uint8_t nicrealtek_chip_readb(const struct flashctx *flash, const chipadd
+@@ -132,7 +130,3 @@ static uint8_t nicrealtek_chip_readb(const struct flashctx *flash, const chipadd
 
 	return val;
 }
@ -238,10 +239,10 @@ index fb8e9e1..b504cf0 100644
 -#error PCI port I/O access is not supported on this architecture yet.
 -#endif
 diff --git a/rayer_spi.c b/rayer_spi.c
-index b312610..08dff07 100644
+index 4f1eee4..f8448eb 100644
 --- a/rayer_spi.c
 +++ b/rayer_spi.c
-@@ -28,7 +28,6 @@
+@@ -26,7 +26,6 @@
  * most OS parport drivers will perform many unnecessary accesses although
  * this driver just treats the parallel port as a GPIO set.
  */
@ -249,8 +250,8 @@ index b312610..08dff07 100644
 
 #include <stdlib.h>
 #include <strings.h>
-@@ -180,7 +179,3 @@ int rayer_spi_init(void)
- 
+@@ -276,7 +275,3 @@ static int dlc5_shutdown(void *data) {
+ 	OUTB(lpt_outbyte, lpt_iobase);
 	return 0;
 }
 -
@ -258,7 +259,7 @@ index b312610..08dff07 100644
 -#error PCI port I/O access is not supported on this architecture yet.
 -#endif
 diff --git a/satamv.c b/satamv.c
-index c3f27e7..b8f175b 100644
+index e76d126..ce83c2e 100644
 --- a/satamv.c
 +++ b/satamv.c
@@ -19,7 +19,6 @@
@ -269,7 +270,7 @@ index c3f27e7..b8f175b 100644
 
 #include <stdlib.h>
 #include "flash.h"
-@@ -194,7 +193,3 @@ static uint8_t satamv_chip_readb(const struct flashctx *flash,
+@@ -191,7 +190,3 @@ static uint8_t satamv_chip_readb(const struct flashctx *flash,
 {
 	return satamv_indirect_chip_readb(addr);
 }
@ -278,10 +279,10 @@ index c3f27e7..b8f175b 100644
 -#error PCI port I/O access is not supported on this architecture yet.
 -#endif
 diff --git a/sb600spi.c b/sb600spi.c
-index e76c04a..0514acd 100644
+index 69fad65..f909aec 100644
 --- a/sb600spi.c
 +++ b/sb600spi.c
-@@ -21,8 +21,6 @@
+@@ -22,8 +22,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
@ -290,14 +291,14 @@ index e76c04a..0514acd 100644
 #include <string.h>
 #include <stdlib.h>
 #include "flash.h"
-@@ -359,5 +357,3 @@ int sb600_probe_spi(struct pci_dev *dev)
- 	register_spi_programmer(&spi_programmer_sb600);
+@@ -695,5 +693,3 @@ int sb600_probe_spi(struct pci_dev *dev)
+ 		register_spi_master(&spi_master_yangtze);
 	return 0;
 }
 -
 -#endif
 diff --git a/wbsio_spi.c b/wbsio_spi.c
-index 7d4bb2a..6e6eec1 100644
+index 0eeeb9b..050e2e7 100644
 --- a/wbsio_spi.c
 +++ b/wbsio_spi.c
@@ -18,8 +18,6 @@
@ -315,6 +316,3 @@ index 7d4bb2a..6e6eec1 100644
 }
 -
 -#endif
-- 
-1.8.3.1
-
--- a/flashrom-0005-Use-endiannes-determined-at-the-configure-stage.patch
+++ b/flashrom-0005-Use-endiannes-determined-at-the-configure-stage.patch
@ -1,18 +1,14 @@
-From d34343e1f47a6760d4145789ee8fb27db4b25445 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Sun, 26 Sep 2010 18:25:31 +0400
-Subject: [PATCH 5/7] Use endiannes determined at the configure stage
+Subject: [PATCH] Use endiannes determined at the configure stage

 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
- hwaccess.h | 60 ++----------------------------------------------------------
- 1 file changed, 2 insertions(+), 58 deletions(-)

 diff --git a/hwaccess.h b/hwaccess.h
-index fd6eb12..f76043d 100644
+index 83f349e..1fa7815 100644
 --- a/hwaccess.h
 +++ b/hwaccess.h
-@@ -41,58 +41,6 @@
+@@ -47,58 +47,6 @@
 #undef index
 #endif
 
@ -71,7 +67,7 @@ index fd6eb12..f76043d 100644
 #define ___constant_swab8(x) ((uint8_t) (				\
 	(((uint8_t)(x) & (uint8_t)0xffU))))
 
-@@ -134,7 +82,7 @@ cpu_to_le(64)
+@@ -140,7 +88,7 @@ cpu_to_le(64)
 #define cpu_to_be32
 #define cpu_to_be64
 
@ -80,7 +76,7 @@ index fd6eb12..f76043d 100644
 
 #define cpu_to_be(bits)							\
 static inline uint##bits##_t cpu_to_be##bits(uint##bits##_t val)	\
-@@ -152,11 +100,7 @@ cpu_to_be(64)
+@@ -158,11 +106,7 @@ cpu_to_be(64)
 #define cpu_to_le32
 #define cpu_to_le64
 
@ -93,6 +89,3 @@ index fd6eb12..f76043d 100644
 
 #define be_to_cpu8 cpu_to_be8
 #define be_to_cpu16 cpu_to_be16
-- 
-1.8.3.1
-
--- a/flashrom-0006-Use-HAVE_-_H-macro-for-detecting-includes.patch
+++ b/flashrom-0006-Use-HAVE_-_H-macro-for-detecting-includes.patch
@ -1,15 +1,11 @@
-From a366f2b127d40411066a431004999ecb41b6af7b Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Sun, 26 Sep 2010 21:05:50 +0400
-Subject: [PATCH 6/7] Use HAVE_*_H macro for detecting includes
+Subject: [PATCH] Use HAVE_*_H macro for detecting includes

 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
- hwaccess.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++------------
- 1 file changed, 56 insertions(+), 13 deletions(-)

 diff --git a/hwaccess.h b/hwaccess.h
-index f76043d..12ea46c 100644
+index 1fa7815..fda9530 100644
 --- a/hwaccess.h
 +++ b/hwaccess.h
@@ -24,11 +24,9 @@
@ -26,9 +22,9 @@ index f76043d..12ea46c 100644
 
 #if NEED_PCI == 1
 /*
-@@ -39,7 +37,53 @@
- #define index shadow_workaround_index
- #include <pci/pci.h>
+@@ -45,7 +43,53 @@
+ #endif
+ 
 #undef index
 +
 +#if defined (HAVE_STRINGS_H)
@ -80,7 +76,7 @@ index f76043d..12ea46c 100644
 
 #define ___constant_swab8(x) ((uint8_t) (				\
 	(((uint8_t)(x) & (uint8_t)0xffU))))
-@@ -112,15 +156,15 @@ cpu_to_be(64)
+@@ -118,15 +162,15 @@ cpu_to_be(64)
 #define le_to_cpu64 cpu_to_le64
 
 #if NEED_PCI == 1
@ -101,7 +97,7 @@ index f76043d..12ea46c 100644
 #endif
 
 /* Clarification about OUTB/OUTW/OUTL argument order:
-@@ -156,8 +200,6 @@ cpu_to_be(64)
+@@ -162,8 +206,6 @@ cpu_to_be(64)
 
 #ifdef __DJGPP__
 
@ -110,7 +106,7 @@ index f76043d..12ea46c 100644
   #define OUTB(x,y) outportb(y, x)
   #define OUTW(x,y) outportw(y, x)
   #define OUTL(x,y) outportl(y, x)
-@@ -240,7 +282,7 @@ static inline uint32_t inl(uint16_t port)
+@@ -246,7 +288,7 @@ static inline uint32_t inl(uint16_t port)
 typedef struct { uint32_t hi, lo; } msr_t;
 msr_t rdmsr(int addr);
 int wrmsr(int addr, msr_t msr);
@ -119,7 +115,7 @@ index f76043d..12ea46c 100644
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 /* FreeBSD already has conflicting definitions for wrmsr/rdmsr. */
 #undef rdmsr
-@@ -250,7 +292,8 @@ int wrmsr(int addr, msr_t msr);
+@@ -256,7 +298,8 @@ int wrmsr(int addr, msr_t msr);
 typedef struct { uint32_t hi, lo; } msr_t;
 msr_t freebsd_rdmsr(int addr);
 int freebsd_wrmsr(int addr, msr_t msr);
@ -129,6 +125,3 @@ index f76043d..12ea46c 100644
 #if defined(__LIBPAYLOAD__)
 #include <arch/io.h>
 #include <arch/msr.h>
-- 
-1.8.3.1
-
--- a/flashrom-0007-ppc-hack.patch
+++ b/flashrom-0007-ppc-hack.patch
@ -1,18 +1,13 @@
-From 726ed55ebf1dbfe4a70a864331f36c3824421727 Mon Sep 17 00:00:00 2001
 From: Mattias Mattsson <vitplister@gmail.com>
 Date: Wed, 27 Jul 2011 21:02:50 +0400
-Subject: [PATCH 7/7] ppc hack
+Subject: [PATCH] ppc hack

---
- internal.c         | 2 ++
- processor_enable.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)

 diff --git a/internal.c b/internal.c
-index ab3c81f..1bad0ea 100644
+index e646ca8..6101222 100644
 --- a/internal.c
 +++ b/internal.c
-@@ -352,6 +352,8 @@ int internal_init(void)
+@@ -344,6 +344,8 @@ int internal_init(void)
 		 "Aborting.\n");
 	return 1;
 #endif
@ -34,6 +29,3 @@ index 1361dd5..49d4006 100644
 	/* On x86, flash access is not processor specific except on
 	 * AMD Elan SC520, AMD Geode and maybe other SoC-style CPUs.
 	 * FIXME: Move enable_flash_cs5536 and get_flashbase_sc520 here.
-- 
-1.8.3.1
-
--- a/flashrom.spec
+++ b/flashrom.spec
@ -1,14 +1,14 @@
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
-Version:	0.9.6.1
-Release:	7.svn1705%{?dist}
+Version:	0.9.7
+Release:	1.svn1850%{?dist}
 License:	GPLv2
 Group:		Applications/System
 URL:		http://flashrom.org
 #Source0:	http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2
 #Source1:	http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2.asc
-## svn -r 1705 export svn://coreboot.org/flashrom/trunk flashrom-0.9.6.1
-## tar -cjvf flashrom-0.9.6.1.tar.bz2 flashrom-0.9.6.1
+## svn -r 1850 export svn://coreboot.org/flashrom/trunk flashrom-0.9.7
+## tar -cjvf flashrom-0.9.7.tar.bz2 flashrom-0.9.7
 Source0:	%{name}-%{version}.tar.bz2
 Patch1:		flashrom-0001-Initial-commit-of-autotools-related-files.patch
 Patch2:		flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch
@ -21,8 +21,8 @@ BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	pciutils-devel
 BuildRequires:	zlib-devel
-BuildRequires:	libftdi-devel
 %ifnarch ppc ppc64 %{arm}
+BuildRequires:	libftdi-devel
 BuildRequires:	dmidecode
 Requires:	dmidecode
 %endif
@ -54,7 +54,7 @@ autoreconf -ivf
 %if 0%{?el5}
 %configure --with-linux-spi=no
 %else
-%configure
+%configure --with-ft2232-spi=no --with-usbblaster-spi=no
 %endif
 make %{?_smp_mflags}

@ -85,6 +85,50 @@ rm -rf %{buildroot}


 %changelog
+* Thu Sep 11 2014 Peter Lemenkov <lemenkov@gmail.com> - 0.9.7-1.svn1850
+- Add support for Winbond W25Q40.V chips
+- Add support for Macronix MX23L1654, MX23L6454 and MX23L12854 mask ROMs
+- Add support for Intel Wildcat Point PCH
+- Add support for Intel Silvermont: Bay Trail, Rangeley and Avoton
+- Add support for S25FL128P, S25FL129P chips
+- Add support for a bunch of 29GL parallel flash chips
+- Add support for Atmel AT49LH004 and AT49LH00B4
+- Add new programmer for SPI EEPROMs attached to Intel 82580 NICs
+- Add support for AMD Bolton chipset
+- Add Board Enable for ASUS Vintage 2 PH1 (P5LD2-MQ)
+- Add support for Macronix MX29F022(N)B and MX29F022(N)T
+- Add support for Macronix MX25U12835F
+- Add support for Sanyo LE25FW106
+- Add IT8212F PCI ATA controller as programmer
+- Add support for Atmel (now Adesto) AT25DL081 and AT25DL161
+- Add VIA VT6421A LPC programmer driver
+- Add support for ESMT F25L32PA
+- Add support for Sanyo LE25FW406A
+- Add support for new AMD SPI controller (SPI 100)
+- Add support for Sanyo LE25FU406B
+- Add support for SST25LF020A
+- Add support for Spansion S25FL132K and S25FL164K
+- Add support for SST25WF08
+- Add support for Macronix MX23L3254 mask ROM
+- Add support for TUMPA Lite
+- Add support for Intel 82574L
+- Add board enable for ASUS A7V8X-MX
+- Add board enable for ASUS P5LD2-VM DH
+- Add board enable for abit BF6
+- Add support for SST25VF512A, ST25VF020, SST25VF020B chips
+- Add pinout for Wiggler LPT
+- Add pinout for Atmel STK200/300
+- Add pinout for Altera ByteBlasterMV
+- Add support for ST M50LPW080 chip
+- Add an internal DMI decoder
+- Add board enable for Bcom WinNET P680
+- Add support for AT45CS1282 chip
+- Add support for AT45DB321C
+- Add support for Atmel AT45DB* chips
+- Add support for Fujitsu MBM29LV160BE/TE
+- Add ability to select between chips on GIGABYTE DualBIOS boards
+- Temporarily disable ftdi support
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.6.1-7.svn1705
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-116357a2f31575b15ee7f379493969a7  flashrom-0.9.6.1.tar.bz2
+d0546f8a080aa5369acba2b8966667a9  flashrom-0.9.7.tar.bz2