diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2011-03-18 22:08:39 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2011-03-18 22:08:39 +0000 |
| commit | cff573d3a455c20d427e70db84fd2acfe59194d1 (patch) | |
| tree | 0dd98c67a4812a11e507cbc4d98cb711b5deb7a6 /util/inteltool | |
| parent | 4a46e89c757c17f625505ab7cbc6c3c18751e22a (diff) | |
DirectHW fixes for coreboot utilities
See http://www.coreboot.org/DirectHW for more information
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6454 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/inteltool')
| -rw-r--r-- | util/inteltool/Makefile | 2 | ||||
| -rw-r--r-- | util/inteltool/inteltool.c | 2 | ||||
| -rw-r--r-- | util/inteltool/inteltool.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile index c6894c0afd..db7fca0b23 100644 --- a/util/inteltool/Makefile +++ b/util/inteltool/Makefile @@ -31,7 +31,7 @@ OBJS = inteltool.o cpu.o gpio.o rootcmplx.o powermgt.o memory.o pcie.o OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), Darwin) -LDFLAGS = -framework DirectIO -lpci -lz +LDFLAGS = -framework DirectHW -lpci -lz endif ifeq ($(OS_ARCH), FreeBSD) CFLAGS += -I/usr/local/include diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index f32ec73cbc..a4161063f1 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -85,7 +85,7 @@ static const struct { #ifndef __DARWIN__ static int fd_mem; -void *map_physical(unsigned long phys_addr, size_t len) +void *map_physical(uint64_t phys_addr, size_t len) { void *virt_addr; diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h index 65792e4a90..cac1c272ab 100644 --- a/util/inteltool/inteltool.h +++ b/util/inteltool/inteltool.h @@ -26,7 +26,7 @@ #if (defined(__MACH__) && defined(__APPLE__)) /* DirectHW is available here: http://www.coresystems.de/en/directhw */ #define __DARWIN__ -#include <DirectIO/darwinio.h> +#include <DirectHW/DirectHW.h> #endif #include <pci/pci.h> @@ -111,7 +111,7 @@ int freebsd_wrmsr(int addr, msr_t msr); #endif typedef struct { uint16_t addr; int size; char *name; } io_register_t; -void *map_physical(unsigned long phys_addr, size_t len); +void *map_physical(uint64_t phys_addr, size_t len); void unmap_physical(void *virt_addr, size_t len); unsigned int cpuid(unsigned int op); |