diff options
| author | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2015-01-10 09:33:06 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2015-01-10 09:33:06 +0000 |
| commit | 8d21ff1d63e9ce1039fb1cba978e26ecbaec492d (patch) | |
| tree | 26e086e92fa8e798bbbd660b5a8c0bc2ecb47209 | |
| parent | 4c32af89998df9cae2a20d50e219c195070b012f (diff) | |
| download | flashrom-8d21ff1d63e9ce1039fb1cba978e26ecbaec492d.tar.gz flashrom-8d21ff1d63e9ce1039fb1cba978e26ecbaec492d.tar.bz2 flashrom-8d21ff1d63e9ce1039fb1cba978e26ecbaec492d.zip | |
Refinements for DragonflyBSD
- /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.
Therefore we should use /usr/local/ instead of /usr/pkg/ on default
to fetch libraries.
Corresponding to flashrom svn r1866.
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | README | 8 | ||||
| -rw-r--r-- | hwaccess.h | 2 | ||||
| -rw-r--r-- | nicintel_eeprom.c | 10 |
4 files changed, 11 insertions, 15 deletions
@@ -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> @@ -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 f2b14dff9..a4fd50254 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 44bc77363..7597cca51 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); |