[flashrom] next svn snapshot - 1673

Peter Lemenkov peter at fedoraproject.org
Tue May 21 09:09:05 UTC 2013


commit e626e6dfe8fa7868e24a7263fb2edd663692c0b5
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue May 21 13:08:57 2013 +0400

    next svn snapshot - 1673
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 ...Initial-commit-of-autotools-related-files.patch |   36 +++++++++++++------
 ...dmidecode-path-defined-at-configure-stage.patch |    6 ++--
 ...from-configure-stage-instead-of-HAVE_UTSN.patch |   12 +++---
 ...86-related-ifdefs-in-code-this-is-now-con.patch |   32 +++++++++---------
 ...diannes-determined-at-the-configure-stage.patch |    6 ++--
 ...Use-HAVE_-_H-macro-for-detecting-includes.patch |   34 ++++++------------
 flashrom-0007-ppc-hack.patch                       |    8 ++--
 flashrom.spec                                      |   12 +++++-
 sources                                            |    2 +-
 9 files changed, 78 insertions(+), 70 deletions(-)
---
diff --git a/flashrom-0001-Initial-commit-of-autotools-related-files.patch b/flashrom-0001-Initial-commit-of-autotools-related-files.patch
index 50f9211..8eed887 100644
--- a/flashrom-0001-Initial-commit-of-autotools-related-files.patch
+++ b/flashrom-0001-Initial-commit-of-autotools-related-files.patch
@@ -1,24 +1,24 @@
-From 674eb70e3934fb6ba01d5acb52048771e3d28111 Mon Sep 17 00:00:00 2001
+From 7ff2cdbd539a5b341fc27efc51cc0fb9c4797c14 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Fri, 17 Sep 2010 18:58:28 +0400
 Subject: [PATCH 1/7] Initial commit of autotools-related files
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
- Makefile.am  | 218 +++++++++++++++++++++++++++++++++++++
+ Makefile.am  | 224 +++++++++++++++++++++++++++++++++++++
  bootstrap.sh |   4 +
- configure.ac | 349 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 571 insertions(+)
+ configure.ac | 355 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 583 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..c7d4515
+index 0000000..3a34908
 --- /dev/null
 +++ b/Makefile.am
-@@ -0,0 +1,218 @@
+@@ -0,0 +1,224 @@
 +sbin_PROGRAMS = flashrom
 +
 +man_MANS = flashrom.8
@@ -160,6 +160,11 @@ index 0000000..c7d4515
 +serial_SOURCES = serial.c
 +endif
 +
++if HAVE_USBBLASTER_SPI
++usbblaster_SOURCES = usbblaster_spi.c
++DEFS += -DCONFIG_USBBLASTER_SPI=1
++endif
++
 +if HAVE_PRINT_WIKI
 +print_wiki_SOURCES = print_wiki.c
 +DEFS += -DCONFIG_PRINT_WIKI=1
@@ -230,13 +235,14 @@ index 0000000..c7d4515
 +	$(dediprog_SOURCES) \
 +	$(satamv_SOURCES) \
 +	$(serial_SOURCES) \
++	$(usbblaster_SOURCES) \
 +	$(print_wiki_SOURCES) \
 +	$(pci_SOURCES) \
 +	$(chip_SOURCES) \
 +	$(cli_SOURCES) \
 +	$(lib_SOURCES)
 +
-+EXTRA_DIST = Documentation util
++EXTRA_DIST = COPYING Documentation README util arch.h os.h
 diff --git a/bootstrap.sh b/bootstrap.sh
 new file mode 100755
 index 0000000..0213288
@@ -249,11 +255,11 @@ index 0000000..0213288
 +automake --add-missing --copy --force-missing
 diff --git a/configure.ac b/configure.ac
 new file mode 100644
-index 0000000..b32c515
+index 0000000..2971103
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,349 @@
-+AC_INIT([flashrom], [0.9.6.1-r1639], [flashrom at flashrom.org], [flashrom], [http://www.flashrom.org/])
+@@ -0,0 +1,355 @@
++AC_INIT([flashrom], [0.9.6.1-r1673], [flashrom at flashrom.org], [flashrom], [http://www.flashrom.org/])
 +
 +AC_PREREQ(2.59)
 +
@@ -332,6 +338,10 @@ index 0000000..b32c515
 +	    AC_HELP_STRING([--with-buspirate-spi],[Bus Pirate SPI support.]),
 +	    [buspirate_spi="$withval"],[buspirate_spi="yes"])
 +
++AC_ARG_WITH([usbblaster_spi],
++	    AC_HELP_STRING([--with-usbblaster-spi],[Altera USB-Blaster dongles support.]),
++	    [usbblaster_spi="$withval"],[usbblaster_spi="yes"])
++
 +AC_ARG_WITH([dediprog],
 +	    AC_HELP_STRING([--with-dediprog],[Dediprog SF100 support. Incomplete and untested.]),
 +	    [dediprog="$withval"],[dediprog="no"])
@@ -529,7 +539,7 @@ index 0000000..b32c515
 +	AC_CHECK_LIB([usb], [usb_init])
 +fi
 +
-+if test "$ft2232_spi" = 'yes' ; then
++if test "$ft2232_spi" = 'yes' -o "$usbblaster_spi" = 'yes' ; then
 +	AC_CHECK_HEADERS([ftdi.h],[],[AC_MSG_ERROR([<ftdi.h> header not found])],[AC_INCLUDES_DEFAULT])
 +	AC_CHECK_LIB([ftdi],[ftdi_init],,[AC_MSG_ERROR([ftdi library is missing])])
 +fi
@@ -556,6 +566,7 @@ index 0000000..b32c515
 +AM_CONDITIONAL(HAVE_NICINTEL_SPI, test "$nicintel_spi" = "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")
 +AM_CONDITIONAL(HAVE_DEDIPROG, test "$dediprog" = "yes")
 +AM_CONDITIONAL(HAVE_SATAMV, test "$satamv" = "yes")
 +AM_CONDITIONAL(HAVE_SERIAL, test "$serial" = "yes")
@@ -596,6 +607,7 @@ index 0000000..b32c515
 +      Intel NIC: .................... ${nicintel}
 +      Intel NIC SPI: ................ ${nicintel_spi}
 +      Bus Pirate SPI: ............... ${buspirate_spi}
++      Altera USB-Blaster SPI: ....... ${usbblaster_spi}
 +      Dediprog SF100: ............... ${dediprog}
 +      Marvell SATA: ................. ${satamv}
 +      Serial: ....................... ${serial}
@@ -603,5 +615,5 @@ index 0000000..b32c515
 +------------------------------------------------------------------------
 +])
 -- 
-1.8.0.2
+1.8.2.1
 
diff --git a/flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch b/flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch
index 2c2a372..aaa1f58 100644
--- a/flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch
+++ b/flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch
@@ -1,4 +1,4 @@
-From ab136cb5bd1cfa17ce2cc1cd74bbb957d8bcd251 Mon Sep 17 00:00:00 2001
+From 5a1299bc8df91871916409744daff283fb2897e0 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Sat, 12 Jun 2010 22:13:53 +0400
 Subject: [PATCH 2/7] Use dmidecode path defined at configure stage
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/dmi.c b/dmi.c
-index a6e2146..0ddf623 100644
+index 242889f..a10fc4f 100644
 --- a/dmi.c
 +++ b/dmi.c
 @@ -87,7 +87,7 @@ static const struct {
@@ -22,5 +22,5 @@ index a6e2146..0ddf623 100644
  static char *dmistrings[ARRAY_SIZE(dmidecode_names)];
  
 -- 
-1.8.0.2
+1.8.2.1
 
diff --git 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
index 7ec1b66..ea917da 100644
--- 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,4 +1,4 @@
-From 996b99266daae9adbcf16e30d1a49f23762dbb18 Mon Sep 17 00:00:00 2001
+From 2c6aa71fcdca430e6fd830fd2dfa95752d4beee3 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Sat, 18 Sep 2010 09:05:43 +0400
 Subject: [PATCH 3/7] Use macros from configure stage instead of HAVE_UTSNAME
@@ -9,11 +9,11 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/flashrom.c b/flashrom.c
-index fd438bb..3a22eeb 100644
+index c11f723..7c45119 100644
 --- a/flashrom.c
 +++ b/flashrom.c
-@@ -31,7 +31,8 @@
- #include <stdlib.h>
+@@ -32,7 +32,8 @@
+ #include <errno.h>
  #include <ctype.h>
  #include <getopt.h>
 -#if HAVE_UTSNAME == 1
@@ -22,7 +22,7 @@ index fd438bb..3a22eeb 100644
  #include <sys/utsname.h>
  #endif
  #include "flash.h"
-@@ -1539,7 +1540,7 @@ void print_sysinfo(void)
+@@ -1588,7 +1589,7 @@ void print_sysinfo(void)
  		msg_ginfo(" (unknown arch)");
  		break;
  	}
@@ -32,5 +32,5 @@ index fd438bb..3a22eeb 100644
  
  	uname(&osinfo);
 -- 
-1.8.0.2
+1.8.2.1
 
diff --git 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
index ad9b3be..ec83e53 100644
--- 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,4 +1,4 @@
-From 9215bb413b96b344b49d6a2a0e83b9d7a91c9dc3 Mon Sep 17 00:00:00 2001
+From bbcd9c2fe41b937c13486cd1b252425b11cf37b4 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at 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
@@ -23,7 +23,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
  14 files changed, 63 deletions(-)
 
 diff --git a/atahpt.c b/atahpt.c
-index 92f7deb..b7a4cc3 100644
+index f8be8c4..aa98711 100644
 --- a/atahpt.c
 +++ b/atahpt.c
 @@ -18,8 +18,6 @@
@@ -35,7 +35,7 @@ index 92f7deb..b7a4cc3 100644
  #include <stdlib.h>
  #include <string.h>
  #include "flash.h"
-@@ -98,7 +96,3 @@ static uint8_t atahpt_chip_readb(const struct flashctx *flash,
+@@ -93,7 +91,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);
  }
@@ -44,7 +44,7 @@ index 92f7deb..b7a4cc3 100644
 -#error PCI port I/O access is not supported on this architecture yet.
 -#endif
 diff --git a/ich_descriptors.c b/ich_descriptors.c
-index c9ae6cd..58d5fb3 100644
+index e5ca87a..c6e1a4b 100644
 --- a/ich_descriptors.c
 +++ b/ich_descriptors.c
 @@ -19,8 +19,6 @@
@@ -79,7 +79,7 @@ index 3a44740..3af4fe7 100644
  #endif /* __ICH_DESCRIPTORS_H__ */
 -#endif /* defined(__i386__) || defined(__x86_64__) */
 diff --git a/ichspi.c b/ichspi.c
-index fadfe62..094b023 100644
+index 12f4584..5067342 100644
 --- a/ichspi.c
 +++ b/ichspi.c
 @@ -23,8 +23,6 @@
@@ -117,7 +117,7 @@ index 0b074eb..ec893da 100644
 -
 -#endif
 diff --git a/it87spi.c b/it87spi.c
-index a35ddc0..24542c2 100644
+index 8e4e0ad..7fcf6d8 100644
 --- a/it87spi.c
 +++ b/it87spi.c
 @@ -23,8 +23,6 @@
@@ -129,7 +129,7 @@ index a35ddc0..24542c2 100644
  #include <string.h>
  #include <stdlib.h>
  #include "flash.h"
-@@ -406,5 +404,3 @@ static int it8716f_spi_chip_write_256(struct flashctx *flash, uint8_t *buf,
+@@ -403,5 +401,3 @@ static int it8716f_spi_chip_write_256(struct flashctx *flash, uint8_t *buf,
  
  	return 0;
  }
@@ -155,7 +155,7 @@ index ac40557..b40c3e8 100644
 -
 -#endif
 diff --git a/nic3com.c b/nic3com.c
-index 05eada6..6207386 100644
+index 8d67b54..27c698c 100644
 --- a/nic3com.c
 +++ b/nic3com.c
 @@ -18,8 +18,6 @@
@@ -167,7 +167,7 @@ index 05eada6..6207386 100644
  #include <stdlib.h>
  #include "flash.h"
  #include "programmer.h"
-@@ -134,7 +132,3 @@ static uint8_t nic3com_chip_readb(const struct flashctx *flash,
+@@ -139,7 +137,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);
  }
@@ -176,7 +176,7 @@ index 05eada6..6207386 100644
 -#error PCI port I/O access is not supported on this architecture yet.
 -#endif
 diff --git a/nicnatsemi.c b/nicnatsemi.c
-index 60d8f87..6dcf70a 100644
+index d62a73f..5cf73ab 100644
 --- a/nicnatsemi.c
 +++ b/nicnatsemi.c
 @@ -18,8 +18,6 @@
@@ -188,7 +188,7 @@ index 60d8f87..6dcf70a 100644
  #include <stdlib.h>
  #include "flash.h"
  #include "programmer.h"
-@@ -109,7 +107,3 @@ static uint8_t nicnatsemi_chip_readb(const struct flashctx *flash,
+@@ -106,7 +104,3 @@ static uint8_t nicnatsemi_chip_readb(const struct flashctx *flash,
  	 */
  	return INB(io_base_addr + BOOT_ROM_DATA);
  }
@@ -197,7 +197,7 @@ index 60d8f87..6dcf70a 100644
 -#error PCI port I/O access is not supported on this architecture yet.
 -#endif
 diff --git a/nicrealtek.c b/nicrealtek.c
-index 3c3b261..c6d73fd 100644
+index fb8e9e1..b504cf0 100644
 --- a/nicrealtek.c
 +++ b/nicrealtek.c
 @@ -18,8 +18,6 @@
@@ -209,7 +209,7 @@ index 3c3b261..c6d73fd 100644
  #include <stdlib.h>
  #include "flash.h"
  #include "programmer.h"
-@@ -124,7 +122,3 @@ static uint8_t nicrealtek_chip_readb(const struct flashctx *flash, const chipadd
+@@ -129,7 +127,3 @@ static uint8_t nicrealtek_chip_readb(const struct flashctx *flash, const chipadd
  
  	return val;
  }
@@ -238,7 +238,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 c0c1ffa..724bd41 100644
+index c3f27e7..b8f175b 100644
 --- a/satamv.c
 +++ b/satamv.c
 @@ -19,7 +19,6 @@
@@ -249,7 +249,7 @@ index c0c1ffa..724bd41 100644
  
  #include <stdlib.h>
  #include "flash.h"
-@@ -199,7 +198,3 @@ static uint8_t satamv_chip_readb(const struct flashctx *flash,
+@@ -194,7 +193,3 @@ static uint8_t satamv_chip_readb(const struct flashctx *flash,
  {
  	return satamv_indirect_chip_readb(addr);
  }
@@ -296,5 +296,5 @@ index 7d4bb2a..6e6eec1 100644
 -
 -#endif
 -- 
-1.8.0.2
+1.8.2.1
 
diff --git a/flashrom-0005-Use-endiannes-determined-at-the-configure-stage.patch b/flashrom-0005-Use-endiannes-determined-at-the-configure-stage.patch
index fe98f30..36629e3 100644
--- a/flashrom-0005-Use-endiannes-determined-at-the-configure-stage.patch
+++ b/flashrom-0005-Use-endiannes-determined-at-the-configure-stage.patch
@@ -1,4 +1,4 @@
-From a4c08c787626803ec7b7628966b4eaa02ea716af Mon Sep 17 00:00:00 2001
+From 6bdd32ea19039f71b1a2d45f86fa6c2fc17b6322 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Sun, 26 Sep 2010 18:25:31 +0400
 Subject: [PATCH 5/7] Use endiannes determined at the configure stage
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
  1 file changed, 2 insertions(+), 58 deletions(-)
 
 diff --git a/hwaccess.h b/hwaccess.h
-index dc52118..c2ca4b2 100644
+index 714a660..f6f7c4c 100644
 --- a/hwaccess.h
 +++ b/hwaccess.h
 @@ -41,58 +41,6 @@
@@ -94,5 +94,5 @@ index dc52118..c2ca4b2 100644
  #define be_to_cpu8 cpu_to_be8
  #define be_to_cpu16 cpu_to_be16
 -- 
-1.8.0.2
+1.8.2.1
 
diff --git a/flashrom-0006-Use-HAVE_-_H-macro-for-detecting-includes.patch b/flashrom-0006-Use-HAVE_-_H-macro-for-detecting-includes.patch
index b43d936..48ab7a0 100644
--- 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,15 @@
-From 9c0264f3d0379c00643cb685e936bd403c50ea37 Mon Sep 17 00:00:00 2001
+From adf493f60525cdb813a4b8d65731f1a73215e55e Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Sun, 26 Sep 2010 21:05:50 +0400
 Subject: [PATCH 6/7] Use HAVE_*_H macro for detecting includes
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
- hwaccess.h | 76 +++++++++++++++++++++++++++++++++++++++++++++-----------------
- 1 file changed, 56 insertions(+), 20 deletions(-)
+ hwaccess.h | 71 +++++++++++++++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 56 insertions(+), 15 deletions(-)
 
 diff --git a/hwaccess.h b/hwaccess.h
-index c2ca4b2..be71cb9 100644
+index f6f7c4c..4e820f0 100644
 --- a/hwaccess.h
 +++ b/hwaccess.h
 @@ -24,11 +24,9 @@
@@ -101,19 +101,7 @@ index c2ca4b2..be71cb9 100644
  #endif
  
  /* Clarification about OUTB/OUTW/OUTL argument order:
-@@ -128,11 +172,6 @@ cpu_to_be(64)
-  */
- 
- #if defined(__FreeBSD__) || defined(__DragonFly__)
--  /* Note that Debian/kFreeBSD (FreeBSD kernel with glibc) has conflicting
--   * out[bwl] definitions in machine/cpufunc.h and sys/io.h at least in some
--   * versions. Use machine/cpufunc.h only for plain FreeBSD/DragonFlyBSD.
--   */
--  #include <machine/cpufunc.h>
-   #define off64_t off_t
-   #define lseek64 lseek
-   #define OUTB(x, y) do { u_int outb_tmp = (y); outb(outb_tmp, (x)); } while (0)
-@@ -160,8 +199,6 @@ cpu_to_be(64)
+@@ -156,8 +200,6 @@ cpu_to_be(64)
  
  #ifdef __DJGPP__
  
@@ -122,16 +110,16 @@ index c2ca4b2..be71cb9 100644
    #define OUTB(x,y) outportb(y, x)
    #define OUTW(x,y) outportw(y, x)
    #define OUTL(x,y) outportl(y, x)
-@@ -188,8 +225,6 @@ cpu_to_be(64)
-   #define off64_t off_t
-   #define lseek64 lseek
+@@ -182,8 +224,6 @@ cpu_to_be(64)
+ 
+ #if defined(__NetBSD__) || defined (__OpenBSD__)
    #if defined(__i386__) || defined(__x86_64__)
 -    #include <sys/types.h>
 -    #include <machine/sysarch.h>
  #if defined(__NetBSD__)
      #if defined(__i386__)
        #define iopl i386_iopl
-@@ -246,7 +281,7 @@ static inline uint32_t inl(uint16_t port)
+@@ -240,7 +280,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);
@@ -140,7 +128,7 @@ index c2ca4b2..be71cb9 100644
  #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
  /* FreeBSD already has conflicting definitions for wrmsr/rdmsr. */
  #undef rdmsr
-@@ -256,7 +291,8 @@ int wrmsr(int addr, msr_t msr);
+@@ -250,7 +290,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);
@@ -151,5 +139,5 @@ index c2ca4b2..be71cb9 100644
  #include <arch/io.h>
  #include <arch/msr.h>
 -- 
-1.8.0.2
+1.8.2.1
 
diff --git a/flashrom-0007-ppc-hack.patch b/flashrom-0007-ppc-hack.patch
index 38f24d1..918d2ac 100644
--- a/flashrom-0007-ppc-hack.patch
+++ b/flashrom-0007-ppc-hack.patch
@@ -1,4 +1,4 @@
-From 5f2808562c6b7f759552c2b97dda7b2dee8c3200 Mon Sep 17 00:00:00 2001
+From 1f2e7a71454e1d1cb58a13d680a52c58ebe6b097 Mon Sep 17 00:00:00 2001
 From: Mattias Mattsson <vitplister at gmail.com>
 Date: Wed, 27 Jul 2011 21:02:50 +0400
 Subject: [PATCH 7/7] ppc hack
@@ -9,10 +9,10 @@ Subject: [PATCH 7/7] ppc hack
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/internal.c b/internal.c
-index eda4d59..9b88341 100644
+index 5af74cd..bb8d91c 100644
 --- a/internal.c
 +++ b/internal.c
-@@ -350,6 +350,8 @@ int internal_init(void)
+@@ -348,6 +348,8 @@ int internal_init(void)
  		 "Aborting.\n");
  	return 1;
  #endif
@@ -35,5 +35,5 @@ index 1361dd5..49d4006 100644
  	 * AMD Elan SC520, AMD Geode and maybe other SoC-style CPUs.
  	 * FIXME: Move enable_flash_cs5536 and get_flashbase_sc520 here.
 -- 
-1.8.0.2
+1.8.2.1
 
diff --git a/flashrom.spec b/flashrom.spec
index 10d2182..38a466d 100644
--- a/flashrom.spec
+++ b/flashrom.spec
@@ -1,13 +1,13 @@
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0.9.6.1
-Release:	3.svn1639%{?dist}
+Release:	4.svn1673%{?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 1639 export svn://coreboot.org/flashrom/trunk flashrom-0.9.6.1
+## svn -r 1673 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
 Source0:	%{name}-%{version}.tar.bz2
 Patch1:		flashrom-0001-Initial-commit-of-autotools-related-files.patch
@@ -85,6 +85,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue May 21 2013 Peter Lemenkov <lemenkov at gmail.com> -  0.9.6.1-4.svn1673
+- dediprog: add support for chip select
+- Add support for PMC Pm25LD series flash chips
+- Add Altera USB-Blaster SPI programmer
+- Add support for Intel Lynx Point low-power and Wellsburg chipsets
+- Add support for Macronix MX25U1635E, MX25U3235E/F and MX25U6435E/F chips
+- Add (untested) board enable for ASUS P4PE-X/TE
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6.1-3.svn1639
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 0e480d7..b5f588a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d64125df71265ed867ee4fd1e1d7e14  flashrom-0.9.6.1.tar.bz2
+13f99fd53cb466d4ea048097606c1cfc  flashrom-0.9.6.1.tar.bz2


More information about the scm-commits mailing list