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
diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile
index c6894c0..db7fca0 100644
--- a/util/inteltool/Makefile
+++ b/util/inteltool/Makefile
@@ -31,7 +31,7 @@
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 f32ec73..a416106 100644
--- a/util/inteltool/inteltool.c
+++ b/util/inteltool/inteltool.c
@@ -85,7 +85,7 @@
#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 65792e4..cac1c27 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 @@
#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);