[flashrom] Updated to the latest svn ver. 1639 (post-release snapshot for 0.9.6.1)
Peter Lemenkov
peter at fedoraproject.org
Sun Dec 30 11:19:10 UTC 2012
commit fbe6f19cf5aa0f60e0b579caff8b8c2f153cece2
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun Dec 30 15:19:02 2012 +0400
Updated to the latest svn ver. 1639 (post-release snapshot for 0.9.6.1)
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
...Initial-commit-of-autotools-related-files.patch | 25 ++--
...dmidecode-path-defined-at-configure-stage.patch | 8 +-
...from-configure-stage-instead-of-HAVE_UTSN.patch | 10 +-
...86-related-ifdefs-in-code-this-is-now-con.patch | 20 +-
flashrom-0005-Simplify-hwaccess.c.patch | 191 --------------------
...diannes-determined-at-the-configure-stage.patch | 8 +-
...Use-HAVE_-_H-macro-for-detecting-includes.patch | 8 +-
...-ppc-hack.patch => flashrom-0007-ppc-hack.patch | 10 +-
flashrom.spec | 25 ++-
sources | 2 +-
10 files changed, 63 insertions(+), 244 deletions(-)
---
diff --git a/flashrom-0001-Initial-commit-of-autotools-related-files.patch b/flashrom-0001-Initial-commit-of-autotools-related-files.patch
index d3c3a53..50f9211 100644
--- a/flashrom-0001-Initial-commit-of-autotools-related-files.patch
+++ b/flashrom-0001-Initial-commit-of-autotools-related-files.patch
@@ -1,30 +1,30 @@
-From 73db870f2453eeccb39a489c28ba2b985bb238e8 Mon Sep 17 00:00:00 2001
+From 674eb70e3934fb6ba01d5acb52048771e3d28111 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/8] Initial commit of autotools-related files
+Subject: [PATCH 1/7] Initial commit of autotools-related files
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- Makefile.am | 219 +++++++++++++++++++++++++++++++++++++
+ Makefile.am | 218 +++++++++++++++++++++++++++++++++++++
bootstrap.sh | 4 +
configure.ac | 349 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 572 insertions(+)
+ 3 files changed, 571 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..5c4ee86
+index 0000000..c7d4515
--- /dev/null
+++ b/Makefile.am
-@@ -0,0 +1,219 @@
+@@ -0,0 +1,218 @@
+sbin_PROGRAMS = flashrom
+
+man_MANS = flashrom.8
+
+# FIXME use "config.h" in the future
-+DEFS += -DFLASHROM_VERSION=\"@VERSION@\"
++DEFS += -DFLASHROM_VERSION=\"@VERSION@\" -DCONFIG_DEFAULT_PROGRAMMER=PROGRAMMER_INTERNAL
+
+if HAVE_DMIDECODE
+DEFS += -DDMIDECODE_PATH=\"@DMIDECODE@\"
@@ -57,7 +57,7 @@ index 0000000..5c4ee86
+endif
+
+if HAVE_SERPROG
-+serprog_SOURCES = serprog.c
++serprog_SOURCES = serprog.c serprog.h
+DEFS += -DCONFIG_SERPROG=1
+endif
+
@@ -174,8 +174,6 @@ index 0000000..5c4ee86
+endif
+
+chip_SOURCES = 82802ab.c \
-+ a25.c \
-+ at25.c \
+ chipdrivers.h \
+ flashchips.c \
+ flashchips.h \
@@ -187,6 +185,7 @@ index 0000000..5c4ee86
+ sfdp.c \
+ spi.c \
+ spi.h \
++ spi25_statusreg.c \
+ spi25.c \
+ sst_fwhub.c \
+ sst28sf040.c \
@@ -250,11 +249,11 @@ index 0000000..0213288
+automake --add-missing --copy --force-missing
diff --git a/configure.ac b/configure.ac
new file mode 100644
-index 0000000..a823d5b
+index 0000000..b32c515
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,349 @@
-+AC_INIT([flashrom], [0.9.6.1-r1596], [flashrom at flashrom.org], [flashrom], [http://www.flashrom.org/])
++AC_INIT([flashrom], [0.9.6.1-r1639], [flashrom at flashrom.org], [flashrom], [http://www.flashrom.org/])
+
+AC_PREREQ(2.59)
+
@@ -604,5 +603,5 @@ index 0000000..a823d5b
+------------------------------------------------------------------------
+])
--
-1.7.11.5
+1.8.0.2
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 ca48854..2c2a372 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 54947415cb70643953622f6d1df87d8b651175b8 Mon Sep 17 00:00:00 2001
+From ab136cb5bd1cfa17ce2cc1cd74bbb957d8bcd251 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/8] Use dmidecode path defined at configure stage
+Subject: [PATCH 2/7] Use dmidecode path defined at configure stage
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -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 dfc78e9..ddcfda8 100644
+index a6e2146..0ddf623 100644
--- a/dmi.c
+++ b/dmi.c
@@ -87,7 +87,7 @@ static const struct {
@@ -22,5 +22,5 @@ index dfc78e9..ddcfda8 100644
static char *dmistrings[ARRAY_SIZE(dmidecode_names)];
--
-1.7.11.5
+1.8.0.2
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 98c286e..7ec1b66 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,7 +1,7 @@
-From 61aa13e34a9717fca744fe2cd8f54e7cb9add1d0 Mon Sep 17 00:00:00 2001
+From 996b99266daae9adbcf16e30d1a49f23762dbb18 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/8] Use macros from configure stage instead of HAVE_UTSNAME
+Subject: [PATCH 3/7] Use macros from configure stage 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 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/flashrom.c b/flashrom.c
-index fdc5412..3564bcb 100644
+index fd438bb..3a22eeb 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -31,7 +31,8 @@
@@ -22,7 +22,7 @@ index fdc5412..3564bcb 100644
#include <sys/utsname.h>
#endif
#include "flash.h"
-@@ -1519,7 +1520,7 @@ void print_sysinfo(void)
+@@ -1539,7 +1540,7 @@ void print_sysinfo(void)
msg_ginfo(" (unknown arch)");
break;
}
@@ -32,5 +32,5 @@ index fdc5412..3564bcb 100644
uname(&osinfo);
--
-1.7.11.5
+1.8.0.2
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 20b5bad..ad9b3be 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,7 +1,7 @@
-From ae19710387fed14ee2c55b2d0ffe78f6c68661a4 Mon Sep 17 00:00:00 2001
+From 9215bb413b96b344b49d6a2a0e83b9d7a91c9dc3 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/8] Kill some x86-related ifdefs in code - this is now
+Subject: [PATCH 4/7] Kill some x86-related ifdefs in code - this is now
controlled via autotools
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
@@ -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 8ec0f3f..a6efa48 100644
+index 92f7deb..b7a4cc3 100644
--- a/atahpt.c
+++ b/atahpt.c
@@ -18,8 +18,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 ce9c553..968c258 100644
+index fadfe62..094b023 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -23,8 +23,6 @@
@@ -91,7 +91,7 @@ index ce9c553..968c258 100644
#include <string.h>
#include <stdlib.h>
#include "flash.h"
-@@ -1891,5 +1889,3 @@ int via_init_spi(struct pci_dev *dev, uint32_t mmio_base)
+@@ -1888,5 +1886,3 @@ int via_init_spi(struct pci_dev *dev, uint32_t mmio_base)
return 0;
}
@@ -155,7 +155,7 @@ index ac40557..b40c3e8 100644
-
-#endif
diff --git a/nic3com.c b/nic3com.c
-index c7fc800..3a7476b 100644
+index 05eada6..6207386 100644
--- a/nic3com.c
+++ b/nic3com.c
@@ -18,8 +18,6 @@
@@ -176,7 +176,7 @@ index c7fc800..3a7476b 100644
-#error PCI port I/O access is not supported on this architecture yet.
-#endif
diff --git a/nicnatsemi.c b/nicnatsemi.c
-index fcfc613..b393999 100644
+index 60d8f87..6dcf70a 100644
--- a/nicnatsemi.c
+++ b/nicnatsemi.c
@@ -18,8 +18,6 @@
@@ -197,7 +197,7 @@ index fcfc613..b393999 100644
-#error PCI port I/O access is not supported on this architecture yet.
-#endif
diff --git a/nicrealtek.c b/nicrealtek.c
-index 779d023..1752ec2 100644
+index 3c3b261..c6d73fd 100644
--- a/nicrealtek.c
+++ b/nicrealtek.c
@@ -18,8 +18,6 @@
@@ -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 27ad699..19b540d 100644
+index c0c1ffa..724bd41 100644
--- a/satamv.c
+++ b/satamv.c
@@ -19,7 +19,6 @@
@@ -296,5 +296,5 @@ index 7d4bb2a..6e6eec1 100644
-
-#endif
--
-1.7.11.5
+1.8.0.2
diff --git a/flashrom-0006-Use-endiannes-determined-at-the-configure-stage.patch b/flashrom-0005-Use-endiannes-determined-at-the-configure-stage.patch
similarity index 94%
rename from flashrom-0006-Use-endiannes-determined-at-the-configure-stage.patch
rename to flashrom-0005-Use-endiannes-determined-at-the-configure-stage.patch
index ba4432a..fe98f30 100644
--- a/flashrom-0006-Use-endiannes-determined-at-the-configure-stage.patch
+++ b/flashrom-0005-Use-endiannes-determined-at-the-configure-stage.patch
@@ -1,7 +1,7 @@
-From bfca9c414154314de02800dda8948b76df3d18a1 Mon Sep 17 00:00:00 2001
+From a4c08c787626803ec7b7628966b4eaa02ea716af 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 6/8] Use endiannes determined at the configure stage
+Subject: [PATCH 5/7] Use endiannes determined at the configure stage
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -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 3cf90be..7548192 100644
+index dc52118..c2ca4b2 100644
--- a/hwaccess.h
+++ b/hwaccess.h
@@ -41,58 +41,6 @@
@@ -94,5 +94,5 @@ index 3cf90be..7548192 100644
#define be_to_cpu8 cpu_to_be8
#define be_to_cpu16 cpu_to_be16
--
-1.7.11.5
+1.8.0.2
diff --git a/flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch b/flashrom-0006-Use-HAVE_-_H-macro-for-detecting-includes.patch
similarity index 96%
rename from flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch
rename to flashrom-0006-Use-HAVE_-_H-macro-for-detecting-includes.patch
index 9bbfe90..b43d936 100644
--- a/flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch
+++ b/flashrom-0006-Use-HAVE_-_H-macro-for-detecting-includes.patch
@@ -1,7 +1,7 @@
-From 3f1467843fcd71147bacfbbbe913b14dd6e7be41 Mon Sep 17 00:00:00 2001
+From 9c0264f3d0379c00643cb685e936bd403c50ea37 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 7/8] Use HAVE_*_H macro for detecting includes
+Subject: [PATCH 6/7] Use HAVE_*_H macro for detecting includes
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 56 insertions(+), 20 deletions(-)
diff --git a/hwaccess.h b/hwaccess.h
-index 7548192..0fb09f9 100644
+index c2ca4b2..be71cb9 100644
--- a/hwaccess.h
+++ b/hwaccess.h
@@ -24,11 +24,9 @@
@@ -151,5 +151,5 @@ index 7548192..0fb09f9 100644
#include <arch/io.h>
#include <arch/msr.h>
--
-1.7.11.5
+1.8.0.2
diff --git a/flashrom-0008-ppc-hack.patch b/flashrom-0007-ppc-hack.patch
similarity index 85%
rename from flashrom-0008-ppc-hack.patch
rename to flashrom-0007-ppc-hack.patch
index de7cb20..38f24d1 100644
--- a/flashrom-0008-ppc-hack.patch
+++ b/flashrom-0007-ppc-hack.patch
@@ -1,7 +1,7 @@
-From a0dfa6ac54b17df25a18f32f0dc8554b975eeb30 Mon Sep 17 00:00:00 2001
+From 5f2808562c6b7f759552c2b97dda7b2dee8c3200 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 8/8] ppc hack
+Subject: [PATCH 7/7] ppc hack
---
internal.c | 2 ++
@@ -9,10 +9,10 @@ Subject: [PATCH 8/8] ppc hack
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/internal.c b/internal.c
-index 7b6cff2..85e6c85 100644
+index eda4d59..9b88341 100644
--- a/internal.c
+++ b/internal.c
-@@ -357,6 +357,8 @@ int internal_init(void)
+@@ -350,6 +350,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.7.11.5
+1.8.0.2
diff --git a/flashrom.spec b/flashrom.spec
index 3600f9f..276096d 100644
--- a/flashrom.spec
+++ b/flashrom.spec
@@ -1,23 +1,22 @@
Summary: Simple program for reading/writing BIOS chips content
Name: flashrom
Version: 0.9.6.1
-Release: 1.svn1596%{?dist}
+Release: 2.svn1639%{?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 1596 export svn://coreboot.org/flashrom/trunk flashrom-0.9.6.1
+## svn -r 1639 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
Patch2: flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch
Patch3: flashrom-0003-Use-macros-from-configure-stage-instead-of-HAVE_UTSN.patch
Patch4: flashrom-0004-Kill-some-x86-related-ifdefs-in-code-this-is-now-con.patch
-Patch5: flashrom-0005-Simplify-hwaccess.c.patch
-Patch6: flashrom-0006-Use-endiannes-determined-at-the-configure-stage.patch
-Patch7: flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch
-Patch8: flashrom-0008-ppc-hack.patch
+Patch5: flashrom-0005-Use-endiannes-determined-at-the-configure-stage.patch
+Patch6: flashrom-0006-Use-HAVE_-_H-macro-for-detecting-includes.patch
+Patch7: flashrom-0007-ppc-hack.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: pciutils-devel
@@ -48,7 +47,6 @@ and write new contents on the chips ("flash the chip").
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
%build
@@ -87,6 +85,19 @@ rm -rf %{buildroot}
%changelog
+* Sun Dec 30 2012 Peter Lemenkov <lemenkov at gmail.com> - 0.9.6.1-2.svn1639
+- Updated to the latest svn ver. 1639 (post-release snapshot for 0.9.6.1)
+- Support for Atmel's AT25F series of SPI flash chips
+- Support for Intel S33 series flash chips
+- Add a "device" parameter for Dediprog
+- (Untested) board enable for Asus DSAN-DX
+- Support for Winbond W39F010/W39L010/W39L020
+- Support for Atmel AT26DF041
+- Support for Numonyx N25Q016 and N25Q032
+- Support for SST's 25WF series of SPI flash chips
+- Support for GigaDevice GD25LQ32
+- Board enable for MSI K8N Neo Platinum
+
* Sat Sep 08 2012 Peter Lemenkov <lemenkov at gmail.com> - 0.9.6.1-1.svn1596
- Updated to the latest svn ver. 1596 (post-release snapshot for 0.9.6.1)
- (Untested) board enable for ASUS P5LD2-VM m/b
diff --git a/sources b/sources
index fa2c0ea..0e480d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed96b618efc128041e55cb6133b35b76 flashrom-0.9.6.1.tar.bz2
+5d64125df71265ed867ee4fd1e1d7e14 flashrom-0.9.6.1.tar.bz2
More information about the scm-commits
mailing list