rpms/flashrom
6
0
Fork 0
Code Issues Pull Requests Releases Activity

svn ver. 1368

Browse Source 
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
This commit is contained in:
Peter Lemenkov 2011-07-12 22:56:25 +04:00
parent 4a6317de51
commit d5ca5b9a9e
12 changed files with 72 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
flashrom-0001-Initial-commit-of-autotools-related-files.patch
View File

@ -1,22 +1,22 @@
From 88ddc65b5e195862c7383cf8b604ea3bc4912251 Mon Sep 17 00:00:00 2001
From f55bd3a36f62ec722db60c9c123f5e8c8e3d3d8a Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Fri, 17 Sep 2010 18:58:28 +0400
Subject: [PATCH 01/10] Initial commit of autotools-related files
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
Makefile.am | 186 ++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 188 +++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 241 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 427 insertions(+), 0 deletions(-)
2 files changed, 429 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..2bf9554
index 0000000..60e3b43
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,186 @@
@@ -0,0 +1,188 @@
+sbin_PROGRAMS = flashrom
+
+man_MANS = flashrom.8
@ -149,6 +149,8 @@ index 0000000..2bf9554
+endif
+
+chip_SOURCES = 82802ab.c \
+ a25.c \
+ at25.c \
+ flashchips.c \
+ jedec.c \
+ m29f400bt.c \
@ -205,11 +207,11 @@ index 0000000..2bf9554
+ $(lib_SOURCES)
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..df58991
index 0000000..767966b
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,241 @@
+AC_INIT([flashrom], [0.9.3-r1299], [flashrom@flashrom.org], [flashrom], [http://www.flashrom.org/])
+AC_INIT([flashrom], [0.9.3-r1368], [flashrom@flashrom.org], [flashrom], [http://www.flashrom.org/])
+
+AC_PREREQ(2.59)
+
@ -221,7 +223,7 @@ index 0000000..df58991
+
+# Internal (mainboard) flashing
+AC_ARG_WITH([internal],
+ AC_HELP_STRING([--with-internal],[mainboard's internal flashing support.]),
+ AC_HELP_STRING([--with-internal],[mainboard internal flashing support.]),
+ [internal="$withval"],[internal="yes"])
+
+# Needs to be disabled on Windows.
@ -451,5 +453,5 @@ index 0000000..df58991
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
--
1.7.5.1
1.7.6

6
flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch
View File

@ -1,4 +1,4 @@
From b8df6bbfe6e67160def94b1aafeee84a08df3a85 Mon Sep 17 00:00:00 2001
From 1c6ebd7aedccf6929c3b176ebde2748d324b1a00 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 12 Jun 2010 22:13:53 +0400
Subject: [PATCH 02/10] Use dmidecode path defined at configure stage
@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dmi.c b/dmi.c
index cda6656..2853c93 100644
index 836b38b..8a1e987 100644
--- a/dmi.c
+++ b/dmi.c
@@ -75,7 +75,7 @@ static const struct {
@ -22,5 +22,5 @@ index cda6656..2853c93 100644
static char *dmistrings[ARRAY_SIZE(dmidecode_names)];
--
1.7.5.1
1.7.6

16
flashrom-0003-Use-flashrom-s-version-from-config.h.patch
View File

@ -1,4 +1,4 @@
From 3e0ab52dd13a71f01ac4484ea3e1ab6473679a1e Mon Sep 17 00:00:00 2001
From 84bff76a4d40d33bbb43bbc6002a9dc3327caefb Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Fri, 17 Sep 2010 22:32:07 +0400
Subject: [PATCH 03/10] Use flashrom's version from config.h
@ -11,10 +11,10 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/flash.h b/flash.h
index f75d8bb..0aafec2 100644
index 9c6d535..c6cf750 100644
--- a/flash.h
+++ b/flash.h
@@ -188,7 +188,6 @@ enum write_granularity {
@@ -199,7 +199,6 @@ enum write_granularity {
};
extern enum chipbustype buses_supported;
extern int verbose;
@ -23,7 +23,7 @@ index f75d8bb..0aafec2 100644
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 0e9433b..410c3a4 100644
index d5892ca..dce2216 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -31,6 +31,9 @@
@ -44,7 +44,7 @@ index 0e9433b..410c3a4 100644
char *chip_to_probe = NULL;
int verbose = 0;
@@ -1686,7 +1688,7 @@ void print_sysinfo(void)
@@ -1681,7 +1683,7 @@ void print_sysinfo(void)
void print_version(void)
{
@ -54,7 +54,7 @@ index 0e9433b..410c3a4 100644
}
diff --git a/print_wiki.c b/print_wiki.c
index a3fb544..cbfbbef 100644
index 6280aff..d70a717 100644
--- a/print_wiki.c
+++ b/print_wiki.c
@@ -26,6 +26,7 @@
@ -65,7 +65,7 @@ index a3fb544..cbfbbef 100644
static const char wiki_header[] = "= Supported devices =\n\n\
<div style=\"margin-top:0.5em; padding:0.5em 0.5em 0.5em 0.5em; \
@@ -270,7 +271,7 @@ void print_supported_wiki(void)
@@ -273,7 +274,7 @@ void print_supported_wiki(void)
{
time_t t = time(NULL);
@ -75,5 +75,5 @@ index a3fb544..cbfbbef 100644
#if CONFIG_INTERNAL == 1
print_supported_chipsets_wiki(3);
--
1.7.5.1
1.7.6

28
flashrom-0004-Use-HAVE_LIBPCI-from-config.h-instead-of-NEED_PCI.patch
View File

@ -1,4 +1,4 @@
From ca011a164b5f170ff50a0ce1728077c70e031760 Mon Sep 17 00:00:00 2001
From b8d1525b095cb56394d664d120cdd8a4da91977c Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Fri, 17 Sep 2010 22:33:12 +0400
Subject: [PATCH 04/10] Use HAVE_LIBPCI from config.h instead of NEED_PCI
@ -12,10 +12,10 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/flashrom.c b/flashrom.c
index 410c3a4..fac9cf4 100644
index dce2216..df755c8 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -1654,7 +1654,7 @@ void print_sysinfo(void)
@@ -1649,7 +1649,7 @@ void print_sysinfo(void)
msg_ginfo(" on unknown machine");
#endif
msg_ginfo(", built with");
@ -55,7 +55,7 @@ index a58194f..d4dd155 100644
#define __FLASHROM_HAVE_OUTB__ 1
diff --git a/internal.c b/internal.c
index c9f62c1..cbdb326 100644
index 32bfb3a..32f734c 100644
--- a/internal.c
+++ b/internal.c
@@ -22,8 +22,9 @@
@ -70,7 +70,7 @@ index c9f62c1..cbdb326 100644
{
struct pci_dev *temp;
diff --git a/programmer.h b/programmer.h
index b68aa88..2948e4c 100644
index cd82dcb..af9790d 100644
--- a/programmer.h
+++ b/programmer.h
@@ -24,6 +24,8 @@
@ -82,7 +82,7 @@ index b68aa88..2948e4c 100644
enum programmer {
#if CONFIG_INTERNAL == 1
PROGRAMMER_INTERNAL,
@@ -212,7 +214,7 @@ void myusec_delay(int usecs);
@@ -211,7 +213,7 @@ void myusec_delay(int usecs);
void myusec_calibrate_delay(void);
void internal_delay(int usecs);
@ -91,15 +91,15 @@ index b68aa88..2948e4c 100644
/* pcidev.c */
extern uint32_t io_base_addr;
extern struct pci_access *pacc;
@@ -277,7 +279,7 @@ void dmi_init(void);
int dmi_match(const char *pattern);
/* internal.c */
@@ -287,7 +289,7 @@ extern int superio_count;
#define SUPERIO_VENDOR_NONE 0x0
#define SUPERIO_VENDOR_ITE 0x1
#endif
-#if NEED_PCI == 1
+#if HAVE_LIBPCI == 1
struct superio {
uint16_t vendor;
uint16_t port;
struct pci_dev *pci_dev_find_filter(struct pci_filter filter);
struct pci_dev *pci_dev_find_vendorclass(uint16_t vendor, uint16_t class);
struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device);
--
1.7.5.1
1.7.6

8
flashrom-0005-Use-macros-from-config.h-instead-of-HAVE_UTSNAME.patch
View File

@ -1,4 +1,4 @@
From b13ca02040a9282c7018d5f40a1d25ac99e77baf Mon Sep 17 00:00:00 2001
From 9df1b7fb4cff1734bff49863d5d5e8df80ed9b44 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 18 Sep 2010 09:05:43 +0400
Subject: [PATCH 05/10] Use macros from config.h instead of HAVE_UTSNAME
@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/flashrom.c b/flashrom.c
index fac9cf4..341bb47 100644
index df755c8..c4cc406 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -34,7 +34,7 @@
@ -21,7 +21,7 @@ index fac9cf4..341bb47 100644
#include <sys/utsname.h>
#endif
#include "flash.h"
@@ -1644,7 +1644,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren)
@@ -1639,7 +1639,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren)
void print_sysinfo(void)
{
@ -31,5 +31,5 @@ index fac9cf4..341bb47 100644
uname(&osinfo);
--
1.7.5.1
1.7.6

26
flashrom-0006-Kill-some-x86-related-ifdefs-in-code-this-is-now-con.patch
View File

@ -1,4 +1,4 @@
From 2028cef04a1eafc0ca4a5b4e1ad8f38905ad7b31 Mon Sep 17 00:00:00 2001
From a3b5e3fe0e99dca11e1d88f5debb1159583d9eb3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 18 Sep 2010 09:40:01 +0400
Subject: [PATCH 06/10] Kill some x86-related ifdefs in code - this is now
@ -19,7 +19,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
10 files changed, 0 insertions(+), 47 deletions(-)
diff --git a/ichspi.c b/ichspi.c
index ddd14d3..61e8734 100644
index 99c4613..8942b68 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -34,8 +34,6 @@
@ -31,14 +31,14 @@ index ddd14d3..61e8734 100644
#include <string.h>
#include "flash.h"
#include "chipdrivers.h"
@@ -1287,5 +1285,3 @@ int via_init_spi(struct pci_dev *dev)
@@ -1418,5 +1416,3 @@ int via_init_spi(struct pci_dev *dev)
return 0;
}
-
-#endif
diff --git a/it85spi.c b/it85spi.c
index c6c945b..24af0a3 100644
index d4ca13b..9d29e46 100644
--- a/it85spi.c
+++ b/it85spi.c
@@ -24,8 +24,6 @@
@ -50,7 +50,7 @@ index c6c945b..24af0a3 100644
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
@@ -357,5 +355,3 @@ static int it85xx_spi_send_command(unsigned int writecnt, unsigned int readcnt,
@@ -361,5 +359,3 @@ static int it85xx_spi_send_command(unsigned int writecnt, unsigned int readcnt,
return 0;
}
@ -95,7 +95,7 @@ index d2c31be..19509be 100644
-
-#endif
diff --git a/nic3com.c b/nic3com.c
index d39ee71..8c9b2e3 100644
index bcc63e0..72c1029 100644
--- a/nic3com.c
+++ b/nic3com.c
@@ -18,8 +18,6 @@
@ -107,7 +107,7 @@ index d39ee71..8c9b2e3 100644
#include <stdlib.h>
#include "flash.h"
#include "programmer.h"
@@ -113,7 +111,3 @@ uint8_t nic3com_chip_readb(const chipaddr addr)
@@ -115,7 +113,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);
}
@ -116,7 +116,7 @@ index d39ee71..8c9b2e3 100644
-#error PCI port I/O access is not supported on this architecture yet.
-#endif
diff --git a/nicnatsemi.c b/nicnatsemi.c
index 3cae253..58f4471 100644
index ac37cf0..b2a2f66 100644
--- a/nicnatsemi.c
+++ b/nicnatsemi.c
@@ -18,8 +18,6 @@
@ -128,7 +128,7 @@ index 3cae253..58f4471 100644
#include <stdlib.h>
#include "flash.h"
#include "programmer.h"
@@ -88,7 +86,3 @@ uint8_t nicnatsemi_chip_readb(const chipaddr addr)
@@ -90,7 +88,3 @@ uint8_t nicnatsemi_chip_readb(const chipaddr addr)
*/
return INB(io_base_addr + BOOT_ROM_DATA);
}
@ -137,7 +137,7 @@ index 3cae253..58f4471 100644
-#error PCI port I/O access is not supported on this architecture yet.
-#endif
diff --git a/nicrealtek.c b/nicrealtek.c
index d97deb1..2951d0f 100644
index 4566e50..b57f5bf 100644
--- a/nicrealtek.c
+++ b/nicrealtek.c
@@ -18,8 +18,6 @@
@ -149,7 +149,7 @@ index d97deb1..2951d0f 100644
#include <stdlib.h>
#include "flash.h"
#include "programmer.h"
@@ -92,7 +90,3 @@ uint8_t nicrealtek_chip_readb(const chipaddr addr)
@@ -94,7 +92,3 @@ uint8_t nicrealtek_chip_readb(const chipaddr addr)
return val;
}
@ -197,7 +197,7 @@ index 37aac3b..e176f00 100644
-
-#endif
diff --git a/wbsio_spi.c b/wbsio_spi.c
index 7889f91..ec40d10 100644
index 851c87f..e166d8e 100644
--- a/wbsio_spi.c
+++ b/wbsio_spi.c
@@ -18,8 +18,6 @@
@ -216,5 +216,5 @@ index 7889f91..ec40d10 100644
-
-#endif
--
1.7.5.1
1.7.6

6
flashrom-0007-Simplify-hwaccess.c.patch
View File

@ -1,4 +1,4 @@
From 735f97aae8d37ae269db3ec4ae04ced4a5e3f572 Mon Sep 17 00:00:00 2001
From 7413473c97fcd9b3d9d2b27765a35641cd2fb985 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 21 Sep 2010 17:51:08 +0400
Subject: [PATCH 07/10] Simplify hwaccess.c
@ -16,7 +16,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
1 files changed, 30 insertions(+), 55 deletions(-)
diff --git a/hwaccess.c b/hwaccess.c
index 3c4f07a..9ef0b7d 100644
index efe8bb0..50ef404 100644
--- a/hwaccess.c
+++ b/hwaccess.c
@@ -31,30 +31,47 @@
@ -142,5 +142,5 @@ index 3c4f07a..9ef0b7d 100644
void mmio_writeb(uint8_t val, void *addr)
{
--
1.7.5.1
1.7.6

4
flashrom-0008-Use-endiannes-determined-at-the-configure-stage.patch
View File

@ -1,4 +1,4 @@
From 2c8cd151f465f114865555c8960746d19eaedace Mon Sep 17 00:00:00 2001
From 96273a02b83f8ebd42c86b42a25f1e6fcb004a74 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sun, 26 Sep 2010 18:25:31 +0400
Subject: [PATCH 08/10] Use endiannes determined at the configure stage
@ -87,5 +87,5 @@ index d4dd155..27ecead 100644
#define be_to_cpu8 cpu_to_be8
#define be_to_cpu16 cpu_to_be16
--
1.7.5.1
1.7.6

4
flashrom-0009-Use-HAVE_-_H-macro-for-detecting-includes.patch
View File

@ -1,4 +1,4 @@
From 8f0d4c09648d481ccad375dda3b260bffbb19cd0 Mon Sep 17 00:00:00 2001
From 1bcb40559465c50ae7499196e4c4864136ecabb4 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sun, 26 Sep 2010 21:05:50 +0400
Subject: [PATCH 09/10] Use HAVE_*_H macro for detecting includes
@ -147,5 +147,5 @@ index 27ecead..b73513b 100644
#include <arch/io.h>
#include <arch/msr.h>
--
1.7.5.1
1.7.6

6
flashrom-0010-Move-arch-checking-ifdef-block-into-header.patch
View File

@ -1,4 +1,4 @@
From 67b1241475fa89270bede67d6f67fcb9cae972c2 Mon Sep 17 00:00:00 2001
From e76ae6f1ac18d2b8a562ab9eff0538197a67996e Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sun, 17 Oct 2010 12:53:18 +0400
Subject: [PATCH 10/10] Move arch-checking #ifdef block into header
@ -10,7 +10,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/hwaccess.c b/hwaccess.c
index 9ef0b7d..c3335d8 100644
index 50ef404..b23cee6 100644
--- a/hwaccess.c
+++ b/hwaccess.c
@@ -31,13 +31,6 @@
@ -74,5 +74,5 @@ index b73513b..807bb8f 100644
#endif
--
1.7.5.1
1.7.6

11
flashrom.spec
View File

@ -1,13 +1,13 @@
Summary: Simple program for reading/writing BIOS chips content
Name: flashrom
Version: 0.9.3
Release: 4.svn1299%{?dist}
Release: 5.svn1368%{?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 1299 export svn://coreboot.org/flashrom/trunk flashrom-0.9.3
## svn -r 1368 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
@ -70,7 +70,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/%{name}.*
%changelog
* Sat May 14 2011 Peter Lemenkov <lemenkov@gmail.com> - 0.9.3-3.svn1299
* Tue Jul 12 2011 Peter Lemenkov <lemenkov@gmail.com> - 0.9.3-5.svn1368
- Updated to latest svn ver. 1368 (post-release snapshot for 0.9.3)
- Added 32 (yes, thirty-two) new boards
- Lots of other cleanups and enhancements
* Sat May 14 2011 Peter Lemenkov <lemenkov@gmail.com> - 0.9.3-4.svn1299
- Updated to latest svn ver. 1299 (post-release snapshot for 0.9.3)
- Intel NIC with parallel flash support (Intel 8255xER/82551IT Fast Ethernet
Controller and Intel 82557/8/9/0/1 Ethernet Pro 100)

2
sources
View File

@ -1 +1 @@
af80d006fcef38a11bcd452192c98245 flashrom-0.9.3.tar.bz2
7d96f91729912837369cb4e21ec64058 flashrom-0.9.3.tar.bz2