From e6679fe82436b8b92d810828a033ed45500a8bcb Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: May 06 2012 14:12:58 +0000 Subject: Updated to latest svn ver. 1530 (post-release snapshot for 0.9.5.2) Signed-off-by: Peter Lemenkov --- diff --git a/flashrom-0001-Initial-commit-of-autotools-related-files.patch b/flashrom-0001-Initial-commit-of-autotools-related-files.patch index f37f0e1..d5f697a 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 f1082ad2316f9257eaf3a6a1672593fa0cf66c79 Mon Sep 17 00:00:00 2001 +From 8c3f394bf5924ac8c916edeecdc3d8499f3fc534 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 17 Sep 2010 18:58:28 +0400 Subject: [PATCH 1/9] Initial commit of autotools-related files Signed-off-by: Peter Lemenkov --- - Makefile.am | 211 +++++++++++++++++++++++++++++++++++++ + Makefile.am | 228 +++++++++++++++++++++++++++++++++++++ bootstrap.sh | 4 + - configure.ac | 332 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 547 insertions(+) + configure.ac | 352 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 584 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..24fe251 +index 0000000..ee6780c --- /dev/null +++ b/Makefile.am -@@ -0,0 +1,211 @@ +@@ -0,0 +1,228 @@ +sbin_PROGRAMS = flashrom + +man_MANS = flashrom.8 @@ -43,6 +43,7 @@ index 0000000..24fe251 +internal_SOURCES = \ + board_enable.c \ + cbtable.c \ ++ coreboot_tables.h \ + chipset_enable.c \ + dmi.c \ + internal.c \ @@ -50,6 +51,7 @@ index 0000000..24fe251 +if HAVE_X86_ONLY_INTERNAL +internal_x86_only_SOURCES = \ + ich_descriptors.c \ ++ ich_descriptors.h \ + ichspi.c \ + it85spi.c \ + it87spi.c \ @@ -75,6 +77,11 @@ index 0000000..24fe251 +DEFS += -DCONFIG_RAYER_SPI=1 +endif + ++if HAVE_PONY_SPI ++pony_spi_SOURCES = pony_spi.c ++DEFS += -DCONFIG_PONY_SPI=1 ++endif ++ +if HAVE_BITBANG_SPI +bitbang_spi_SOURCES = bitbang_spi.c +DEFS += -DCONFIG_BITBANG_SPI=1 @@ -167,20 +174,25 @@ index 0000000..24fe251 +if HAVE_PCI +pci_SOURCES = pcidev.c \ + physmap.c \ -+ hwaccess.c ++ hwaccess.c \ ++ hwaccess.h +DEFS += -DNEED_PCI=1 +endif + +chip_SOURCES = 82802ab.c \ + a25.c \ + at25.c \ ++ chipdrivers.h \ + flashchips.c \ ++ flashchips.h \ ++ en29lv640b.c \ + jedec.c \ + m29f400bt.c \ + opaque.c \ + pm49fl00x.c \ + sfdp.c \ + spi.c \ ++ spi.h \ + spi25.c \ + sst_fwhub.c \ + sst28sf040.c \ @@ -201,13 +213,16 @@ index 0000000..24fe251 +# sharplhf00l04.c + +flashrom_SOURCES = \ ++ flash.h \ + programmer.c \ ++ programmer.h \ + udelay.c \ + $(internal_SOURCES) \ + $(internal_x86_only_SOURCES) \ + $(serprog_SOURCES) \ + $(linux_spi_SOURCES) \ + $(rayer_spi_SOURCES) \ ++ $(pony_spi_SOURCES) \ + $(bitbang_spi_SOURCES) \ + $(nic3com_SOURCES) \ + $(gfxnvidia_SOURCES) \ @@ -230,6 +245,8 @@ index 0000000..24fe251 + $(chip_SOURCES) \ + $(cli_SOURCES) \ + $(lib_SOURCES) ++ ++EXTRA_DIST = Documentation util diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100755 index 0000000..0213288 @@ -242,11 +259,11 @@ index 0000000..0213288 +automake --add-missing --copy --force-missing diff --git a/configure.ac b/configure.ac new file mode 100644 -index 0000000..5870714 +index 0000000..3c09493 --- /dev/null +++ b/configure.ac -@@ -0,0 +1,332 @@ -+AC_INIT([flashrom], [0.9.5.2-r1517], [flashrom@flashrom.org], [flashrom], [http://www.flashrom.org/]) +@@ -0,0 +1,352 @@ ++AC_INIT([flashrom], [0.9.5.2-r1530], [flashrom@flashrom.org], [flashrom], [http://www.flashrom.org/]) + +AC_PREREQ(2.59) + @@ -269,6 +286,10 @@ index 0000000..5870714 + AC_HELP_STRING([--with-rayer-spi],[RayeR SPIPGM hardware support.]), + [rayer_spi="$withval"],[rayer_spi="yes"]) + ++AC_ARG_WITH([pony_spi], ++ AC_HELP_STRING([--with-pony-spi],[PonyProg2000 SPI hardware support.]), ++ [pony_spi="$withval"],[pony_spi="yes"]) ++ +AC_ARG_WITH([nic3com], + AC_HELP_STRING([--with-nic3com],[3Com NICs support.]), + [nic3com="$withval"],[nic3com="yes"]) @@ -346,6 +367,8 @@ index 0000000..5870714 + i386|i486|i586|i686|i786|x86_64) + if test "$internal" = 'yes'; then + enable_x86_only_internal="yes" ++ else ++ enable_x86_only_internal="no" + fi + AC_CHECK_HEADERS([sys/io.h]) + ;; @@ -397,24 +420,31 @@ index 0000000..5870714 + fi + ;; + darwin*) ++ linux_spi="n/a" + AC_CHECK_HEADERS([DirectIO/darwinio.h DirectHW/DirectHW.h]) + ;; + freebsd*) ++ linux_spi="n/a" + AC_CHECK_HEADERS([machine/cpufunc.h]) + ;; + openbsd*) ++ linux_spi="n/a" + AC_CHECK_HEADERS([machine/sysarch.h sys/types.h]) + ;; + netbsd*) ++ linux_spi="n/a" + AC_CHECK_HEADERS([machine/sysarch.h sys/types.h]) + ;; + *solaris*) ++ linux_spi="n/a" + AC_CHECK_HEADERS([asm/sunddi.h strings.h sys/psw.h sys/sysi86.h]) + ;; + mingw*) ++ linux_spi="n/a" + # TODO + ;; + *djgpp*) ++ linux_spi="n/a" + AC_CHECK_HEADERS([pc.h]) + ;; + *) @@ -422,10 +452,13 @@ index 0000000..5870714 + ;; +esac + -+# Check whether we need seial support ++# Check whether we need serial support +if test "$serprog" = 'yes' -o \ -+ "$buspirate_spi" = 'yes' ; then ++ "$buspirate_spi" = 'yes' -o \ ++ "$pony_spi" = 'yes' ; then + serial="yes" ++else ++ serial="no" +fi + +# Check whether we need PCI support @@ -446,10 +479,13 @@ index 0000000..5870714 +fi + +if test "$rayer_spi" = 'yes' -o \ ++ "$pony_spi" = 'yes' -o \ + "$internal" = 'yes' -o \ + "$nicintel_spi" = 'yes' -o \ + "$gfxogp" = 'yes' ; then + bitbang_spi="yes" ++else ++ bitbang_spi="no" +fi + +# Checks for programs. @@ -515,6 +551,7 @@ index 0000000..5870714 +AM_CONDITIONAL(HAVE_SERPROG, test "$serprog" = "yes") +AM_CONDITIONAL(HAVE_LINUX_SPI, test "$linux_spi" = "yes") +AM_CONDITIONAL(HAVE_RAYER_SPI, test "$rayer_spi" = "yes") ++AM_CONDITIONAL(HAVE_PONY_SPI, test "$pony_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") @@ -579,5 +616,5 @@ index 0000000..5870714 +------------------------------------------------------------------------ +]) -- -1.7.9.3 +1.7.10.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 14e5527..57eb743 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 ff41aca7925147681ec29e9a1e5a302eef0addcc Mon Sep 17 00:00:00 2001 +From 61369dd5e2ed8d9b3897ca7f82d23a7e4294aebd Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 12 Jun 2010 22:13:53 +0400 Subject: [PATCH 2/9] Use dmidecode path defined at configure stage @@ -22,5 +22,5 @@ index 2c2551d..6f62fc0 100644 static char *dmistrings[ARRAY_SIZE(dmidecode_names)]; -- -1.7.9.3 +1.7.10.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 10d6aed..1a04bf2 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 2afeaf03a24e253c4bcfed49155bc7ef264fe1b4 Mon Sep 17 00:00:00 2001 +From 45cade613be579e425c15b524b1bd66e6571595a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 18 Sep 2010 09:05:43 +0400 Subject: [PATCH 3/9] Use macros from configure stage instead of HAVE_UTSNAME @@ -11,7 +11,7 @@ Signed-off-by: Peter Lemenkov 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 24fe251..c56efd1 100644 +index ee6780c..5bdbeab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,12 +5,6 @@ man_MANS = flashrom.8 @@ -28,10 +28,10 @@ index 24fe251..c56efd1 100644 DEFS += -DDMIDECODE_PATH=\"@DMIDECODE@\" else diff --git a/configure.ac b/configure.ac -index 5870714..e669b2c 100644 +index 3c09493..7946c99 100644 --- a/configure.ac +++ b/configure.ac -@@ -287,10 +287,6 @@ AM_CONDITIONAL(HAVE_SERIAL, test "$serial" = "yes") +@@ -307,10 +307,6 @@ AM_CONDITIONAL(HAVE_SERIAL, test "$serial" = "yes") AM_CONDITIONAL(HAVE_PCI, test "$pci" = "yes") AM_CONDITIONAL(HAVE_PRINT_WIKI, test "$print_wiki" = "yes") @@ -43,7 +43,7 @@ index 5870714..e669b2c 100644 AC_OUTPUT diff --git a/flashrom.c b/flashrom.c -index cad043b..10f43f4 100644 +index a54348d..4eeed24 100644 --- a/flashrom.c +++ b/flashrom.c @@ -31,7 +31,8 @@ @@ -56,7 +56,7 @@ index cad043b..10f43f4 100644 #include #endif #include "flash.h" -@@ -1474,7 +1475,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren) +@@ -1484,7 +1485,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren) void print_sysinfo(void) { @@ -66,5 +66,5 @@ index cad043b..10f43f4 100644 uname(&osinfo); -- -1.7.9.3 +1.7.10.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 422cbb1..d48ad36 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 c1942ed484853d4c97e6bc8e66a7e03f47180c34 Mon Sep 17 00:00:00 2001 +From 815c5d857b34cd9b2bf24ce73a967b1494b3dce0 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 18 Sep 2010 09:40:01 +0400 Subject: [PATCH 4/9] Kill some x86-related ifdefs in code - this is now @@ -44,7 +44,7 @@ index 4234f6d..27b106d 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 726f5e0..a83911f 100644 +index b55625e..79b9c20 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -19,8 +19,6 @@ @@ -296,5 +296,5 @@ index 774890e..f6076aa 100644 - -#endif -- -1.7.9.3 +1.7.10.1 diff --git a/flashrom-0005-Simplify-hwaccess.c.patch b/flashrom-0005-Simplify-hwaccess.c.patch index 6f7cdd2..e0d682b 100644 --- a/flashrom-0005-Simplify-hwaccess.c.patch +++ b/flashrom-0005-Simplify-hwaccess.c.patch @@ -1,4 +1,4 @@ -From 8530143c1daf10e4e2564be7eef680c2cd8d82ee Mon Sep 17 00:00:00 2001 +From ed994035450c5ad46cdf426f977f14ee4266c326 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 21 Sep 2010 17:51:08 +0400 Subject: [PATCH 5/9] Simplify hwaccess.c @@ -185,5 +185,5 @@ index 1e276ec..be3af34 100644 #endif -- -1.7.9.3 +1.7.10.1 diff --git a/flashrom-0006-Use-endiannes-determined-at-the-configure-stage.patch b/flashrom-0006-Use-endiannes-determined-at-the-configure-stage.patch index 83b5d64..0eabd30 100644 --- a/flashrom-0006-Use-endiannes-determined-at-the-configure-stage.patch +++ b/flashrom-0006-Use-endiannes-determined-at-the-configure-stage.patch @@ -1,4 +1,4 @@ -From 29e2b7378e475195c59b400a04ca28036bf97d10 Mon Sep 17 00:00:00 2001 +From 4be5f3a7a245506af5e82fa47911c96c24c34f60 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 26 Sep 2010 18:25:31 +0400 Subject: [PATCH 6/9] Use endiannes determined at the configure stage @@ -94,5 +94,5 @@ index be3af34..7d9b108 100644 #define be_to_cpu8 cpu_to_be8 #define be_to_cpu16 cpu_to_be16 -- -1.7.9.3 +1.7.10.1 diff --git a/flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch b/flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch index c2bf253..f5d3d7b 100644 --- a/flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch +++ b/flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch @@ -1,4 +1,4 @@ -From 570a0f7e8ec62b5cf4fc65f2d8c30be1167db5e3 Mon Sep 17 00:00:00 2001 +From f1ac24b82ddb8f24bc12cdeb6b2b78047e2dfb36 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 26 Sep 2010 21:05:50 +0400 Subject: [PATCH 7/9] Use HAVE_*_H macro for detecting includes @@ -152,5 +152,5 @@ index 7d9b108..96eee0e 100644 #include #include -- -1.7.9.3 +1.7.10.1 diff --git a/flashrom-0008-ppc-hack.patch b/flashrom-0008-ppc-hack.patch index bd44014..ba40f07 100644 --- a/flashrom-0008-ppc-hack.patch +++ b/flashrom-0008-ppc-hack.patch @@ -1,4 +1,4 @@ -From f5b9fc324c31c765e3fa7fb5a0f3d61130c65ef3 Mon Sep 17 00:00:00 2001 +From 0b80eacf6058d7d459068b92d2df2b615e24c366 Mon Sep 17 00:00:00 2001 From: Mattias Mattsson Date: Wed, 27 Jul 2011 21:02:50 +0400 Subject: [PATCH 8/9] ppc hack @@ -35,5 +35,5 @@ index d680f97..014e019 100644 int processor_flash_enable(void) { -- -1.7.9.3 +1.7.10.1 diff --git a/flashrom-0009-Simplify-processor.h.patch b/flashrom-0009-Simplify-processor.h.patch index 110ff4d..1c65480 100644 --- a/flashrom-0009-Simplify-processor.h.patch +++ b/flashrom-0009-Simplify-processor.h.patch @@ -1,4 +1,4 @@ -From 489274cbff3c17b88a7de990425a0c365609d2ff Mon Sep 17 00:00:00 2001 +From 8191d4bc8725efd6430eb5a5d942232de2a25496 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 28 Jul 2011 12:56:17 +0400 Subject: [PATCH 9/9] Simplify processor.h @@ -58,5 +58,5 @@ index 014e019..bf69330 100644 - -#endif -- -1.7.9.3 +1.7.10.1 diff --git a/flashrom.spec b/flashrom.spec index 6883b60..d827e76 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.5.2 -Release: 1.svn1517%{?dist} +Release: 2.svn1530%{?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 1517 export svn://coreboot.org/flashrom/trunk flashrom-0.9.5.2 +## svn -r 1530 export svn://coreboot.org/flashrom/trunk flashrom-0.9.5.2 ## tar -cjvf flashrom-0.9.5.2.tar.bz2 flashrom-0.9.5.2 Source0: %{name}-%{version}.tar.bz2 Patch1: flashrom-0001-Initial-commit-of-autotools-related-files.patch @@ -51,7 +51,11 @@ and write new contents on the chips ("flash the chip"). %build autoreconf -ivf +%if 0%{?el5} +%configure --with-linux-spi=no +%else %configure +%endif make %{?_smp_mflags} @@ -69,6 +73,18 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/%{name}.* %changelog +* Sun May 06 2012 Peter Lemenkov - 0.9.5.2-2.svn1530 +- Updated to latest svn ver. 1530 (post-release snapshot for 0.9.5.2) +- Support for w83697 family SuperIO chips +- Add board enable for ASUS P5BV-R +- PonyProg2000 SPI hardware support +- Add UNTESTED support for future Intel chipsets (DH89xxCC and Lynx Point) +- Add support for for the Atmel AT49F040 chip +- Add support for the Eon EN29LV640B chip +- Add GigaDevice GD25QXX series support +- Add support for the Numonyx N25Q064 chip +- Disable Linux SPI on EPEL 5 (see rhbz #808775) + * Sat Mar 31 2012 Peter Lemenkov - 0.9.5.2-1.svn1517 - Updated to latest svn ver. 1517 (post-release snapshot for 0.9.5.2) - Add (untested) board enable for ASUS TUSL2-C diff --git a/sources b/sources index 39b1de0..c842aa9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -543860dfd4f17c211a304ed4026b1591 flashrom-0.9.5.2.tar.bz2 +fe2551921e220871c217565a48f80dab flashrom-0.9.5.2.tar.bz2