diff --git a/flashrom-0001-Initial-commit-of-autotools-related-files.patch b/flashrom-0001-Initial-commit-of-autotools-related-files.patch index b7836e5..b2f6122 100644 --- a/flashrom-0001-Initial-commit-of-autotools-related-files.patch +++ b/flashrom-0001-Initial-commit-of-autotools-related-files.patch @@ -1,4 +1,4 @@ -From 660b803c1f6ba64ffe4e09fd5244d5c1fc3bdde6 Mon Sep 17 00:00:00 2001 +From 0b786729ee0094d33ea88beac62b89ba8b66aa54 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 17 Sep 2010 18:58:28 +0400 Subject: [PATCH 01/10] Initial commit of autotools-related files @@ -7,15 +7,15 @@ Signed-off-by: Peter Lemenkov --- Makefile.am | 210 +++++++++++++++++++++++++++++++++++++++++++++++ bootstrap.sh | 5 + - configure.ac | 258 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 473 insertions(+), 0 deletions(-) + configure.ac | 257 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 472 insertions(+), 0 deletions(-) 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..06e76da +index 0000000..cd203b8 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,210 @@ @@ -177,8 +177,8 @@ index 0000000..06e76da + flashchips.c \ + jedec.c \ + m29f400bt.c \ ++ opaque.c \ + pm49fl00x.c \ -+ sharplhf00l04.c \ + spi.c \ + spi25.c \ + sst_fwhub.c \ @@ -242,18 +242,17 @@ index 0000000..050fe4f +automake --add-missing --copy --force-missing diff --git a/configure.ac b/configure.ac new file mode 100644 -index 0000000..c5e89fe +index 0000000..c795ce8 --- /dev/null +++ b/configure.ac -@@ -0,0 +1,258 @@ -+AC_INIT([flashrom], [0.9.4-r1455], [flashrom@flashrom.org], [flashrom], [http://www.flashrom.org/]) +@@ -0,0 +1,257 @@ ++AC_INIT([flashrom], [0.9.4-r1487], [flashrom@flashrom.org], [flashrom], [http://www.flashrom.org/]) + +AC_PREREQ(2.59) + +AC_CANONICAL_TARGET + +AC_CONFIG_SRCDIR([flashrom.c]) -+AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE([foreign]) + +# Internal (mainboard) flashing @@ -505,5 +504,5 @@ index 0000000..c5e89fe +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT -- -1.7.6.4 +1.7.7.5 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 c8334ac..bf0cfb1 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 d2e30fbae81b893a011d930bda82dbb08b1a369f Mon Sep 17 00:00:00 2001 +From 9f98c4a7ab4712091d963fbb8eda53f6ca2c442f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 12 Jun 2010 22:13:53 +0400 Subject: [PATCH 02/10] Use dmidecode path defined at configure stage @@ -22,5 +22,5 @@ index 5f64b94..537c2d5 100644 static char *dmistrings[ARRAY_SIZE(dmidecode_names)]; -- -1.7.6.4 +1.7.7.5 diff --git a/flashrom-0003-Use-macros-from-config.h-instead-of-HAVE_UTSNAME.patch b/flashrom-0003-Use-macros-from-config.h-instead-of-HAVE_UTSNAME.patch deleted file mode 100644 index 7ef31a5..0000000 --- a/flashrom-0003-Use-macros-from-config.h-instead-of-HAVE_UTSNAME.patch +++ /dev/null @@ -1,70 +0,0 @@ -From b3f7e7254eefb073dd61119c513cb028291a122a Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Sat, 18 Sep 2010 09:05:43 +0400 -Subject: [PATCH 03/10] Use macros from config.h instead of HAVE_UTSNAME - -Signed-off-by: Peter Lemenkov ---- - Makefile.am | 6 ------ - configure.ac | 4 ---- - flashrom.c | 6 ++++-- - 3 files changed, 4 insertions(+), 12 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 06e76da..9eb6522 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -5,12 +5,6 @@ man_MANS = flashrom.8 - # FIXME use "config.h" in the future - DEFS += -DFLASHROM_VERSION=\"@VERSION@\" - --if HAVE_SYS_UTSNAME --if HAVE_UNAME --DEFS += -DHAVE_UTSNAME=1 --endif --endif -- - if HAVE_DMIDECODE - DEFS += -DDMIDECODE_PATH=\"@DMIDECODE@\" - else -diff --git a/configure.ac b/configure.ac -index c5e89fe..c73e276 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -250,9 +250,5 @@ AM_CONDITIONAL(HAVE_SERIAL, test "$serial" = "yes") - AM_CONDITIONAL(HAVE_PCI, test "$pci" = "yes") - AM_CONDITIONAL(HAVE_PRINT_WIKI, test "$print_wiki" = "yes") - --# FIXME remove in the future --AM_CONDITIONAL(HAVE_SYS_UTSNAME, test "$ac_cv_header_sys_utsname_h" = "yes") --AM_CONDITIONAL(HAVE_UNAME, test "$ac_cv_func_uname" = "yes") -- - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT -diff --git a/flashrom.c b/flashrom.c -index c565a43..6360d97 100644 ---- a/flashrom.c -+++ b/flashrom.c -@@ -31,7 +31,9 @@ - #include - #include - #include --#if HAVE_UTSNAME == 1 -+#include "config.h" -+ -+#if HAVE_SYS_UTSNAME_H == 1 - #include - #endif - #include "flash.h" -@@ -1607,7 +1609,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren) - - void print_sysinfo(void) - { --#if HAVE_UTSNAME == 1 -+#if HAVE_UNAME == 1 - struct utsname osinfo; - uname(&osinfo); - --- -1.7.6.4 - 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 new file mode 100644 index 0000000..c98256f --- /dev/null +++ b/flashrom-0003-Use-macros-from-configure-stage-instead-of-HAVE_UTSN.patch @@ -0,0 +1,70 @@ +From 519e44ea557387ec0eb1ca77ea3f42de8a89b267 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Sat, 18 Sep 2010 09:05:43 +0400 +Subject: [PATCH 03/10] Use macros from configure stage instead of + HAVE_UTSNAME + +Signed-off-by: Peter Lemenkov +--- + Makefile.am | 6 ------ + configure.ac | 4 ---- + flashrom.c | 5 +++-- + 3 files changed, 3 insertions(+), 12 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index cd203b8..27c6b36 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -5,12 +5,6 @@ man_MANS = flashrom.8 + # FIXME use "config.h" in the future + DEFS += -DFLASHROM_VERSION=\"@VERSION@\" + +-if HAVE_SYS_UTSNAME +-if HAVE_UNAME +-DEFS += -DHAVE_UTSNAME=1 +-endif +-endif +- + if HAVE_DMIDECODE + DEFS += -DDMIDECODE_PATH=\"@DMIDECODE@\" + else +diff --git a/configure.ac b/configure.ac +index c795ce8..194838f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -249,9 +249,5 @@ AM_CONDITIONAL(HAVE_SERIAL, test "$serial" = "yes") + AM_CONDITIONAL(HAVE_PCI, test "$pci" = "yes") + AM_CONDITIONAL(HAVE_PRINT_WIKI, test "$print_wiki" = "yes") + +-# FIXME remove in the future +-AM_CONDITIONAL(HAVE_SYS_UTSNAME, test "$ac_cv_header_sys_utsname_h" = "yes") +-AM_CONDITIONAL(HAVE_UNAME, test "$ac_cv_func_uname" = "yes") +- + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT +diff --git a/flashrom.c b/flashrom.c +index ee68344..5208f28 100644 +--- a/flashrom.c ++++ b/flashrom.c +@@ -31,7 +31,8 @@ + #include + #include + #include +-#if HAVE_UTSNAME == 1 ++ ++#if HAVE_SYS_UTSNAME_H == 1 + #include + #endif + #include "flash.h" +@@ -1449,7 +1450,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren) + + void print_sysinfo(void) + { +-#if HAVE_UTSNAME == 1 ++#if HAVE_UNAME == 1 + struct utsname osinfo; + uname(&osinfo); + +-- +1.7.7.5 + 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 a2d1544..fb9127c 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 abec9376de399fd6e41d1b26343fc2b4eec85c05 Mon Sep 17 00:00:00 2001 +From 5381ae7e3423475d5ade49bd11b5844e68f4fdc7 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 18 Sep 2010 09:40:01 +0400 Subject: [PATCH 04/10] Kill some x86-related ifdefs in code - this is now @@ -23,7 +23,7 @@ Signed-off-by: Peter Lemenkov 14 files changed, 0 insertions(+), 63 deletions(-) diff --git a/atahpt.c b/atahpt.c -index 3451342..eadb158 100644 +index 4234f6d..27b106d 100644 --- a/atahpt.c +++ b/atahpt.c @@ -18,8 +18,6 @@ @@ -35,7 +35,7 @@ index 3451342..eadb158 100644 #include #include #include "flash.h" -@@ -79,7 +77,3 @@ uint8_t atahpt_chip_readb(const chipaddr addr) +@@ -97,7 +95,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 3451342..eadb158 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 125077c..8ca643d 100644 +index 726f5e0..a83911f 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -19,8 +19,6 @@ @@ -54,15 +54,15 @@ index 125077c..8ca643d 100644 -#if defined(__i386__) || defined(__x86_64__) - #include "ich_descriptors.h" - #include "flash.h" /* for msg_* */ - #include "programmer.h" -@@ -313,4 +311,3 @@ int read_ich_descriptors_via_fdo(void *spibar, struct ich_descriptors *desc) - msg_pdbg2(" done.\n"); + + #ifdef ICH_DESCRIPTORS_FROM_DUMP +@@ -840,4 +838,3 @@ int read_ich_descriptors_via_fdo(void *spibar, struct ich_descriptors *desc) return ICH_RET_OK; } + #endif /* ICH_DESCRIPTORS_FROM_DUMP */ -#endif /* defined(__i386__) || defined(__x86_64__) */ diff --git a/ich_descriptors.h b/ich_descriptors.h -index 4e2ad0a..a3cfea8 100644 +index 34bcc6a..690ba6a 100644 --- a/ich_descriptors.h +++ b/ich_descriptors.h @@ -19,7 +19,6 @@ @@ -73,13 +73,13 @@ index 4e2ad0a..a3cfea8 100644 #ifndef __ICH_DESCRIPTORS_H__ #define __ICH_DESCRIPTORS_H__ 1 -@@ -258,4 +257,3 @@ int read_ich_descriptors_via_fdo(void *spibar, struct ich_descriptors *desc); - int getFCBA_component_density(const struct ich_descriptors *desc, uint8_t idx); +@@ -572,4 +571,3 @@ int getFCBA_component_density(const struct ich_descriptors *desc, uint8_t idx); + #endif /* ICH_DESCRIPTORS_FROM_DUMP */ #endif /* __ICH_DESCRIPTORS_H__ */ -#endif /* defined(__i386__) || defined(__x86_64__) */ diff --git a/ichspi.c b/ichspi.c -index afa420b..cc4ce0d 100644 +index 163ecf1..f81d88c 100644 --- a/ichspi.c +++ b/ichspi.c @@ -23,8 +23,6 @@ @@ -91,14 +91,14 @@ index afa420b..cc4ce0d 100644 #include #include #include "flash.h" -@@ -1561,5 +1559,3 @@ int via_init_spi(struct pci_dev *dev) +@@ -1839,5 +1837,3 @@ int via_init_spi(struct pci_dev *dev) return 0; } - -#endif diff --git a/it85spi.c b/it85spi.c -index 75a565c..f9815b2 100644 +index 01cb086..e911ddf 100644 --- a/it85spi.c +++ b/it85spi.c @@ -24,8 +24,6 @@ @@ -110,14 +110,14 @@ index 75a565c..f9815b2 100644 #include #include #include -@@ -354,5 +352,3 @@ static int it85xx_spi_send_command(unsigned int writecnt, unsigned int readcnt, +@@ -368,5 +366,3 @@ static int it85xx_spi_send_command(struct flashctx *flash, return 0; } - -#endif diff --git a/it87spi.c b/it87spi.c -index 5fe74ce..fcd881e 100644 +index f089d78..fbd8db2 100644 --- a/it87spi.c +++ b/it87spi.c @@ -23,8 +23,6 @@ @@ -129,14 +129,14 @@ index 5fe74ce..fcd881e 100644 #include #include #include "flash.h" -@@ -399,5 +397,3 @@ static int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf, +@@ -404,5 +402,3 @@ static int it8716f_spi_chip_write_256(struct flashctx *flash, uint8_t *buf, return 0; } - -#endif diff --git a/mcp6x_spi.c b/mcp6x_spi.c -index d2c31be..19509be 100644 +index 23f39a5..34be29e 100644 --- a/mcp6x_spi.c +++ b/mcp6x_spi.c @@ -23,8 +23,6 @@ @@ -155,7 +155,7 @@ index d2c31be..19509be 100644 - -#endif diff --git a/nic3com.c b/nic3com.c -index d8a11d0..9f0bd16 100644 +index 473c7b1..338da53 100644 --- a/nic3com.c +++ b/nic3com.c @@ -18,8 +18,6 @@ @@ -167,7 +167,7 @@ index d8a11d0..9f0bd16 100644 #include #include "flash.h" #include "programmer.h" -@@ -115,7 +113,3 @@ uint8_t nic3com_chip_readb(const chipaddr addr) +@@ -133,7 +131,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 d8a11d0..9f0bd16 100644 -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/nicnatsemi.c b/nicnatsemi.c -index b89b5c5..cccc484 100644 +index eb2a7f8..1bf412c 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -18,8 +18,6 @@ @@ -188,7 +188,7 @@ index b89b5c5..cccc484 100644 #include #include "flash.h" #include "programmer.h" -@@ -90,7 +88,3 @@ uint8_t nicnatsemi_chip_readb(const chipaddr addr) +@@ -107,7 +105,3 @@ static uint8_t nicnatsemi_chip_readb(const struct flashctx *flash, */ return INB(io_base_addr + BOOT_ROM_DATA); } @@ -197,7 +197,7 @@ index b89b5c5..cccc484 100644 -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/nicrealtek.c b/nicrealtek.c -index bed0710..39bbc8a 100644 +index 32aa434..4a50ec5 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -18,8 +18,6 @@ @@ -209,7 +209,7 @@ index bed0710..39bbc8a 100644 #include #include "flash.h" #include "programmer.h" -@@ -94,7 +92,3 @@ uint8_t nicrealtek_chip_readb(const chipaddr addr) +@@ -112,7 +110,3 @@ static uint8_t nicrealtek_chip_readb(const struct flashctx *flash, return val; } @@ -218,7 +218,7 @@ index bed0710..39bbc8a 100644 -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/rayer_spi.c b/rayer_spi.c -index 417fde9..46babb4 100644 +index 0011bc0..c88360d 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -28,7 +28,6 @@ @@ -238,7 +238,7 @@ index 417fde9..46babb4 100644 -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/satamv.c b/satamv.c -index 5c15fc8..618f946 100644 +index e39385b..45a62f7 100644 --- a/satamv.c +++ b/satamv.c @@ -19,7 +19,6 @@ @@ -249,7 +249,7 @@ index 5c15fc8..618f946 100644 #include #include "flash.h" -@@ -183,7 +182,3 @@ uint8_t satamv_chip_readb(const chipaddr addr) +@@ -199,7 +198,3 @@ static uint8_t satamv_chip_readb(const struct flashctx *flash, { return satamv_indirect_chip_readb(addr); } @@ -258,7 +258,7 @@ index 5c15fc8..618f946 100644 -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/sb600spi.c b/sb600spi.c -index 9d82b47..4a5e954 100644 +index c3d7710..458206a 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -21,8 +21,6 @@ @@ -270,14 +270,14 @@ index 9d82b47..4a5e954 100644 #include "flash.h" #include "programmer.h" #include "spi.h" -@@ -319,5 +317,3 @@ int sb600_probe_spi(struct pci_dev *dev) +@@ -321,5 +319,3 @@ int sb600_probe_spi(struct pci_dev *dev) register_spi_programmer(&spi_programmer_sb600); return 0; } - -#endif diff --git a/wbsio_spi.c b/wbsio_spi.c -index 851c87f..e166d8e 100644 +index 740a48c..7c4ff57 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -18,8 +18,6 @@ @@ -289,12 +289,12 @@ index 851c87f..e166d8e 100644 #include "flash.h" #include "chipdrivers.h" #include "programmer.h" -@@ -198,5 +196,3 @@ static int wbsio_spi_read(struct flashchip *flash, uint8_t *buf, int start, int +@@ -204,5 +202,3 @@ static int wbsio_spi_read(struct flashctx *flash, uint8_t *buf, { return read_memmapped(flash, buf, start, len); } - -#endif -- -1.7.6.4 +1.7.7.5 diff --git a/flashrom-0005-Simplify-hwaccess.c.patch b/flashrom-0005-Simplify-hwaccess.c.patch index 77f565b..ee74b25 100644 --- a/flashrom-0005-Simplify-hwaccess.c.patch +++ b/flashrom-0005-Simplify-hwaccess.c.patch @@ -1,4 +1,4 @@ -From e2730aed4ce04a0e06e7a7113a9c3e5334b3130a Mon Sep 17 00:00:00 2001 +From a96a6cc8d45f274614826f30e26b92ed33f5e1f3 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 21 Sep 2010 17:51:08 +0400 Subject: [PATCH 05/10] Simplify hwaccess.c @@ -142,5 +142,5 @@ index 8c89925..f10d957 100644 void mmio_writeb(uint8_t val, void *addr) { -- -1.7.6.4 +1.7.7.5 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 2b25b50..5edc4fa 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 c56eb72b4bd5656b081afa1ab5bc82fb85157526 Mon Sep 17 00:00:00 2001 +From d15ca8999d1fa60cae0017adf6ff533726cb10b2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 26 Sep 2010 18:25:31 +0400 Subject: [PATCH 06/10] Use endiannes determined at the configure stage @@ -87,5 +87,5 @@ index eea3652..5188a98 100644 #define be_to_cpu8 cpu_to_be8 #define be_to_cpu16 cpu_to_be16 -- -1.7.6.4 +1.7.7.5 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 db6c179..efacfc8 100644 --- a/flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch +++ b/flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch @@ -1,25 +1,23 @@ -From 88ea1d878356897c04ea06008e82a8e10daf6a03 Mon Sep 17 00:00:00 2001 +From c133e2af9a4b2d558303976fd02e85e186b2b9f4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 26 Sep 2010 21:05:50 +0400 Subject: [PATCH 07/10] Use HAVE_*_H macro for detecting includes Signed-off-by: Peter Lemenkov --- - hwaccess.h | 72 +++++++++++++++++++++++++++++++++++++++++++---------------- - 1 files changed, 52 insertions(+), 20 deletions(-) + hwaccess.h | 70 ++++++++++++++++++++++++++++++++++++++++++----------------- + 1 files changed, 50 insertions(+), 20 deletions(-) diff --git a/hwaccess.h b/hwaccess.h -index 5188a98..85c556d 100644 +index 5188a98..4560c17 100644 --- a/hwaccess.h +++ b/hwaccess.h -@@ -24,11 +24,11 @@ +@@ -24,11 +24,9 @@ #ifndef __HWACCESS_H__ #define __HWACCESS_H__ 1 -#if defined (__i386__) || defined (__x86_64__) -#if defined(__GLIBC__) -+#include "config.h" -+ +#if defined (HAVE_SYS_IO_H) #include -#endif @@ -28,7 +26,7 @@ index 5188a98..85c556d 100644 #if NEED_PCI == 1 /* -@@ -39,7 +39,47 @@ +@@ -39,7 +37,47 @@ #define index shadow_workaround_index #include #undef index @@ -77,7 +75,7 @@ index 5188a98..85c556d 100644 #define ___constant_swab8(x) ((uint8_t) ( \ (((uint8_t)(x) & (uint8_t)0xffU)))) -@@ -112,18 +152,13 @@ cpu_to_be(64) +@@ -112,18 +150,13 @@ cpu_to_be(64) #define le_to_cpu64 cpu_to_le64 #if NEED_PCI == 1 @@ -99,7 +97,7 @@ index 5188a98..85c556d 100644 #if (defined(__MACH__) && defined(__APPLE__)) #define __DARWIN__ #endif -@@ -133,7 +168,6 @@ cpu_to_be(64) +@@ -133,7 +166,6 @@ cpu_to_be(64) */ #if defined(__FreeBSD__) || defined(__DragonFly__) @@ -107,7 +105,7 @@ index 5188a98..85c556d 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 +195,6 @@ cpu_to_be(64) +@@ -161,8 +193,6 @@ cpu_to_be(64) #ifdef __DJGPP__ @@ -116,7 +114,7 @@ index 5188a98..85c556d 100644 #define OUTB(x,y) outportb(y, x) #define OUTW(x,y) outportw(y, x) #define OUTL(x,y) outportl(y, x) -@@ -189,8 +221,6 @@ cpu_to_be(64) +@@ -189,8 +219,6 @@ cpu_to_be(64) #define off64_t off_t #define lseek64 lseek #if defined(__i386__) || defined(__x86_64__) @@ -125,7 +123,7 @@ index 5188a98..85c556d 100644 #if defined(__NetBSD__) #if defined(__i386__) #define iopl i386_iopl -@@ -247,7 +277,8 @@ static inline uint32_t inl(uint16_t port) +@@ -247,7 +275,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); @@ -135,7 +133,7 @@ index 5188a98..85c556d 100644 #if defined(__FreeBSD__) || defined(__DragonFly__) /* FreeBSD already has conflicting definitions for wrmsr/rdmsr. */ #undef rdmsr -@@ -257,7 +288,8 @@ int wrmsr(int addr, msr_t msr); +@@ -257,7 +286,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); @@ -146,5 +144,5 @@ index 5188a98..85c556d 100644 #include #include -- -1.7.6.4 +1.7.7.5 diff --git a/flashrom-0008-Move-arch-checking-ifdef-block-into-header.patch b/flashrom-0008-Move-arch-checking-ifdef-block-into-header.patch index c200c61..12b6f30 100644 --- a/flashrom-0008-Move-arch-checking-ifdef-block-into-header.patch +++ b/flashrom-0008-Move-arch-checking-ifdef-block-into-header.patch @@ -1,4 +1,4 @@ -From 706a7a08d331f6dde0cbc539aa8dd449a21104ba Mon Sep 17 00:00:00 2001 +From 285d0fbc9bc7c413651f563760ec81492a445874 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 17 Oct 2010 12:53:18 +0400 Subject: [PATCH 08/10] Move arch-checking #ifdef block into header @@ -28,10 +28,10 @@ index f10d957..98dbfaa 100644 #if defined(__FreeBSD__) || defined(__DragonFly__) int io_fd; diff --git a/hwaccess.h b/hwaccess.h -index 85c556d..c1678e1 100644 +index 4560c17..5a6631f 100644 --- a/hwaccess.h +++ b/hwaccess.h -@@ -183,7 +183,7 @@ cpu_to_be(64) +@@ -181,7 +181,7 @@ cpu_to_be(64) #define off64_t off_t #define lseek64 lseek #endif @@ -40,7 +40,7 @@ index 85c556d..c1678e1 100644 /* Note different order for outb */ #define OUTB(x,y) outb(y, x) #define OUTW(x,y) outw(y, x) -@@ -301,18 +301,6 @@ int libpayload_wrmsr(int addr, msr_t msr); +@@ -299,18 +299,6 @@ int libpayload_wrmsr(int addr, msr_t msr); #define wrmsr libpayload_wrmsr #endif @@ -60,5 +60,5 @@ index 85c556d..c1678e1 100644 #endif -- -1.7.6.4 +1.7.7.5 diff --git a/flashrom-0009-ppc-hack.patch b/flashrom-0009-ppc-hack.patch index 0c3103e..7f97620 100644 --- a/flashrom-0009-ppc-hack.patch +++ b/flashrom-0009-ppc-hack.patch @@ -1,4 +1,4 @@ -From 1a514e6abd046c2e9310c07488090d03bfd9d86c Mon Sep 17 00:00:00 2001 +From afa660c6abea4f1c5b0df5bd35b95dadc681108b Mon Sep 17 00:00:00 2001 From: Mattias Mattsson Date: Wed, 27 Jul 2011 21:02:50 +0400 Subject: [PATCH 09/10] ppc hack @@ -9,10 +9,10 @@ Subject: [PATCH 09/10] ppc hack 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/internal.c b/internal.c -index fc9d9e4..393bdcd 100644 +index 5716e64..1233cae 100644 --- a/internal.c +++ b/internal.c -@@ -295,6 +295,8 @@ int internal_init(void) +@@ -334,6 +334,8 @@ int internal_init(void) "Aborting.\n"); return 1; #endif @@ -35,5 +35,5 @@ index d680f97..014e019 100644 int processor_flash_enable(void) { -- -1.7.6.4 +1.7.7.5 diff --git a/flashrom-0010-Simplify-processor.h.patch b/flashrom-0010-Simplify-processor.h.patch index 38749fa..30fde70 100644 --- a/flashrom-0010-Simplify-processor.h.patch +++ b/flashrom-0010-Simplify-processor.h.patch @@ -1,4 +1,4 @@ -From 8366b13dfc43d432e9735bef59aa276aa7e8dd98 Mon Sep 17 00:00:00 2001 +From eb00fe31da8571f16ae87f981a30fed1c89dc15a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 28 Jul 2011 12:56:17 +0400 Subject: [PATCH 10/10] Simplify processor.h @@ -58,5 +58,5 @@ index 014e019..bf69330 100644 - -#endif -- -1.7.6.4 +1.7.7.5 diff --git a/flashrom.spec b/flashrom.spec index c434eb5..84f4a50 100644 --- a/flashrom.spec +++ b/flashrom.spec @@ -1,18 +1,18 @@ Summary: Simple program for reading/writing BIOS chips content Name: flashrom Version: 0.9.4 -Release: 3.svn1455%{?dist} +Release: 4.svn1487%{?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 1455 export svn://coreboot.org/flashrom/trunk flashrom-0.9.4 +## svn -r 1487 export svn://coreboot.org/flashrom/trunk flashrom-0.9.4 ## tar -cjvf flashrom-0.9.4.tar.bz2 flashrom-0.9.4 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-config.h-instead-of-HAVE_UTSNAME.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 @@ -71,6 +71,19 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/%{name}.* %changelog +* Thu Feb 02 2012 Peter Lemenkov - 0.9.4-4.svn1487 +- Updated to latest svn ver. 1487 (post-release snapshot for 0.9.4) +- Add board enable for the MSC Q7 Tunnel Creek board +- Add board enable for AOpen i945GMx-VFX (used in FCS ESPRIMO Q5010) +- Mark ABIT NF-M2S, ASUS P5K-VM, ASUS M5A99X EVO, ASUS Z8PE-D12, PC Engines Alix.2d3 + boards as tested +- Mark Pm29F002T, AMIC A49LF040A, Winbond W39V040FC flashchips as tested +- Add board enable for ASUS A7N8X-VM/400 +- Add board enable for ASRock ConRoeXFire-eSATA2 +- Add board enable for ASUS P4GV-LA (Guppy) +- Add board enables for the ASUS P5N-D and P5N-E SLI +- Add board enable for Sun Ultra 40 M2 + * Fri Jan 13 2012 Fedora Release Engineering - 0.9.4-3.svn1455 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 66942ea..77cf72b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca3a057426ce8c0850997021e32d289e flashrom-0.9.4.tar.bz2 +e56266c885c895bd10298867fc18194b flashrom-0.9.4.tar.bz2