[flashrom] Updated to latest svn ver. 1280 (post-release snapshot for 0.9.3)
Peter Lemenkov
peter at fedoraproject.org
Wed Mar 9 11:11:23 UTC 2011
commit bbd9bbed63a2a678ae5b6b65d9f939a0ee757df0
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed Mar 9 14:11:12 2011 +0300
Updated to latest svn ver. 1280 (post-release snapshot for 0.9.3)
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
...Initial-commit-of-autotools-related-files.patch | 130 +++++++++++---------
...dmidecode-path-defined-at-configure-stage.patch | 6 +-
...0003-Use-flashrom-s-version-from-config.h.patch | 22 ++--
..._LIBPCI-from-config.h-instead-of-NEED_PCI.patch | 16 ++--
...ros-from-config.h-instead-of-HAVE_UTSNAME.patch | 10 +-
...86-related-ifdefs-in-code-this-is-now-con.patch | 44 +++++--
flashrom-0007-Simplify-hwaccess.c.patch | 6 +-
...diannes-determined-at-the-configure-stage.patch | 6 +-
...Kill-unused-__FLASHROM_HAVE_OUTB__-define.patch | 26 ----
...Use-HAVE_-_H-macro-for-detecting-includes.patch | 50 ++++++--
...ove-arch-checking-ifdef-block-into-header.patch | 12 +-
...om-0011-Add-more-comments-cosmetic-change.patch | 49 --------
flashrom-0013-rtl8169-support.patch | 61 ---------
flashrom.spec | 26 +++--
sources | 2 +-
15 files changed, 198 insertions(+), 268 deletions(-)
---
diff --git a/flashrom-0001-Initial-commit-of-autotools-related-files.patch b/flashrom-0001-Initial-commit-of-autotools-related-files.patch
index c40c33e..da5d9f1 100644
--- a/flashrom-0001-Initial-commit-of-autotools-related-files.patch
+++ b/flashrom-0001-Initial-commit-of-autotools-related-files.patch
@@ -1,22 +1,22 @@
-From cb95544e4b35737ccb4abc5d041a975a79e8f4d1 Mon Sep 17 00:00:00 2001
+From aa22deee600a694a1f032a1f76850da0ca59ca43 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 01/13] Initial commit of autotools-related files
+Subject: [PATCH 01/10] Initial commit of autotools-related files
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- Makefile.am | 172 ++++++++++++++++++++++++++++++++++++++++++++
- configure.ac | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 399 insertions(+), 0 deletions(-)
+ Makefile.am | 180 +++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 411 insertions(+), 0 deletions(-)
create mode 100644 Makefile.am
create mode 100644 configure.ac
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
-index 0000000..6790ac5
+index 0000000..04bd498
--- /dev/null
+++ b/Makefile.am
-@@ -0,0 +1,172 @@
+@@ -0,0 +1,180 @@
+sbin_PROGRAMS = flashrom
+
+man_MANS = flashrom.8
@@ -34,6 +34,7 @@ index 0000000..6790ac5
+if HAVE_X86_ONLY_INTERNAL
+internal_x86_only_SOURCES = \
+ ichspi.c \
++ it85spi.c \
+ it87spi.c \
+ mcp6x_spi.c \
+ sb600spi.c \
@@ -42,11 +43,21 @@ index 0000000..6790ac5
+DEFS += -DCONFIG_INTERNAL=1
+endif
+
++if HAVE_SERPROG
++serprog_SOURCES = serprog.c
++DEFS += -DCONFIG_SERPROG=1
++endif
++
+if HAVE_RAYER_SPI
+rayer_spi_SOURCES = rayer_spi.c
+DEFS += -DCONFIG_RAYER_SPI=1
+endif
+
++if HAVE_BITBANG_SPI
++bitbang_spi_SOURCES = bitbang_spi.c
++DEFS += -DCONFIG_BITBANG_SPI=1
++endif
++
+if HAVE_NIC3COM
+nic3com_SOURCES = nic3com.c
+DEFS += -DCONFIG_NIC3COM=1
@@ -57,11 +68,6 @@ index 0000000..6790ac5
+DEFS += -DCONFIG_GFXNVIDIA=1
+endif
+
-+if HAVE_GFXOGP
-+gfxogp_SOURCES = ogp_spi.c
-+DEFS += -DCONFIG_OGP_SPI=1
-+endif
-+
+if HAVE_SATASII
+satasii_SOURCES = satasii.c
+DEFS += -DCONFIG_SATASII=1
@@ -102,9 +108,9 @@ index 0000000..6790ac5
+DEFS += -DCONFIG_NICINTEL_SPI=1
+endif
+
-+if HAVE_SERPROG
-+serprog_SOURCES = serprog.c
-+DEFS += -DCONFIG_SERPROG=1
++if HAVE_GFXOGP
++gfxogp_SOURCES = ogp_spi.c
++DEFS += -DCONFIG_OGP_SPI=1
+endif
+
+if HAVE_BUSPIRATE_SPI
@@ -112,15 +118,20 @@ index 0000000..6790ac5
+DEFS += -DCONFIG_BUSPIRATE_SPI=1
+endif
+
-+if HAVE_SERIAL
-+serial_SOURCES = serial.c
-+endif
-+
+if HAVE_DEDIPROG
+dediprog_SOURCES = dediprog.c
+DEFS += -DCONFIG_DEDIPROG=1
+endif
+
++if HAVE_SATAMV
++satamv_SOURCES = satamv.c
++DEFS += -DCONFIG_SATAMV=1
++endif
++
++if HAVE_SERIAL
++serial_SOURCES = serial.c
++endif
++
+if HAVE_PRINT_WIKI
+print_wiki_SOURCES = print_wiki.c
+DEFS += -DCONFIG_PRINT_WIKI=1
@@ -155,47 +166,44 @@ index 0000000..6790ac5
+
+lib_SOURCES = layout.c
+
-+if HAVE_BITBANG_SPI
-+bitbang_spi_SOURCES = bitbang_spi.c
-+endif
-+
+# Unknown purpose
+# sharplhf00l04.c
+
+flashrom_SOURCES = \
+ programmer.c \
+ udelay.c \
-+ $(lib_SOURCES) \
-+ $(cli_SOURCES) \
-+ $(bitbang_spi_SOURCES) \
-+ $(chip_SOURCES) \
-+ $(pci_SOURCES) \
++ $(internal_SOURCES) \
++ $(internal_x86_only_SOURCES) \
+ $(serprog_SOURCES) \
+ $(rayer_spi_SOURCES) \
++ $(bitbang_spi_SOURCES) \
+ $(nic3com_SOURCES) \
-+ $(internal_SOURCES) \
-+ $(internal_x86_only_SOURCES) \
++ $(gfxnvidia_SOURCES) \
+ $(satasii_SOURCES) \
+ $(atahpt_SOURCES) \
-+ $(dummy_SOURCES) \
+ $(ft_2232_spi_SOURCES) \
-+ $(gfxnvidia_SOURCES) \
-+ $(gfxogp_SOURCES) \
++ $(dummy_SOURCES) \
+ $(drkaiser_SOURCES) \
+ $(nicrealtek_SOURCES) \
+ $(nicnatsemi_SOURCES) \
+ $(nicintel_SOURCES) \
++ $(gfxogp_SOURCES) \
+ $(buspirate_SOURCES) \
+ $(dediprog_SOURCES) \
++ $(satamv_SOURCES) \
++ $(serial_SOURCES) \
+ $(print_wiki_SOURCES) \
-+ $(serial_SOURCES)
++ $(pci_SOURCES) \
++ $(chip_SOURCES) \
++ $(cli_SOURCES) \
++ $(lib_SOURCES)
diff --git a/configure.ac b/configure.ac
new file mode 100644
-index 0000000..27fa0f9
+index 0000000..9b66251
--- /dev/null
+++ b/configure.ac
-@@ -0,0 +1,227 @@
-+AC_INIT([flashrom], [0.9.3-r1250], [flashrom at flashrom.org], [flashrom], [http://www.flashrom.org/])
+@@ -0,0 +1,231 @@
++AC_INIT([flashrom], [0.9.3-r1280], [flashrom at flashrom.org], [flashrom], [http://www.flashrom.org/])
+
+AC_PREREQ(2.59)
+
@@ -229,7 +237,7 @@ index 0000000..27fa0f9
+
+AC_ARG_WITH([satasii],
+ AC_HELP_STRING([--with-satasii],[SiI SATA controllers support.]),
-+ [satasii="$withval"],[satasii="no"])
++ [satasii="$withval"],[satasii="yes"])
+
+AC_ARG_WITH([atahpt],
+ AC_HELP_STRING([--with-atahpt],[Highpoint (HPT) ATA/RAID controller support. IMPORTANT: This code is not yet working!]),
@@ -263,7 +271,6 @@ index 0000000..27fa0f9
+ AC_HELP_STRING([--with-gfxogp],[The Open Graphics Project graphics card support.]),
+ [gfxogp="$withval"],[gfxogp="yes"])
+
-+
+AC_ARG_WITH([buspirate_spi],
+ AC_HELP_STRING([--with-buspirate-spi],[Bus Pirate SPI support.]),
+ [buspirate_spi="$withval"],[buspirate_spi="yes"])
@@ -272,6 +279,10 @@ index 0000000..27fa0f9
+ AC_HELP_STRING([--with-dediprog],[Dediprog SF100 support. Incomplete and untested.]),
+ [dediprog="$withval"],[dediprog="no"])
+
++AC_ARG_WITH([satamv],
++ AC_HELP_STRING([--with-satamv],[Marvell SATA controllers support.]),
++ [satamv="$withval"],[satamv="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.]),
@@ -323,23 +334,23 @@ index 0000000..27fa0f9
+# Check whether we need PCI support
+if test "$internal" = 'yes' -o \
+ "$rayer_spi" = 'yes' -o \
-+ "$bitbang_spi" = 'yes' -o \
+ "$nic3com" = 'yes' -o \
+ "$gfxnvidia" = 'yes' -o \
-+ "$gfxogp" = 'yes' -o \
-+ "satasii" = 'yes' -o \
++ "$satasii" = 'yes' -o \
+ "$atahpt" = 'yes' -o \
+ "$drkaiser" = 'yes' -o \
+ "$nicrealtek" = 'yes' -o \
+ "$nicnatsemi" = 'yes' -o \
-+ "$nicintel_spi" = 'yes' ; then
++ "$nicintel_spi" = 'yes' -o \
++ "$gfxogp" = 'yes' -o \
++ "$satamv" = 'yes' ; then
+ pci="yes"
+fi
+
-+if test "$internal" = 'yes' -o \
-+ "$rayer_spi" = 'yes' -o \
-+ "$gfxogp" = 'yes' -o \
-+ "$nicintel_spi" = 'yes' ; then
++if test "$rayer_spi" = 'yes' -o \
++ "$internal" = 'yes' -o \
++ "$nicintel_spi" = 'yes' -o \
++ "$gfxogp" = 'yes' ; then
+ bitbang_spi="yes"
+fi
+
@@ -398,30 +409,31 @@ index 0000000..27fa0f9
+fi
+
+# For Makefile.am
-+AM_CONDITIONAL(HAVE_RAYER_SPI, test "$rayer_spi" = "yes")
-+AM_CONDITIONAL(HAVE_NIC3COM, test "$nic3com" = "yes")
-+AM_CONDITIONAL(HAVE_DUMMY, test "$dummy" = "yes")
+AM_CONDITIONAL(HAVE_INTERNAL, test "$internal" = "yes")
+AM_CONDITIONAL(HAVE_X86_ONLY_INTERNAL, test "$enable_x86_only_internal" = "yes")
++AM_CONDITIONAL(HAVE_SERPROG, test "$serprog" = "yes")
++AM_CONDITIONAL(HAVE_RAYER_SPI, test "$rayer_spi" = "yes")
++AM_CONDITIONAL(HAVE_BITBANG_SPI, test "$bitbang_spi" = "yes")
++AM_CONDITIONAL(HAVE_NIC3COM, test "$nic3com" = "yes")
++AM_CONDITIONAL(HAVE_GFXNVIDIA, test "$gfxnvidia" = "yes")
+AM_CONDITIONAL(HAVE_SATASII, test "$satasii" = "yes")
+AM_CONDITIONAL(HAVE_ATAHPT, test "$atahpt" = "yes")
-+AM_CONDITIONAL(HAVE_NICINTEL_SPI, test "$nicintel_spi" = "yes")
-+AM_CONDITIONAL(HAVE_NICNATSEMI, test "$nicnatsemi" = "yes")
++AM_CONDITIONAL(HAVE_FT2232_SPI, test "$ft2232_spi" = "yes")
++AM_CONDITIONAL(HAVE_DUMMY, test "$dummy" = "yes")
++AM_CONDITIONAL(HAVE_DRKAISER, test "$drkaiser" = "yes")
+AM_CONDITIONAL(HAVE_NICREALTEK, test "$nicrealtek" = "yes")
-+AM_CONDITIONAL(HAVE_GFXNVIDIA, test "$gfxnvidia" = "yes")
++AM_CONDITIONAL(HAVE_NICNATSEMI, test "$nicnatsemi" = "yes")
++AM_CONDITIONAL(HAVE_NICINTEL_SPI, test "$nicintel_spi" = "yes")
+AM_CONDITIONAL(HAVE_GFXOGP, test "$gfxogp" = "yes")
-+AM_CONDITIONAL(HAVE_SERPROG, test "$serprog" = "yes")
+AM_CONDITIONAL(HAVE_BUSPIRATE_SPI, test "$buspirate_spi" = "yes")
++AM_CONDITIONAL(HAVE_DEDIPROG, test "$dediprog" = "yes")
++AM_CONDITIONAL(HAVE_SATAMV, test "$satamv" = "yes")
+AM_CONDITIONAL(HAVE_SERIAL, test "$serial" = "yes")
+AM_CONDITIONAL(HAVE_PCI, test "$pci" = "yes")
-+AM_CONDITIONAL(HAVE_DEDIPROG, test "$dediprog" = "yes")
-+AM_CONDITIONAL(HAVE_DRKAISER, test "$drkaiser" = "yes")
-+AM_CONDITIONAL(HAVE_FT2232_SPI, test "$ft2232_spi" = "yes")
-+AM_CONDITIONAL(HAVE_BITBANG_SPI, test "$bitbang_spi" = "yes")
+AM_CONDITIONAL(HAVE_PRINT_WIKI, test "$print_wiki" = "yes")
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
--
-1.7.3.4
+1.7.4
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 4c1b86a..8898fa9 100644
--- a/flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch
+++ b/flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch
@@ -1,7 +1,7 @@
-From a9c3a3d0fb1a35f99562e7cf5e13332510ff8c33 Mon Sep 17 00:00:00 2001
+From 594b2aa88279837529cb577d570d1df921d41c76 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 02/13] Use dmidecode path defined at configure stage
+Subject: [PATCH 02/10] Use dmidecode path defined at configure stage
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index cda6656..2853c93 100644
static char *dmistrings[ARRAY_SIZE(dmidecode_names)];
--
-1.7.3.4
+1.7.4
diff --git a/flashrom-0003-Use-flashrom-s-version-from-config.h.patch b/flashrom-0003-Use-flashrom-s-version-from-config.h.patch
index 6d3c764..857b678 100644
--- a/flashrom-0003-Use-flashrom-s-version-from-config.h.patch
+++ b/flashrom-0003-Use-flashrom-s-version-from-config.h.patch
@@ -1,7 +1,7 @@
-From 969d01d210afc2fc7a69c85c9f23ae3061201552 Mon Sep 17 00:00:00 2001
+From 14a8ad8f34a02865783d52b88c24c972f38fe47c Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 17 Sep 2010 22:32:07 +0400
-Subject: [PATCH 03/13] Use flashrom's version from config.h
+Subject: [PATCH 03/10] Use flashrom's version from config.h
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -11,19 +11,19 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/flash.h b/flash.h
-index 250482f..630f7c6 100644
+index 91c4cf3..630f7c6 100644
--- a/flash.h
+++ b/flash.h
@@ -188,7 +188,6 @@ enum write_granularity {
};
extern enum chipbustype buses_supported;
extern int verbose;
--extern const char * const flashrom_version;
+-extern const char flashrom_version[];
extern char *chip_to_probe;
void map_flash_registers(struct flashchip *flash);
int read_memmapped(struct flashchip *flash, uint8_t *buf, int start, int len);
diff --git a/flashrom.c b/flashrom.c
-index f3497d0..49e1a52 100644
+index 34248ed..fe2ff18 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -31,6 +31,9 @@
@@ -40,11 +40,11 @@ index f3497d0..49e1a52 100644
#include "flashchips.h"
#include "programmer.h"
--const char * const flashrom_version = FLASHROM_VERSION;
+-const char flashrom_version[] = FLASHROM_VERSION;
char *chip_to_probe = NULL;
int verbose = 0;
-@@ -1662,7 +1664,7 @@ void print_sysinfo(void)
+@@ -1677,7 +1679,7 @@ void print_sysinfo(void)
void print_version(void)
{
@@ -54,7 +54,7 @@ index f3497d0..49e1a52 100644
}
diff --git a/print_wiki.c b/print_wiki.c
-index 48e0122..eb044a4 100644
+index 8b13f70..f51652f 100644
--- a/print_wiki.c
+++ b/print_wiki.c
@@ -26,6 +26,7 @@
@@ -63,9 +63,9 @@ index 48e0122..eb044a4 100644
#include "programmer.h"
+#include "config.h"
- static const char * const wiki_header = "= Supported devices =\n\n\
+ static const char wiki_header[] = "= Supported devices =\n\n\
<div style=\"margin-top:0.5em; padding:0.5em 0.5em 0.5em 0.5em; \
-@@ -267,7 +268,7 @@ void print_supported_wiki(void)
+@@ -270,7 +271,7 @@ void print_supported_wiki(void)
{
time_t t = time(NULL);
@@ -75,5 +75,5 @@ index 48e0122..eb044a4 100644
#if CONFIG_INTERNAL == 1
print_supported_chipsets_wiki(3);
--
-1.7.3.4
+1.7.4
diff --git a/flashrom-0004-Use-HAVE_LIBPCI-from-config.h-instead-of-NEED_PCI.patch b/flashrom-0004-Use-HAVE_LIBPCI-from-config.h-instead-of-NEED_PCI.patch
index b00ac40..229a1fc 100644
--- a/flashrom-0004-Use-HAVE_LIBPCI-from-config.h-instead-of-NEED_PCI.patch
+++ b/flashrom-0004-Use-HAVE_LIBPCI-from-config.h-instead-of-NEED_PCI.patch
@@ -1,7 +1,7 @@
-From 6a58ab71cb5f216b7db64cf9be308e967edf3824 Mon Sep 17 00:00:00 2001
+From 96c357b1a2f132d4e295062926f6a14b6b4c41f4 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 17 Sep 2010 22:33:12 +0400
-Subject: [PATCH 04/13] Use HAVE_LIBPCI from config.h instead of NEED_PCI
+Subject: [PATCH 04/10] Use HAVE_LIBPCI from config.h instead of NEED_PCI
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -12,10 +12,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/flashrom.c b/flashrom.c
-index 49e1a52..f05e36c 100644
+index fe2ff18..63e516f 100644
--- a/flashrom.c
+++ b/flashrom.c
-@@ -1630,7 +1630,7 @@ void print_sysinfo(void)
+@@ -1645,7 +1645,7 @@ void print_sysinfo(void)
msg_ginfo(" on unknown machine");
#endif
msg_ginfo(", built with");
@@ -70,7 +70,7 @@ index c96db99..8bc49b9 100644
{
struct pci_dev *temp;
diff --git a/programmer.h b/programmer.h
-index 7bd1405..f0fef1c 100644
+index b7cebc3..ae795be 100644
--- a/programmer.h
+++ b/programmer.h
@@ -24,6 +24,8 @@
@@ -82,7 +82,7 @@ index 7bd1405..f0fef1c 100644
enum programmer {
#if CONFIG_INTERNAL == 1
PROGRAMMER_INTERNAL,
-@@ -204,7 +206,7 @@ void myusec_delay(int usecs);
+@@ -206,7 +208,7 @@ void myusec_delay(int usecs);
void myusec_calibrate_delay(void);
void internal_delay(int usecs);
@@ -91,7 +91,7 @@ index 7bd1405..f0fef1c 100644
/* pcidev.c */
extern uint32_t io_base_addr;
extern struct pci_access *pacc;
-@@ -265,7 +267,7 @@ void dmi_init(void);
+@@ -267,7 +269,7 @@ void dmi_init(void);
int dmi_match(const char *pattern);
/* internal.c */
@@ -101,5 +101,5 @@ index 7bd1405..f0fef1c 100644
uint16_t vendor;
uint16_t port;
--
-1.7.3.4
+1.7.4
diff --git a/flashrom-0005-Use-macros-from-config.h-instead-of-HAVE_UTSNAME.patch b/flashrom-0005-Use-macros-from-config.h-instead-of-HAVE_UTSNAME.patch
index 53e98ad..d44f51a 100644
--- a/flashrom-0005-Use-macros-from-config.h-instead-of-HAVE_UTSNAME.patch
+++ b/flashrom-0005-Use-macros-from-config.h-instead-of-HAVE_UTSNAME.patch
@@ -1,7 +1,7 @@
-From c0e8393c2149fb44b45ccb0e58af618c4d2b8301 Mon Sep 17 00:00:00 2001
+From 3af0833c8e5ca032a60c09451615daa8706f7acf 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 05/13] Use macros from config.h instead of HAVE_UTSNAME
+Subject: [PATCH 05/10] Use macros from config.h instead of HAVE_UTSNAME
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/flashrom.c b/flashrom.c
-index f05e36c..fdb14fc 100644
+index 63e516f..4c9f7cd 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -34,7 +34,7 @@
@@ -21,7 +21,7 @@ index f05e36c..fdb14fc 100644
#include <sys/utsname.h>
#endif
#include "flash.h"
-@@ -1620,7 +1620,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren)
+@@ -1635,7 +1635,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren)
void print_sysinfo(void)
{
@@ -31,5 +31,5 @@ index f05e36c..fdb14fc 100644
uname(&osinfo);
--
-1.7.3.4
+1.7.4
diff --git a/flashrom-0006-Kill-some-x86-related-ifdefs-in-code-this-is-now-con.patch b/flashrom-0006-Kill-some-x86-related-ifdefs-in-code-this-is-now-con.patch
index 3467eed..ba3b26f 100644
--- a/flashrom-0006-Kill-some-x86-related-ifdefs-in-code-this-is-now-con.patch
+++ b/flashrom-0006-Kill-some-x86-related-ifdefs-in-code-this-is-now-con.patch
@@ -1,11 +1,12 @@
-From f4498e0b2c8f68d4ce4189d41da77c2dd7a14e9d Mon Sep 17 00:00:00 2001
+From 3aa8831e8773db023965ebd7149aa0b1db0f673f 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 06/13] Kill some x86-related ifdefs in code - this is now controlled via autotools
+Subject: [PATCH 06/10] Kill some x86-related ifdefs in code - this is now controlled via autotools
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
ichspi.c | 4 ----
+ it85spi.c | 4 ----
it87spi.c | 4 ----
mcp6x_spi.c | 4 ----
nic3com.c | 6 ------
@@ -14,10 +15,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
rayer_spi.c | 5 -----
sb600spi.c | 4 ----
wbsio_spi.c | 4 ----
- 9 files changed, 0 insertions(+), 43 deletions(-)
+ 10 files changed, 0 insertions(+), 47 deletions(-)
diff --git a/ichspi.c b/ichspi.c
-index a087a0b..ea77361 100644
+index 66c8d51..565f761 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -34,8 +34,6 @@
@@ -35,6 +36,25 @@ index a087a0b..ea77361 100644
}
-
-#endif
+diff --git a/it85spi.c b/it85spi.c
+index d122a18..ac3248c 100644
+--- a/it85spi.c
++++ b/it85spi.c
+@@ -24,8 +24,6 @@
+ * Contains the ITE IT85* SPI specific routines
+ */
+
+-#if defined(__i386__) || defined(__x86_64__)
+-
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -416,5 +414,3 @@ int it85_spi_write_256(struct flashchip *flash, uint8_t * buf, int start, int le
+ {
+ return spi_write_chunked(flash, buf, start, len, 64);
+ }
+-
+-#endif
diff --git a/it87spi.c b/it87spi.c
index fb1448a..c0f73e3 100644
--- a/it87spi.c
@@ -74,7 +94,7 @@ index 0e0d311..d9bb893 100644
-
-#endif
diff --git a/nic3com.c b/nic3com.c
-index 0eb781a..7084edf 100644
+index d39ee71..8c9b2e3 100644
--- a/nic3com.c
+++ b/nic3com.c
@@ -18,8 +18,6 @@
@@ -86,7 +106,7 @@ index 0eb781a..7084edf 100644
#include <stdlib.h>
#include "flash.h"
#include "programmer.h"
-@@ -114,7 +112,3 @@ uint8_t nic3com_chip_readb(const chipaddr addr)
+@@ -113,7 +111,3 @@ uint8_t nic3com_chip_readb(const chipaddr addr)
OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR);
return INB(io_base_addr + BIOS_ROM_DATA);
}
@@ -95,7 +115,7 @@ index 0eb781a..7084edf 100644
-#error PCI port I/O access is not supported on this architecture yet.
-#endif
diff --git a/nicnatsemi.c b/nicnatsemi.c
-index 1683857..e3a2807 100644
+index 3cae253..58f4471 100644
--- a/nicnatsemi.c
+++ b/nicnatsemi.c
@@ -18,8 +18,6 @@
@@ -107,7 +127,7 @@ index 1683857..e3a2807 100644
#include <stdlib.h>
#include "flash.h"
#include "programmer.h"
-@@ -89,7 +87,3 @@ uint8_t nicnatsemi_chip_readb(const chipaddr addr)
+@@ -88,7 +86,3 @@ uint8_t nicnatsemi_chip_readb(const chipaddr addr)
*/
return INB(io_base_addr + BOOT_ROM_DATA);
}
@@ -116,7 +136,7 @@ index 1683857..e3a2807 100644
-#error PCI port I/O access is not supported on this architecture yet.
-#endif
diff --git a/nicrealtek.c b/nicrealtek.c
-index c32e5d6..b5bcbaf 100644
+index d97deb1..2951d0f 100644
--- a/nicrealtek.c
+++ b/nicrealtek.c
@@ -18,8 +18,6 @@
@@ -128,7 +148,7 @@ index c32e5d6..b5bcbaf 100644
#include <stdlib.h>
#include "flash.h"
#include "programmer.h"
-@@ -109,7 +107,3 @@ uint8_t nicrealtek_chip_readb(const chipaddr addr)
+@@ -92,7 +90,3 @@ uint8_t nicrealtek_chip_readb(const chipaddr addr)
return val;
}
@@ -157,7 +177,7 @@ index a01ee80..e64137b 100644
-#error PCI port I/O access is not supported on this architecture yet.
-#endif
diff --git a/sb600spi.c b/sb600spi.c
-index 4e3e079..c468ca3 100644
+index 845cf58..95ab158 100644
--- a/sb600spi.c
+++ b/sb600spi.c
@@ -21,8 +21,6 @@
@@ -195,5 +215,5 @@ index acf9cb2..1a583a8 100644
-
-#endif
--
-1.7.3.4
+1.7.4
diff --git a/flashrom-0007-Simplify-hwaccess.c.patch b/flashrom-0007-Simplify-hwaccess.c.patch
index dc5ee04..449d938 100644
--- a/flashrom-0007-Simplify-hwaccess.c.patch
+++ b/flashrom-0007-Simplify-hwaccess.c.patch
@@ -1,7 +1,7 @@
-From 610af38a4cc47c5ba95f7ff324beb7cf1253824f Mon Sep 17 00:00:00 2001
+From dd4c51bdc2ce1e681592183adf51886da68b69f2 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 21 Sep 2010 17:51:08 +0400
-Subject: [PATCH 07/13] Simplify hwaccess.c
+Subject: [PATCH 07/10] Simplify hwaccess.c
This file is saturated with superfluous ifdefs arranged into
several nested levels. This in turn adds additional complexity
@@ -142,5 +142,5 @@ index bbb91a6..e700b67 100644
void mmio_writeb(uint8_t val, void *addr)
{
--
-1.7.3.4
+1.7.4
diff --git a/flashrom-0008-Use-endiannes-determined-at-the-configure-stage.patch b/flashrom-0008-Use-endiannes-determined-at-the-configure-stage.patch
index 1499ec4..3fb4399 100644
--- a/flashrom-0008-Use-endiannes-determined-at-the-configure-stage.patch
+++ b/flashrom-0008-Use-endiannes-determined-at-the-configure-stage.patch
@@ -1,7 +1,7 @@
-From 9b762628575706bf7bf6a8858dc1582ec42b92e5 Mon Sep 17 00:00:00 2001
+From 28f80e2c168d5f9e4d88a85f6fd81d335c2322d3 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 08/13] Use endiannes determined at the configure stage
+Subject: [PATCH 08/10] Use endiannes determined at the configure stage
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -87,5 +87,5 @@ index 920b82c..4655003 100644
#define be_to_cpu8 cpu_to_be8
#define be_to_cpu16 cpu_to_be16
--
-1.7.3.4
+1.7.4
diff --git a/flashrom-0010-Use-HAVE_-_H-macro-for-detecting-includes.patch b/flashrom-0009-Use-HAVE_-_H-macro-for-detecting-includes.patch
similarity index 68%
rename from flashrom-0010-Use-HAVE_-_H-macro-for-detecting-includes.patch
rename to flashrom-0009-Use-HAVE_-_H-macro-for-detecting-includes.patch
index 610b62f..26d39c3 100644
--- a/flashrom-0010-Use-HAVE_-_H-macro-for-detecting-includes.patch
+++ b/flashrom-0009-Use-HAVE_-_H-macro-for-detecting-includes.patch
@@ -1,15 +1,15 @@
-From a1968cc96e0aa0b58d3582109749a98e83c63b70 Mon Sep 17 00:00:00 2001
+From 451a29cc8f3258f915469edf3c03e308b4103169 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 10/13] Use HAVE_*_H macro for detecting includes
+Subject: [PATCH 09/10] Use HAVE_*_H macro for detecting includes
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- hwaccess.h | 62 ++++++++++++++++++++++++++++++++++++++++++-----------------
- 1 files changed, 44 insertions(+), 18 deletions(-)
+ hwaccess.h | 72 ++++++++++++++++++++++++++++++++++++++++++-----------------
+ 1 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/hwaccess.h b/hwaccess.h
-index 111f7d9..3326383 100644
+index 4655003..2ed7bc4 100644
--- a/hwaccess.h
+++ b/hwaccess.h
@@ -26,13 +26,11 @@
@@ -78,10 +78,17 @@ index 111f7d9..3326383 100644
#define ___constant_swab8(x) ((uint8_t) ( \
(((uint8_t)(x) & (uint8_t)0xffU))))
-@@ -116,13 +154,6 @@ cpu_to_be(64)
+@@ -114,18 +152,13 @@ cpu_to_be(64)
+ #define le_to_cpu64 cpu_to_le64
+
#if HAVE_LIBPCI == 1
++
++/* PCI port I/O is not yet implemented on PowerPC. */
++/* PCI port I/O is not yet implemented on MIPS. */
#if defined (__i386__) || defined (__x86_64__)
+ #define __FLASHROM_HAVE_OUTB__ 1
+
-/* for iopl and outb under Solaris */
-#if defined (__sun) && (defined(__i386) || defined(__amd64))
-#include <strings.h>
@@ -89,10 +96,11 @@ index 111f7d9..3326383 100644
-#include <sys/psw.h>
-#include <asm/sunddi.h>
-#endif
-
+-
#if (defined(__MACH__) && defined(__APPLE__))
#define __DARWIN__
-@@ -133,7 +164,6 @@ cpu_to_be(64)
+ #endif
+@@ -135,7 +168,6 @@ cpu_to_be(64)
*/
#if defined(__FreeBSD__) || defined(__DragonFly__)
@@ -100,7 +108,7 @@ index 111f7d9..3326383 100644
#define off64_t off_t
#define lseek64 lseek
#define OUTB(x, y) do { u_int outb_tmp = (y); outb(outb_tmp, (x)); } while (0)
-@@ -161,8 +191,6 @@ cpu_to_be(64)
+@@ -163,8 +195,6 @@ cpu_to_be(64)
#ifdef __DJGPP__
@@ -109,7 +117,7 @@ index 111f7d9..3326383 100644
#define OUTB(x,y) outportb(y, x)
#define OUTW(x,y) outportw(y, x)
#define OUTL(x,y) outportl(y, x)
-@@ -189,8 +217,6 @@ cpu_to_be(64)
+@@ -191,8 +221,6 @@ cpu_to_be(64)
#define off64_t off_t
#define lseek64 lseek
#if defined(__i386__) || defined(__x86_64__)
@@ -118,6 +126,26 @@ index 111f7d9..3326383 100644
#if defined(__NetBSD__)
#if defined(__i386__)
#define iopl i386_iopl
+@@ -249,7 +277,8 @@ 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);
+-#endif
++#endif /* !defined(__DARWIN__) && !defined(__FreeBSD__) && !defined(__DragonFly__) */
++
+ #if defined(__FreeBSD__) || defined(__DragonFly__)
+ /* FreeBSD already has conflicting definitions for wrmsr/rdmsr. */
+ #undef rdmsr
+@@ -259,7 +288,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);
+-#endif
++#endif /* defined(__FreeBSD__) || defined(__DragonFly__) */
++
+ #if defined(__LIBPAYLOAD__)
+ #include <arch/io.h>
+ #include <arch/msr.h>
--
-1.7.3.4
+1.7.4
diff --git a/flashrom-0012-Move-arch-checking-ifdef-block-into-header.patch b/flashrom-0010-Move-arch-checking-ifdef-block-into-header.patch
similarity index 88%
rename from flashrom-0012-Move-arch-checking-ifdef-block-into-header.patch
rename to flashrom-0010-Move-arch-checking-ifdef-block-into-header.patch
index 7af91c7..77f405b 100644
--- a/flashrom-0012-Move-arch-checking-ifdef-block-into-header.patch
+++ b/flashrom-0010-Move-arch-checking-ifdef-block-into-header.patch
@@ -1,7 +1,7 @@
-From 5dbbcb034eb2c903ac29b5d5e43919c8e75b45be Mon Sep 17 00:00:00 2001
+From 5c9b5f98f7bb900213e30cdf68945243e8b340c8 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 17 Oct 2010 12:53:18 +0400
-Subject: [PATCH 12/13] Move arch-checking #ifdef block into header
+Subject: [PATCH 10/10] Move arch-checking #ifdef block into header
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -28,7 +28,7 @@ index e700b67..5fcc83e 100644
#if defined(__FreeBSD__) || defined(__DragonFly__)
int io_fd;
diff --git a/hwaccess.h b/hwaccess.h
-index 9fb078f..b166429 100644
+index 2ed7bc4..f192d3f 100644
--- a/hwaccess.h
+++ b/hwaccess.h
@@ -26,6 +26,13 @@
@@ -45,7 +45,7 @@ index 9fb078f..b166429 100644
#if defined (HAVE_SYS_IO_H)
#include <sys/io.h>
#endif /* defined (HAVE_SYS_IO_H) */
-@@ -181,7 +188,7 @@ cpu_to_be(64)
+@@ -183,7 +190,7 @@ cpu_to_be(64)
#define off64_t off_t
#define lseek64 lseek
#endif
@@ -54,7 +54,7 @@ index 9fb078f..b166429 100644
/* Note different order for outb */
#define OUTB(x,y) outb(y, x)
#define OUTW(x,y) outw(y, x)
-@@ -299,18 +306,6 @@ int libpayload_wrmsr(int addr, msr_t msr);
+@@ -301,18 +308,6 @@ int libpayload_wrmsr(int addr, msr_t msr);
#define wrmsr libpayload_wrmsr
#endif
@@ -74,5 +74,5 @@ index 9fb078f..b166429 100644
#endif
--
-1.7.3.4
+1.7.4
diff --git a/flashrom.spec b/flashrom.spec
index e21be73..5e52aab 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.3
-Release: 2.svn1250%{?dist}
+Release: 3.svn1280%{?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 1250 export svn://coreboot.org/flashrom/trunk flashrom-0.9.3
+## svn -r 1280 export svn://coreboot.org/flashrom/trunk flashrom-0.9.3
## tar -cjvf flashrom-0.9.3.tar.bz2 flashrom-0.9.3
Source0: %{name}-%{version}.tar.bz2
Patch1: flashrom-0001-Initial-commit-of-autotools-related-files.patch
@@ -18,11 +18,8 @@ Patch5: flashrom-0005-Use-macros-from-config.h-instead-of-HAVE_UTSNAME.patch
Patch6: flashrom-0006-Kill-some-x86-related-ifdefs-in-code-this-is-now-con.patch
Patch7: flashrom-0007-Simplify-hwaccess.c.patch
Patch8: flashrom-0008-Use-endiannes-determined-at-the-configure-stage.patch
-Patch9: flashrom-0009-Kill-unused-__FLASHROM_HAVE_OUTB__-define.patch
-Patch10: flashrom-0010-Use-HAVE_-_H-macro-for-detecting-includes.patch
-Patch11: flashrom-0011-Add-more-comments-cosmetic-change.patch
-Patch12: flashrom-0012-Move-arch-checking-ifdef-block-into-header.patch
-Patch13: flashrom-0013-rtl8169-support.patch
+Patch9: flashrom-0009-Use-HAVE_-_H-macro-for-detecting-includes.patch
+Patch10: flashrom-0010-Move-arch-checking-ifdef-block-into-header.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: pciutils-devel
@@ -52,9 +49,6 @@ and write new contents on the chips ("flash the chip").
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
%build
autoreconf -ivf
@@ -76,6 +70,18 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/%{name}.*
%changelog
+* Wed Mar 09 2011 Peter Lemenkov <lemenkov at gmail.com> - 0.9.3-3.svn1280
+- Updated to latest svn ver. 1280 (post-release snapshot for 0.9.3)
+- Board enable for Asus P4P800-VM
+- Support for ST M25PX16 chip
+- Support for W39L040 chip
+- Board enable for Gigabyte GA-K8N51GMF
+- Support for ITE IT8500/IT8502 embedded controllers
+- Support for AMD Am29LV001BB, Am29LV001BT, Am29LV002BB, Am29LV002BT,
+ Am29LV004BB, Am29LV004BT, Am29LV008BB, Am29LV008BT chips
+- Support for Angelbird Wings PCIe SSD (Marvell 88SX7042 SATA controller)
+- Fix for rhbz #680715
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-2.svn1250
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 0e6fa96..17896e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1262fb920d2eeb34a64d2f9233488d8d flashrom-0.9.3.tar.bz2
+0221ba69e6ef6f49ec968c8236178fae flashrom-0.9.3.tar.bz2
More information about the scm-commits
mailing list