flashrom

flashrom@flashrom.org

5 participants
9161 discussions

[commit] r1861 - trunk
by repository service 06 Jan '15

06 Jan '15

Author: stefanct Date: Tue Jan 6 00:00:14 2015 New Revision: 1861 URL: http://flashrom.org/trac/flashrom/changeset/1861 Log: Fix wrong density encoding on Intel Silvermont. Silvermont (Bay Trail, Rangeley, Avoton) seems to still use the old density encoding with 3 bits per chip. Documentation is unavailable (held concealed by Intel) but thanks to the efforts of Tai-Hong (Type) Wu the layout is clear now. This patch is based on his one but solves the issue differently thus reducing the code complexity. Signed-off-by: Tai-Hong Wu <thwu(a)lunartoday.com> Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/ich_descriptors.c trunk/ich_descriptors.h Modified: trunk/ich_descriptors.c ============================================================================== --- trunk/ich_descriptors.c Sat Dec 20 21:25:19 2014 (r1860) +++ trunk/ich_descriptors.c Tue Jan 6 00:00:14 2015 (r1861) @@ -127,27 +127,27 @@ case CHIPSET_ICH10: case CHIPSET_5_SERIES_IBEX_PEAK: case CHIPSET_6_SERIES_COUGAR_POINT: - case CHIPSET_7_SERIES_PANTHER_POINT: { + case CHIPSET_7_SERIES_PANTHER_POINT: + case CHIPSET_BAYTRAIL: { uint8_t size_enc; if (idx == 0) { - size_enc = desc->component.old.comp1_density; + size_enc = desc->component.dens_old.comp1_density; } else { - size_enc = desc->component.old.comp2_density; + size_enc = desc->component.dens_old.comp2_density; } if (size_enc > 5) return "reserved"; return size_str[size_enc]; } case CHIPSET_8_SERIES_LYNX_POINT: - case CHIPSET_BAYTRAIL: case CHIPSET_8_SERIES_LYNX_POINT_LP: case CHIPSET_8_SERIES_WELLSBURG: case CHIPSET_9_SERIES_WILDCAT_POINT: { uint8_t size_enc; if (idx == 0) { - size_enc = desc->component.new.comp1_density; + size_enc = desc->component.dens_new.comp1_density; } else { - size_enc = desc->component.new.comp2_density; + size_enc = desc->component.dens_new.comp2_density; } if (size_enc > 7) return "reserved"; @@ -207,16 +207,16 @@ msg_pdbg2("Component 2 density: %s\n", pprint_density(cs, desc, 1)); else msg_pdbg2("Component 2 is not used.\n"); - msg_pdbg2("Read Clock Frequency: %s\n", pprint_freq(cs, desc->component.common.freq_read)); - msg_pdbg2("Read ID and Status Clock Freq.: %s\n", pprint_freq(cs, desc->component.common.freq_read_id)); - msg_pdbg2("Write and Erase Clock Freq.: %s\n", pprint_freq(cs, desc->component.common.freq_write)); - msg_pdbg2("Fast Read is %ssupported.\n", desc->component.common.fastread ? "" : "not "); - if (desc->component.common.fastread) + msg_pdbg2("Read Clock Frequency: %s\n", pprint_freq(cs, desc->component.modes.freq_read)); + msg_pdbg2("Read ID and Status Clock Freq.: %s\n", pprint_freq(cs, desc->component.modes.freq_read_id)); + msg_pdbg2("Write and Erase Clock Freq.: %s\n", pprint_freq(cs, desc->component.modes.freq_write)); + msg_pdbg2("Fast Read is %ssupported.\n", desc->component.modes.fastread ? "" : "not "); + if (desc->component.modes.fastread) msg_pdbg2("Fast Read Clock Frequency: %s\n", - pprint_freq(cs, desc->component.common.freq_fastread)); + pprint_freq(cs, desc->component.modes.freq_fastread)); if (cs > CHIPSET_6_SERIES_COUGAR_POINT) msg_pdbg2("Dual Output Fast Read Support: %sabled\n", - desc->component.new.dual_output ? "dis" : "en"); + desc->component.modes.dual_output ? "dis" : "en"); if (desc->component.FLILL == 0) msg_pdbg2("No forbidden opcodes.\n"); else { @@ -816,22 +816,22 @@ case CHIPSET_5_SERIES_IBEX_PEAK: case CHIPSET_6_SERIES_COUGAR_POINT: case CHIPSET_7_SERIES_PANTHER_POINT: + case CHIPSET_BAYTRAIL: if (idx == 0) { - size_enc = desc->component.old.comp1_density; + size_enc = desc->component.dens_old.comp1_density; } else { - size_enc = desc->component.old.comp2_density; + size_enc = desc->component.dens_old.comp2_density; } size_max = 5; break; case CHIPSET_8_SERIES_LYNX_POINT: - case CHIPSET_BAYTRAIL: case CHIPSET_8_SERIES_LYNX_POINT_LP: case CHIPSET_8_SERIES_WELLSBURG: case CHIPSET_9_SERIES_WILDCAT_POINT: if (idx == 0) { - size_enc = desc->component.new.comp1_density; + size_enc = desc->component.dens_new.comp1_density; } else { - size_enc = desc->component.new.comp2_density; + size_enc = desc->component.dens_new.comp2_density; } size_max = 7; break; @@ -842,7 +842,7 @@ } if (size_enc > size_max) { - msg_perr("Density of ICH SPI component with index %d is invalid." + msg_perr("Density of ICH SPI component with index %d is invalid.\n" "Encoded density is 0x%x while maximum allowed is 0x%x.\n", idx, size_enc, size_max); return -1; Modified: trunk/ich_descriptors.h ============================================================================== --- trunk/ich_descriptors.h Sat Dec 20 21:25:19 2014 (r1860) +++ trunk/ich_descriptors.h Tue Jan 6 00:00:14 2015 (r1861) @@ -123,23 +123,19 @@ freq_fastread :3, freq_write :3, freq_read_id :3, - :2; - } common; + dual_output :1, /* new since Cougar Point/6 */ + :1; + } modes; struct { uint32_t comp1_density :3, comp2_density :3, - :11, - :13, - :2; - } old; + :26; + } dens_old; struct { uint32_t comp1_density :4, /* new since Lynx Point/8 */ comp2_density :4, - :9, - :13, - dual_output :1, /* new since Cougar Point/6 */ - :1; - } new; + :24; + } dens_new; }; union { /* 0x04 */ uint32_t FLILL; /* Flash Invalid Instructions Register */

1 0

W836xx: Intel DP35DP: flashrom -V
by Александр Трубицын 05 Jan '15

05 Jan '15

best regards, Alexander.V.Trubitsyn

1 0

Re: [flashrom] [PATCH] Fix wrong density encoding on Intel Silvermont.
by Tai-Hong (Type) Wu 05 Jan '15

05 Jan '15

>> I will probably commit this patch before you get a chance to test it >> again because I want to do the 0.9.8 release soonish, but I'd >> appreciate a later test very much too if you want to do that. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Dear Stefan, Thanks for the review and remedy. Certainly, I will again verify the patch once it being committed into official svn-stream (Looks not in r1860 yet?) and/or 0.9.8-release. Thank you Tai-Hong Wu (T.H.Wu Type 2014-12-26 23:36 GMT+08:00 Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> : > Silvermont (Bay Trail, Rangeley, Avoton) seems to still use the old > density encoding with 3 bits per chip. Documentation is unavailable > (held concealed by Intel) but thanks to the efforts of Tai-Hong > (Type) Wu the layout is clear now. This patch is based on his one > but solves the issue differently reducing the code complexity. > > Signed-off-by: T.H.Wu Type <thwu(a)lunartoday.com> > Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> > --- > > Hello Tai-Hong, > > thanks a lot for your patch! And sorry for the late reply. Now that > I got some time I have looked into your patch. Your solution seems > to work fine but I decided that I'd rather move the dual output > supported bit to the "common" bit field struct and rename all > involved structs accordingly. This gets rid of the rather unreadable > double ternary branch. > > I will probably commit this patch before you get a chance to test it > again because I want to do the 0.9.8 release soonish, but I'd > appreciate a later test very much too if you want to do that. > > ich_descriptors.c | 38 +++++++++++++++++++------------------- > ich_descriptors.h | 18 +++++++----------- > 2 files changed, 26 insertions(+), 30 deletions(-) > > diff --git a/ich_descriptors.c b/ich_descriptors.c > index 1966f66..90f70ee 100644 > --- a/ich_descriptors.c > +++ b/ich_descriptors.c > @@ -127,27 +127,27 @@ static const char *pprint_density(enum ich_chipset > cs, const struct ich_descript > case CHIPSET_ICH10: > case CHIPSET_5_SERIES_IBEX_PEAK: > case CHIPSET_6_SERIES_COUGAR_POINT: > - case CHIPSET_7_SERIES_PANTHER_POINT: { > + case CHIPSET_7_SERIES_PANTHER_POINT: > + case CHIPSET_BAYTRAIL: { > uint8_t size_enc; > if (idx == 0) { > - size_enc = desc->component.old.comp1_density; > + size_enc = desc->component.dens_old.comp1_density; > } else { > - size_enc = desc->component.old.comp2_density; > + size_enc = desc->component.dens_old.comp2_density; > } > if (size_enc > 5) > return "reserved"; > return size_str[size_enc]; > } > case CHIPSET_8_SERIES_LYNX_POINT: > - case CHIPSET_BAYTRAIL: > case CHIPSET_8_SERIES_LYNX_POINT_LP: > case CHIPSET_8_SERIES_WELLSBURG: > case CHIPSET_9_SERIES_WILDCAT_POINT: { > uint8_t size_enc; > if (idx == 0) { > - size_enc = desc->component.new.comp1_density; > + size_enc = desc->component.dens_new.comp1_density; > } else { > - size_enc = desc->component.new.comp2_density; > + size_enc = desc->component.dens_new.comp2_density; > } > if (size_enc > 7) > return "reserved"; > @@ -207,16 +207,16 @@ void prettyprint_ich_descriptor_component(enum > ich_chipset cs, const struct ich_ > msg_pdbg2("Component 2 density: %s\n", > pprint_density(cs, desc, 1)); > else > msg_pdbg2("Component 2 is not used.\n"); > - msg_pdbg2("Read Clock Frequency: %s\n", pprint_freq(cs, > desc->component.common.freq_read)); > - msg_pdbg2("Read ID and Status Clock Freq.: %s\n", pprint_freq(cs, > desc->component.common.freq_read_id)); > - msg_pdbg2("Write and Erase Clock Freq.: %s\n", pprint_freq(cs, > desc->component.common.freq_write)); > - msg_pdbg2("Fast Read is %ssupported.\n", > desc->component.common.fastread ? "" : "not "); > - if (desc->component.common.fastread) > + msg_pdbg2("Read Clock Frequency: %s\n", pprint_freq(cs, > desc->component.modes.freq_read)); > + msg_pdbg2("Read ID and Status Clock Freq.: %s\n", pprint_freq(cs, > desc->component.modes.freq_read_id)); > + msg_pdbg2("Write and Erase Clock Freq.: %s\n", pprint_freq(cs, > desc->component.modes.freq_write)); > + msg_pdbg2("Fast Read is %ssupported.\n", > desc->component.modes.fastread ? "" : "not "); > + if (desc->component.modes.fastread) > msg_pdbg2("Fast Read Clock Frequency: %s\n", > - pprint_freq(cs, > desc->component.common.freq_fastread)); > + pprint_freq(cs, > desc->component.modes.freq_fastread)); > if (cs > CHIPSET_6_SERIES_COUGAR_POINT) > msg_pdbg2("Dual Output Fast Read Support: %sabled\n", > - desc->component.new.dual_output ? "dis" : "en"); > + desc->component.modes.dual_output ? "dis" : > "en"); > if (desc->component.FLILL == 0) > msg_pdbg2("No forbidden opcodes.\n"); > else { > @@ -816,22 +816,22 @@ int getFCBA_component_density(enum ich_chipset cs, > const struct ich_descriptors > case CHIPSET_5_SERIES_IBEX_PEAK: > case CHIPSET_6_SERIES_COUGAR_POINT: > case CHIPSET_7_SERIES_PANTHER_POINT: > + case CHIPSET_BAYTRAIL: > if (idx == 0) { > - size_enc = desc->component.old.comp1_density; > + size_enc = desc->component.dens_old.comp1_density; > } else { > - size_enc = desc->component.old.comp2_density; > + size_enc = desc->component.dens_old.comp2_density; > } > size_max = 5; > break; > case CHIPSET_8_SERIES_LYNX_POINT: > - case CHIPSET_BAYTRAIL: > case CHIPSET_8_SERIES_LYNX_POINT_LP: > case CHIPSET_8_SERIES_WELLSBURG: > case CHIPSET_9_SERIES_WILDCAT_POINT: > if (idx == 0) { > - size_enc = desc->component.new.comp1_density; > + size_enc = desc->component.dens_new.comp1_density; > } else { > - size_enc = desc->component.new.comp2_density; > + size_enc = desc->component.dens_new.comp2_density; > } > size_max = 7; > break; > @@ -842,7 +842,7 @@ int getFCBA_component_density(enum ich_chipset cs, > const struct ich_descriptors > } > > if (size_enc > size_max) { > - msg_perr("Density of ICH SPI component with index %d is > invalid." > + msg_perr("Density of ICH SPI component with index %d is > invalid.\n" > "Encoded density is 0x%x while maximum allowed is > 0x%x.\n", > idx, size_enc, size_max); > return -1; > diff --git a/ich_descriptors.h b/ich_descriptors.h > index c41f9d9..2c21598 100644 > --- a/ich_descriptors.h > +++ b/ich_descriptors.h > @@ -123,23 +123,19 @@ struct ich_desc_component { > freq_fastread :3, > freq_write :3, > freq_read_id :3, > - :2; > - } common; > + dual_output :1, /* new since Cougar > Point/6 */ > + :1; > + } modes; > struct { > uint32_t comp1_density :3, > comp2_density :3, > - :11, > - :13, > - :2; > - } old; > + :26; > + } dens_old; > struct { > uint32_t comp1_density :4, /* new since Lynx > Point/8 */ > comp2_density :4, > - :9, > - :13, > - dual_output :1, /* new since Cougar > Point/6 */ > - :1; > - } new; > + :24; > + } dens_new; > }; > union { /* 0x04 */ > uint32_t FLILL; /* Flash Invalid Instructions Register */ > -- > Kind regards, Stefan Tauner > >

1 0

[PATCH 5/5] Refinements for DragonflyBSD.
by Stefan Tauner 05 Jan '15

05 Jan '15

- /usr/include/cpu/param.h defines PAGE_MASK already, hence use another name for the respective macro in nicintel_eeprom.c. - Since DragonflyBSD 3.6 DPorts is used as the default package manager. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- Makefile | 6 +++--- README | 8 ++------ hwaccess.h | 2 +- nicintel_eeprom.c | 10 +++++----- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 201dd07..8cb39ed 100644 --- a/Makefile +++ b/Makefile @@ -111,8 +111,8 @@ LDFLAGS += -L/usr/pkg/lib endif ifeq ($(TARGET_OS), DragonFlyBSD) -CPPFLAGS += -I/usr/pkg/include -LDFLAGS += -L/usr/pkg/lib +CPPFLAGS += -I/usr/local/include +LDFLAGS += -L/usr/local/lib endif ifeq ($(TARGET_OS), DOS) @@ -815,7 +815,7 @@ endif define LIBPCI_TEST /* Avoid a failing test due to libpci header symbol shadowing breakage */ #define index shadow_workaround_index -#if !defined __NetBSD__ && !defined __DragonFly__ +#if !defined __NetBSD__ #include <pci/pci.h> #else #include <pciutils/pci.h> diff --git a/README b/README index b8dec83..b29784c 100644 --- a/README +++ b/README @@ -68,7 +68,7 @@ To compile on Linux, use: make -To compile on FreeBSD, use: +To compile on FreeBSD, OpenBSD or DragonFly BSD, use: gmake @@ -80,11 +80,7 @@ To compile on Solaris, use: gmake LDFLAGS="-L$pathtolibpci" CC="gcc -I$pathtopciheaders" CFLAGS=-O2 -To compile on NetBSD or DragonFly BSD (with pciutils, libftdi, libusb installed in /usr/pkg/), use: - - gmake - -To compile on OpenBSD, use: +To compile on NetBSD (with pciutils, libftdi, libusb installed in /usr/pkg/), use: gmake diff --git a/hwaccess.h b/hwaccess.h index f2b14df..a4fd502 100644 --- a/hwaccess.h +++ b/hwaccess.h @@ -40,7 +40,7 @@ */ #define index shadow_workaround_index -#if !defined (__NetBSD__) && !defined (__DragonFly__) +#if !defined (__NetBSD__) #include <pci/pci.h> #else #include <pciutils/pci.h> diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index 44bc773..7597cca 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -57,7 +57,7 @@ #define EERD_DATA 16 #define BIT(x) (1<<x) -#define PAGE_MASK 0x3f +#define EE_PAGE_MASK 0x3f static uint8_t *nicintel_eebar; static struct pci_dev *nicintel_pci; @@ -94,11 +94,11 @@ static int nicintel_ee_probe(struct flashctx *flash) } } - flash->chip->page_size = PAGE_MASK + 1; + flash->chip->page_size = EE_PAGE_MASK + 1; flash->chip->tested = TEST_OK_PREW; flash->chip->gran = write_gran_1byte_implicit_erase; - flash->chip->block_erasers->eraseblocks[0].size = (PAGE_MASK + 1); - flash->chip->block_erasers->eraseblocks[0].count = (flash->chip->total_size * 1024) / (PAGE_MASK + 1); + flash->chip->block_erasers->eraseblocks[0].size = (EE_PAGE_MASK + 1); + flash->chip->block_erasers->eraseblocks[0].count = (flash->chip->total_size * 1024) / (EE_PAGE_MASK + 1); return 1; } @@ -249,7 +249,7 @@ static int nicintel_ee_write(struct flashctx *flash, const uint8_t *buf, unsigne nicintel_ee_bitbang((buf) ? *buf++ : 0xff, NULL); len--; addr++; - if (!(addr & PAGE_MASK)) + if (!(addr & EE_PAGE_MASK)) break; } nicintel_ee_bitset(EEC, EE_CS, 1); -- Kind regards, Stefan Tauner

1 0

[PATCH 4/5] Remove defaults for CC and AR.
by Stefan Tauner 05 Jan '15

05 Jan '15

AR defaults to "ar" anyway in GNU make and instead of gcc it is probably a better idea to use just cc. The latter allows to build on freebsd 10 without overriding CC or doing symlink tricks (because it uses clang as cc, provides multiple gcc packages but only versioned binaries without any actual "gcc" command name in the path). Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 96a51a3..201dd07 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,6 @@ PROGRAM = flashrom # # Note for anyone editing this Makefile: gnumake will happily ignore any # changes in this Makefile to variables set on the command line. -CC ?= gcc STRIP ?= strip INSTALL = install DIFF = diff @@ -37,7 +36,6 @@ PREFIX ?= /usr/local MANDIR ?= $(PREFIX)/share/man CFLAGS ?= -Os -Wall -Wshadow EXPORTDIR ?= . -AR ?= ar RANLIB ?= ranlib LIBS_BASE ?= .. -- Kind regards, Stefan Tauner

1 0

[PATCH 3/5] Unify target OS and CPU architecture checks.
by Stefan Tauner 05 Jan '15

05 Jan '15

We do CPU architecture checks once for the makefile in arch.h and once for HW access abstraction in hwaccess.c. This patch unifies related files so that they can share the checks to improve maintainability and reduce the chance of inconsistencies. Furthermore, it refines some of the definitions, which - adds "support" for AARCH64 and PPC64, - adds big-endian handling on arm as well as LE handling on PPC64, - fixes compilation of internal.c on AARCH64 and PPC64. Additionally, this patch continues to unify all OS checks in flashrom by adding a new helper macro IS_WINDOWS. The old header file for architecture checking is renamed to platform.h to reflect its broader scope and all new macros are add in there. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- Makefile | 2 +- arch.h | 33 --------- archtest.c | 2 + flash.h | 4 +- flashrom.c | 2 +- hwaccess.c | 20 ++---- hwaccess.h | 87 +++++++++++++++--------- internal.c | 16 ++--- os.h | 2 + platform.h | 54 +++++++++++++++ programmer.h | 2 +- serial.c | 40 +++++------ serprog.c | 10 +-- udelay.c | 2 +- util/ich_descriptors_tool/ich_descriptors_tool.c | 2 +- 15 files changed, 163 insertions(+), 115 deletions(-) delete mode 100644 arch.h create mode 100644 archtest.c create mode 100644 platform.h diff --git a/Makefile b/Makefile index 7d3da08..96a51a3 100644 --- a/Makefile +++ b/Makefile @@ -316,7 +316,7 @@ endif # IMPORTANT: The following line must be placed before ARCH is ever used # (of course), but should come after any lines setting CC because the line # below uses CC itself. -override ARCH := $(strip $(shell LC_ALL=C $(CC) $(CPPFLAGS) -E arch.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) +override ARCH := $(strip $(shell LC_ALL=C $(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) # PCI port I/O support is unimplemented on PPC/MIPS and unavailable on ARM. # Right now this means the drivers below only work on x86. diff --git a/arch.h b/arch.h deleted file mode 100644 index f3f3b0d..0000000 --- a/arch.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file is part of the flashrom project. - * - * Copyright (C) 2011 Carl-Daniel Hailfinger - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * Header file for CPU architecture checking. - */ - -#if defined (__i386__) || defined (__x86_64__) -#define __FLASHROM_ARCH__ "x86" -#elif defined (__mips) || defined (__mips__) || defined (_mips) || defined (mips) -#define __FLASHROM_ARCH__ "mips" -#elif defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__) -#define __FLASHROM_ARCH__ "ppc" -#elif defined(__arm__) -#define __FLASHROM_ARCH__ "arm" -#endif -__FLASHROM_ARCH__ diff --git a/archtest.c b/archtest.c new file mode 100644 index 0000000..791f1a3 --- /dev/null +++ b/archtest.c @@ -0,0 +1,2 @@ +#include "platform.h" +__FLASHROM_ARCH__ diff --git a/flash.h b/flash.h index 81fd61b..56d9e4b 100644 --- a/flash.h +++ b/flash.h @@ -24,12 +24,14 @@ #ifndef __FLASH_H__ #define __FLASH_H__ 1 +#include "platform.h" + #include <inttypes.h> #include <stdio.h> #include <stdint.h> #include <stddef.h> #include <stdbool.h> -#ifdef _WIN32 +#if IS_WINDOWS #include <windows.h> #undef min #undef max diff --git a/flashrom.c b/flashrom.c index 104ecb8..9df1478 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1661,7 +1661,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren) void print_sysinfo(void) { -#ifdef _WIN32 +#if IS_WINDOWS SYSTEM_INFO si; OSVERSIONINFOEX osvi; diff --git a/hwaccess.c b/hwaccess.c index 5b18c32..c90490b 100644 --- a/hwaccess.c +++ b/hwaccess.c @@ -18,19 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#define IS_X86 (defined(__i386__) || defined(__x86_64__) || defined(__amd64__)) -#define IS_MIPS (defined (__mips) || defined (__mips__) || defined (__MIPS__) || defined (mips)) -#define IS_PPC (defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__)) -#define IS_ARM (defined (__arm__) || defined (_ARM)) -#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM) -#error Unknown architecture -#endif - -#define IS_LINUX (defined(__gnu_linux__) || defined(__linux__)) -#define IS_MACOSX (defined(__APPLE__) && defined(__MACH__)) -#if !(IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__DJGPP__) || defined(__LIBPAYLOAD__) || defined(__sun)) -#error "Unknown operating system" -#endif +#include "platform.h" #include <stdint.h> #include <string.h> @@ -45,6 +33,10 @@ #include "flash.h" #include "hwaccess.h" +#if !(IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__DJGPP__) || defined(__LIBPAYLOAD__) || defined(__sun)) +#error "Unknown operating system" +#endif + #define USE_IOPL (IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__)) #define USE_DEV_IO (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) @@ -62,7 +54,7 @@ static inline void sync_primitive(void) * - MIPS uses uncached accesses in mode 2 on /dev/mem which has also a strongly ordered memory model * - ARM uses a strongly ordered memory model for device memories. */ -#if IS_PPC +#if IS_PPC // cf. http://lxr.free-electrons.com/source/arch/powerpc/include/asm/barrier.h asm("eieio" : : : "memory"); #endif } diff --git a/hwaccess.h b/hwaccess.h index 83f349e..f2b14df 100644 --- a/hwaccess.h +++ b/hwaccess.h @@ -24,7 +24,9 @@ #ifndef __HWACCESS_H__ #define __HWACCESS_H__ 1 -#if defined (__i386__) || defined (__x86_64__) +#include "platform.h" + +#if IS_X86 #if defined(__GLIBC__) #include <sys/io.h> #endif @@ -45,14 +47,22 @@ #endif #undef index +#endif /* NEED_PCI == 1 */ + + +/* The next big hunk tries to guess endianess from various preprocessor macros */ +/* First some error checking in case some weird header has defines both. + * NB: OpenBSD always defines _BIG_ENDIAN and _LITTLE_ENDIAN. */ +#if defined (__LITTLE_ENDIAN__) && defined (__BIG_ENDIAN__) +#error Conflicting endianness #define #endif -#if defined (__i386__) || defined (__x86_64__) +#if IS_X86 /* All x86 is little-endian. */ #define __FLASHROM_LITTLE_ENDIAN__ 1 -#elif defined (__mips) || defined (__mips__) || defined (_mips) || defined (mips) +#elif IS_MIPS /* MIPS can be either endian. */ #if defined (__MIPSEL) || defined (__MIPSEL__) || defined (_MIPSEL) || defined (MIPSEL) @@ -61,29 +71,45 @@ #define __FLASHROM_BIG_ENDIAN__ 1 #endif -#elif defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__) +#elif IS_PPC /* PowerPC can be either endian. */ #if defined (_BIG_ENDIAN) || defined (__BIG_ENDIAN__) #define __FLASHROM_BIG_ENDIAN__ 1 -/* Error checking in case some weird header has #defines for LE as well. */ -#if defined (_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) -#error Conflicting endianness #define -#endif -#else -#error Little-endian PowerPC #defines are unknown +#elif defined (_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) +#define __FLASHROM_LITTLE_ENDIAN__ 1 #endif -#elif defined (__arm__) -#if defined (__ARMEL__) +#elif IS_ARM + +/* ARM can be either endian. */ +#if defined (__ARMEB__) +#define __FLASHROM_BIG_ENDIAN__ 1 +#elif defined (__ARMEL__) #define __FLASHROM_LITTLE_ENDIAN__ 1 -#else -#error Big-endian ARM #defines are unknown #endif +#endif /* IS_? */ + +#if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__) + +/* If architecture-specific approaches fail try generic variants. First: BSD (works about everywhere). */ +#if !IS_WINDOWS +#include <sys/param.h> + +#if defined (__BYTE_ORDER) +#if __BYTE_ORDER == __LITTLE_ENDIAN +#define __FLASHROM_LITTLE_ENDIAN__ +#elif __BYTE_ORDER == __BIG_ENDIAN +#define __FLASHROM_BIG_ENDIAN__ +#else +#error Unknown byte order! #endif +#endif /* defined __BYTE_ORDER */ +#endif /* !IS_WINDOWS */ #if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__) + /* Nonstandard libc-specific macros for determining endianness. */ #if defined(__GLIBC__) #include <endian.h> @@ -95,8 +121,10 @@ #endif #endif +#endif + #if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__) -#error Unable to determine endianness. Please add support for your arch or libc. +#error Unable to determine endianness. #endif #define ___constant_swab8(x) ((uint8_t) ( \ @@ -158,11 +186,7 @@ cpu_to_be(64) #define cpu_to_le32 #define cpu_to_le64 -#else - -#error Could not determine endianness. - -#endif +#endif /* __FLASHROM_BIG_ENDIAN__ / __FLASHROM_LITTLE_ENDIAN__ */ #define be_to_cpu8 cpu_to_be8 #define be_to_cpu16 cpu_to_be16 @@ -174,12 +198,12 @@ cpu_to_be(64) #define le_to_cpu64 cpu_to_le64 #if NEED_PCI == 1 -#if defined (__i386__) || defined (__x86_64__) +#if IS_X86 #define __FLASHROM_HAVE_OUTB__ 1 /* for iopl and outb under Solaris */ -#if defined (__sun) && (defined(__i386) || defined(__amd64)) +#if defined (__sun) #include <sys/sysi86.h> #include <sys/psw.h> #include <asm/sunddi.h> @@ -202,11 +226,13 @@ cpu_to_be(64) #define INW(x) __extension__ ({ u_int inw_tmp = (x); inw(inw_tmp); }) #define INL(x) __extension__ ({ u_int inl_tmp = (x); inl(inl_tmp); }) #else + #if defined(__MACH__) && defined(__APPLE__) /* Header is part of the DirectHW library. */ #include <DirectHW/DirectHW.h> -#endif -#if defined (__sun) && (defined(__i386) || defined(__amd64)) +#else + +#if defined (__sun) /* Note different order for outb */ #define OUTB(x,y) outb(y, x) #define OUTW(x,y) outw(y, x) @@ -236,9 +262,8 @@ cpu_to_be(64) #define INB inb #define INW inw #define INL inl - #endif - +#endif #endif #endif @@ -324,15 +349,15 @@ int libpayload_wrmsr(int addr, msr_t msr); #define wrmsr libpayload_wrmsr #endif -#elif defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__) +#elif IS_PPC /* PCI port I/O is not yet implemented on PowerPC. */ -#elif defined (__mips) || defined (__mips__) || defined (_mips) || defined (mips) +#elif IS_MIPS /* PCI port I/O is not yet implemented on MIPS. */ -#elif defined(__arm__) +#elif IS_ARM /* Non memory mapped I/O is not supported on ARM. */ @@ -340,7 +365,7 @@ int libpayload_wrmsr(int addr, msr_t msr); #error Unknown architecture, please check if it supports PCI port IO. -#endif -#endif +#endif /* IS_* */ +#endif /* NEED_PCI == 1 */ #endif /* !__HWACCESS_H__ */ diff --git a/internal.c b/internal.c index e646ca8..f6146d1 100644 --- a/internal.c +++ b/internal.c @@ -160,14 +160,14 @@ enum chipbustype internal_buses_supported = BUS_NONE; int internal_init(void) { -#if __FLASHROM_LITTLE_ENDIAN__ +#if defined __FLASHROM_LITTLE_ENDIAN__ int ret = 0; #endif int force_laptop = 0; int not_a_laptop = 0; const char *board_vendor = NULL; const char *board_model = NULL; -#if defined (__i386__) || defined (__x86_64__) || defined (__arm__) +#if IS_X86 || IS_ARM const char *cb_vendor = NULL; const char *cb_model = NULL; #endif @@ -249,7 +249,7 @@ int internal_init(void) return 1; } -#if defined(__i386__) || defined(__x86_64__) || defined (__arm__) +#if IS_X86 || IS_ARM if ((cb_parse_table(&cb_vendor, &cb_model) == 0) && (board_vendor != NULL) && (board_model != NULL)) { if (strcasecmp(board_vendor, cb_vendor) || strcasecmp(board_model, cb_model)) { msg_pwarn("Warning: The mainboard IDs set by -p internal:mainboard (%s:%s) do not\n" @@ -262,7 +262,7 @@ int internal_init(void) } #endif -#if defined(__i386__) || defined(__x86_64__) +#if IS_X86 dmi_init(); /* In case Super I/O probing would cause pretty explosions. */ @@ -312,7 +312,7 @@ int internal_init(void) } } -#if __FLASHROM_LITTLE_ENDIAN__ +#ifdef __FLASHROM_LITTLE_ENDIAN__ /* try to enable it. Failure IS an option, since not all motherboards * really need this to be done, etc., etc. */ @@ -323,18 +323,18 @@ int internal_init(void) } else if (ret == ERROR_FATAL) return ret; -#if defined(__i386__) || defined(__x86_64__) +#if IS_X86 /* Probe unconditionally for ITE Super I/O chips. This enables LPC->SPI translation on IT87* and * parallel writes on IT8705F. Also, this handles the manual chip select for Gigabyte's DualBIOS. */ init_superio_ite(); -#endif if (board_flash_enable(board_vendor, board_model, cb_vendor, cb_model)) { msg_perr("Aborting to be safe.\n"); return 1; } +#endif -#if defined(__i386__) || defined(__x86_64__) || defined (__mips) +#if IS_X86 || IS_MIPS register_par_master(&par_master_internal, internal_buses_supported); return 0; #else diff --git a/os.h b/os.h index f1b366f..2e6dbaa 100644 --- a/os.h +++ b/os.h @@ -21,6 +21,8 @@ * Header file for OS checking. */ +#include "platform.h" + // Solaris #if defined (__sun) && (defined(__i386) || defined(__amd64)) #define __FLASHROM_OS__ "SunOS" diff --git a/platform.h b/platform.h new file mode 100644 index 0000000..f57fd12 --- /dev/null +++ b/platform.h @@ -0,0 +1,54 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2011 Carl-Daniel Hailfinger + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* + * Header file to determine target OS and CPU architecture. + */ + +#ifndef __PLATFORM_H__ +#define __PLATFORM_H__ 1 + +// Helper defines for operating systems +#define IS_LINUX (defined(__gnu_linux__) || defined(__linux__)) +#define IS_MACOSX (defined(__APPLE__) && defined(__MACH__)) /* yes, both. */ +#define IS_WINDOWS (defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__)) + +// Likewise for target architectures +#if defined (__i386__) || defined (__x86_64__) || defined(__amd64__) + #define __FLASHROM_ARCH__ "x86" + #define IS_X86 1 +#elif defined (__mips) || defined (__mips__) || defined (__MIPS__) || defined (mips) + #define __FLASHROM_ARCH__ "mips" + #define IS_MIPS 1 +#elif defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__) || defined(__POWERPC__) || \ + defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC) || defined(_ARCH_PPC) || \ + defined(_ARCH_PPC64) || defined(__ppc) + #define __FLASHROM_ARCH__ "ppc" + #define IS_PPC 1 +#elif defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_ARM) || defined(_M_ARM) || defined(__arm) || \ + defined(__aarch64__) + #define __FLASHROM_ARCH__ "arm" + #define IS_ARM 1 +#endif + +#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM) +#error Unknown architecture +#endif + +#endif /* !__PLATFORM_H__ */ diff --git a/programmer.h b/programmer.h index d6e06cb..f82e950 100644 --- a/programmer.h +++ b/programmer.h @@ -700,7 +700,7 @@ void serprog_delay(unsigned int usecs); #endif /* serial.c */ -#ifdef _WIN32 +#if IS_WINDOWS typedef HANDLE fdtype; #define SER_INV_FD INVALID_HANDLE_VALUE #else diff --git a/serial.c b/serial.c index e4e911d..94f9b7d 100644 --- a/serial.c +++ b/serial.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "platform.h" + #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -28,7 +30,7 @@ #include <sys/stat.h> #include <errno.h> #include <inttypes.h> -#ifdef _WIN32 +#if IS_WINDOWS #include <conio.h> #else #include <termios.h> @@ -41,7 +43,7 @@ fdtype sp_fd = SER_INV_FD; -#ifdef _WIN32 +#if IS_WINDOWS struct baudentry { DWORD flag; unsigned int baud; @@ -137,7 +139,7 @@ const struct baudentry *round_baud(unsigned int baud) static void msg_perr_strerror(const char *msg) { msg_perr("Error: %s", msg); -#ifdef _WIN32 +#if IS_WINDOWS char *lpMsgBuf; DWORD nErr = GetLastError(); FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, nErr, @@ -159,7 +161,7 @@ int serialport_config(fdtype fd, unsigned int baud) return 1; } -#ifdef _WIN32 +#if IS_WINDOWS DCB dcb; if (!GetCommState(fd, &dcb)) { msg_perr_strerror("Could not fetch original serial port configuration: "); @@ -224,7 +226,7 @@ int serialport_config(fdtype fd, unsigned int baud) fdtype sp_openserport(char *dev, unsigned int baud) { fdtype fd; -#ifdef _WIN32 +#if IS_WINDOWS char *dev2 = dev; if ((strlen(dev) > 3) && (tolower((unsigned char)dev[0]) == 'c') && @@ -266,7 +268,7 @@ fdtype sp_openserport(char *dev, unsigned int baud) } void sp_set_pin(enum SP_PIN pin, int val) { -#ifdef _WIN32 +#if IS_WINDOWS DWORD ctl; if(pin == PIN_TXD) { @@ -302,7 +304,7 @@ void sp_set_pin(enum SP_PIN pin, int val) { int sp_get_pin(enum SP_PIN pin) { int s; -#ifdef _WIN32 +#if IS_WINDOWS DWORD ctl; s = (pin == PIN_CTS) ? MS_CTS_ON : MS_DSR_ON; @@ -319,7 +321,7 @@ int sp_get_pin(enum SP_PIN pin) { void sp_flush_incoming(void) { -#ifdef _WIN32 +#if IS_WINDOWS PurgeComm(sp_fd, PURGE_RXCLEAR); #else /* FIXME: error handling */ @@ -330,7 +332,7 @@ void sp_flush_incoming(void) int serialport_shutdown(void *data) { -#ifdef _WIN32 +#if IS_WINDOWS CloseHandle(sp_fd); #else close(sp_fd); @@ -340,7 +342,7 @@ int serialport_shutdown(void *data) int serialport_write(const unsigned char *buf, unsigned int writecnt) { -#ifdef _WIN32 +#if IS_WINDOWS DWORD tmp = 0; #else ssize_t tmp = 0; @@ -348,7 +350,7 @@ int serialport_write(const unsigned char *buf, unsigned int writecnt) unsigned int empty_writes = 250; /* results in a ca. 125ms timeout */ while (writecnt > 0) { -#ifdef _WIN32 +#if IS_WINDOWS WriteFile(sp_fd, buf, writecnt, &tmp, NULL); #else tmp = write(sp_fd, buf, writecnt); @@ -375,14 +377,14 @@ int serialport_write(const unsigned char *buf, unsigned int writecnt) int serialport_read(unsigned char *buf, unsigned int readcnt) { -#ifdef _WIN32 +#if IS_WINDOWS DWORD tmp = 0; #else ssize_t tmp = 0; #endif while (readcnt > 0) { -#ifdef _WIN32 +#if IS_WINDOWS ReadFile(sp_fd, buf, readcnt, &tmp, NULL); #else tmp = read(sp_fd, buf, readcnt); @@ -407,7 +409,7 @@ int serialport_read_nonblock(unsigned char *c, unsigned int readcnt, unsigned in { int ret = 1; /* disable blocked i/o and declare platform-specific variables */ -#ifdef _WIN32 +#if IS_WINDOWS DWORD rv; COMMTIMEOUTS oldTimeout; COMMTIMEOUTS newTimeout = { @@ -442,7 +444,7 @@ int serialport_read_nonblock(unsigned char *c, unsigned int readcnt, unsigned in int rd_bytes = 0; for (i = 0; i < timeout; i++) { msg_pspew("readcnt %d rd_bytes %d\n", readcnt, rd_bytes); -#ifdef _WIN32 +#if IS_WINDOWS ReadFile(sp_fd, c + rd_bytes, readcnt - rd_bytes, &rv, NULL); msg_pspew("read %lu bytes\n", rv); #else @@ -466,7 +468,7 @@ int serialport_read_nonblock(unsigned char *c, unsigned int readcnt, unsigned in *really_read = rd_bytes; /* restore original blocking behavior */ -#ifdef _WIN32 +#if IS_WINDOWS if (!SetCommTimeouts(sp_fd, &oldTimeout)) { msg_perr_strerror("Could not restore serial port timeout settings: "); ret = -1; @@ -487,7 +489,7 @@ int serialport_write_nonblock(const unsigned char *buf, unsigned int writecnt, u { int ret = 1; /* disable blocked i/o and declare platform-specific variables */ -#ifdef _WIN32 +#if IS_WINDOWS DWORD rv; COMMTIMEOUTS oldTimeout; COMMTIMEOUTS newTimeout = { @@ -522,7 +524,7 @@ int serialport_write_nonblock(const unsigned char *buf, unsigned int writecnt, u int wr_bytes = 0; for (i = 0; i < timeout; i++) { msg_pspew("writecnt %d wr_bytes %d\n", writecnt, wr_bytes); -#ifdef _WIN32 +#if IS_WINDOWS WriteFile(sp_fd, buf + wr_bytes, writecnt - wr_bytes, &rv, NULL); msg_pspew("wrote %lu bytes\n", rv); #else @@ -548,7 +550,7 @@ int serialport_write_nonblock(const unsigned char *buf, unsigned int writecnt, u *really_wrote = wr_bytes; /* restore original blocking behavior */ -#ifdef _WIN32 +#if IS_WINDOWS if (!SetCommTimeouts(sp_fd, &oldTimeout)) { msg_perr_strerror("Could not restore serial port timeout settings: "); return -1; diff --git a/serprog.c b/serprog.c index e52c994..3de0182 100644 --- a/serprog.c +++ b/serprog.c @@ -19,8 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "platform.h" + #include <stdio.h> -#ifndef _WIN32 /* stuff (presumably) needed for sockets only */ +#if ! IS_WINDOWS /* stuff (presumably) needed for sockets only */ #include <stdlib.h> #include <unistd.h> #include <fcntl.h> @@ -30,7 +32,7 @@ #include <netinet/tcp.h> #include <netdb.h> #endif -#ifdef _WIN32 +#if IS_WINDOWS #include <conio.h> #else #include <termios.h> @@ -83,7 +85,7 @@ static int sp_opbuf_usage = 0; whether the command is supported before doing it */ static int sp_check_avail_automatic = 0; -#ifndef WIN32 +#if ! IS_WINDOWS static int sp_opensocket(char *ip, unsigned int port) { int flag = 1; @@ -375,7 +377,7 @@ int serprog_init(void) } free(device); -#ifndef _WIN32 +#if !IS_WINDOWS device = extract_programmer_param("ip"); if (have_device && device) { msg_perr("Error: Both host and device specified.\n" diff --git a/udelay.c b/udelay.c index ee858b8..c03bcc4 100644 --- a/udelay.c +++ b/udelay.c @@ -172,7 +172,7 @@ recalibrate: /* Not very precise sleep. */ void internal_sleep(unsigned int usecs) { -#ifdef _WIN32 +#if IS_WINDOWS Sleep((usecs + 999) / 1000); #else sleep(usecs / 1000000); diff --git a/util/ich_descriptors_tool/ich_descriptors_tool.c b/util/ich_descriptors_tool/ich_descriptors_tool.c index b6c1b12..c3d9ba1 100644 --- a/util/ich_descriptors_tool/ich_descriptors_tool.c +++ b/util/ich_descriptors_tool/ich_descriptors_tool.c @@ -35,7 +35,7 @@ /* Some DJGPP builds define __unix__ although they don't support mmap(). * Cygwin defines __unix__ and supports mmap(), but it does not work well. */ -#if !defined(__MSDOS__) && !defined(_WIN32) && (defined(unix) || defined(__unix__) || defined(__unix)) || (defined(__MACH__) && defined(__APPLE__)) +#if !defined(__MSDOS__) && !IS_WINDOWS && (defined(unix) || defined(__unix__) || defined(__unix)) || (defined(__MACH__) && defined(__APPLE__)) #define HAVE_MMAP 1 #include <sys/mman.h> #endif -- Kind regards, Stefan Tauner

1 0

[PATCH 2/5] Allow to easily set a global path prefix for libraries and include files.
by Stefan Tauner 05 Jan '15

05 Jan '15

Gets rid of a few DOS-specific Makefile hacks. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- Makefile | 18 +++++++----------- README | 4 ++-- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 1bbc4e6..7d3da08 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,8 @@ CFLAGS ?= -Os -Wall -Wshadow EXPORTDIR ?= . AR ?= ar RANLIB ?= ranlib -DOSLIBS_BASE ?= .. +LIBS_BASE ?= .. + # The following parameter changes the default programmer that will be used if there is no -p/--programmer # argument given when running flashrom. The predefined setting does not enable any default so that every # user has to declare the programmer he wants to use on every run. The rationale for this to be not set @@ -66,6 +67,9 @@ ifeq ($(WARNERROR), yes) CFLAGS += -Werror endif +CPPFLAGS += -I$(LIBS_BASE)/include +LDFLAGS += -L$(LIBS_BASE)/lib + ############################################################################### # General OS-specific settings. # 1. Prepare for later by gathering information about host and target OS @@ -115,12 +119,9 @@ endif ifeq ($(TARGET_OS), DOS) EXEC_SUFFIX := .exe -CPPFLAGS += -I$(DOSLIBS_BASE)/libgetopt # DJGPP has odd uint*_t definitions which cause lots of format string warnings. CFLAGS += -Wno-format -# FIXME Check if we can achieve the same effect with -L../libgetopt -lgetopt LIBS += -lgetopt -LDFLAGS += -L$(DOSLIBS_BASE)/libgetopt/ # Bus Pirate, Serprog and PonyProg are not supported under DOS (missing serial support). ifeq ($(CONFIG_BUSPIRATE_SPI), yes) UNSUPPORTED_FEATURES += CONFIG_BUSPIRATE_SPI=yes @@ -710,12 +711,9 @@ PCILIBS += -lpciutils -lpci # For (i386|x86_64)_iopl(2). PCILIBS += -l$(shell uname -p) else -ifeq ($(TARGET_OS), DOS) -CPPFLAGS += -I$(DOSLIBS_BASE)/libpci/include -LDFLAGS += -L$(DOSLIBS_BASE)/libpci/lib/ -PCILIBS += -lpci -else + PCILIBS += -lpci + ifeq ($(TARGET_OS), OpenBSD) # For (i386|amd64)_iopl(2). PCILIBS += -l$(shell uname -m) @@ -723,8 +721,6 @@ else ifeq ($(TARGET_OS), Darwin) # DirectHW framework can be found in the DirectHW library. PCILIBS += -framework IOKit -framework DirectHW -else -endif endif endif endif diff --git a/README b/README index b3e50a6..b8dec83 100644 --- a/README +++ b/README @@ -106,9 +106,9 @@ To cross-compile on Linux for DOS: You will need the following library source trees containing their compiled static libraries either in the parent directory of the flashrom source or - specify the base folder on compile time with the DOSLIBS_BASE parameter. + specify the base folder on compile time with the LIBS_BASE parameter. The default as described above is equal to calling - 'make djgpp-dos DOSLIBS_BASE=..' + 'make djgpp-dos LIBS_BASE=..' To get and build said libraries... Download pciutils 3.1.5 and apply http://flashrom.org/File:Pciutils.patch.gz -- Kind regards, Stefan Tauner

1 0

[PATCH 1/5] Refine revision handling.
by Stefan Tauner 05 Jan '15

05 Jan '15

Up to now, when compiling flashrom outside a VCS it would print two warnings that are not very clear to the user. This patch adds a new auxilary function to getrevision.sh and uses it in the makefile to print a single and more meaningful message to the user while hiding the warnings from getrevision.sh. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- Makefile | 9 +++++++-- util/getrevision.sh | 10 ++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a59a8f1..1bbc4e6 100644 --- a/Makefile +++ b/Makefile @@ -373,7 +373,7 @@ CLI_OBJS = cli_classic.o cli_output.o cli_common.o print.o # Set the flashrom version string from the highest revision number of the checked out flashrom files. # Note to packagers: Any tree exported with "make export" or "make tarball" # will not require subversion. The downloadable snapshots are already exported. -SVNVERSION := $(shell ./util/getrevision.sh -u) +SVNVERSION := $(shell ./util/getrevision.sh -u 2>/dev/null ) RELEASE := 0.9.7 VERSION := $(RELEASE)-$(SVNVERSION) @@ -381,6 +381,11 @@ RELEASENAME ?= $(VERSION) SVNDEF := -D'FLASHROM_VERSION="$(VERSION)"' +# Inform user if there is no meaningful version string. If there is version information from a VCS print +# something anyway because $(info...) will print a line break in any case which would look suspicious. +$(info $(shell ./util/getrevision.sh -c 2>/dev/null || echo "Files don't seem to be under version control." ; \ + echo "Replacing all version templates with $(VERSION)." )) + ############################################################################### # Default settings of CONFIG_* variables. @@ -992,7 +997,7 @@ endif @rm -f .featuretest.c .featuretest$(EXEC_SUFFIX) $(PROGRAM).8: $(PROGRAM).8.tmpl - @sed -e '1 s#".*".*#"$(shell ./util/getrevision.sh -d $(PROGRAM).8.tmpl)" "$(VERSION)"#' <$< >$@ + @sed -e '1 s#".*".*#"$(shell ./util/getrevision.sh -d $(PROGRAM).8.tmpl 2>/dev/null)" "$(VERSION)"#' <$< >$@ install: $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 mkdir -p $(DESTDIR)$(PREFIX)/sbin diff --git a/util/getrevision.sh b/util/getrevision.sh index e50db75..1012058 100755 --- a/util/getrevision.sh +++ b/util/getrevision.sh @@ -215,6 +215,10 @@ upstream_revision() { echo "${r}" } +is_tracked() { + is_file_tracked "$1" +} + show_help() { echo "Usage: ${0} <command> [path] @@ -222,6 +226,8 @@ show_help() { Commands -h or --help this message + -c or --check + test if path is under version control at all -l or --local local revision information including an indicator for uncommitted changes -u or --upstream @@ -274,6 +280,10 @@ main() { check_action $1 action="timestamp +%Y-%m-%dT%H:%M:%SZ" # There is only one valid time format! ISO 8601 shift;; + -c|--check) + check_action=$1 + action="is_tracked" + shift;; -*) show_help; echo "Error: Invalid option: ${1}" -- Kind regards, Stefan Tauner

1 0

[PATCH 0/5] Cross Compilation Refinements
by Stefan Tauner 05 Jan '15

05 Jan '15

I have created some cross compilation fixes while working on the buildbot. Most of them are compile-tested apart from the following platforms: - Solaris (I could not get any variant to install in VirtualBox on ESXi in a timely manner). - MIPS no cross compiler binary package available at buildbot host - SPARC is currently also untested. No intended changes there though. The part of 2/5 that introduces relative default library and include paths may be a bad idea...? 4/5 might break some setups but I'd declare those broken. Everything else is pretty straight forward and since it is almost completely compile-tested I don't expect many surprises and will commit them soonish... followed by a 0.9.8-rc1 tag. So *if* you want to comment on these do so quickly, thanks. Stefan Tauner (5): Refine revision handling. Allow to easily set a global path prefix for libraries and include files. Unify target OS and CPU architecture checks. Remove defaults for CC and AR. Refinements for DragonflyBSD. Makefile | 37 +++++----- README | 12 ++-- arch.h | 33 --------- archtest.c | 2 + flash.h | 4 +- flashrom.c | 2 +- hwaccess.c | 20 ++---- hwaccess.h | 89 +++++++++++++++--------- internal.c | 16 ++--- nicintel_eeprom.c | 10 +-- os.h | 2 + platform.h | 54 ++++++++++++++ programmer.h | 2 +- serial.c | 40 ++++++----- serprog.c | 10 +-- udelay.c | 2 +- util/getrevision.sh | 10 +++ util/ich_descriptors_tool/ich_descriptors_tool.c | 2 +- 18 files changed, 200 insertions(+), 147 deletions(-) delete mode 100644 arch.h create mode 100644 archtest.c create mode 100644 platform.h -- Kind regards, Stefan Tauner

1 0

Verbose Log
by Rainer Spillmann 05 Jan '15

05 Jan '15

Hello Flashrom, I could update a Fujitsu Esprimo E5625 (mainboard D2724-A1x) to a Esprimo E5635 (mainboard D2904-A1x) to support AMD AM2/AM3 C3 revision processors. I have used the official E5635 bios from the fujitsu website which normally would say when trying to update that the bios does not match the system due to it is a E5625. The only difference of the E5635 is a chassis lock on the mainboard. It now works perfect. Normally the used Esprimo E5625 does only support due to missing microcode and older AMD agesa rom up to AMD C2 prozessors witht the official E5625 bios. ( http://en.wikipedia.org/wiki/List_of_AMD_Phenom_microprocessors#.22Rana.22_… ) Regards Rainer

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom