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 c6894c0afd036fa7d34ea6d12a82876b694cfd9c..db7fca0b23a07c6d2aec531bd21d77b08e5060a5 100644 (file)
--- 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 f32ec73cbc531d64a5e77dee92459770f07d2896..a4161063f1d8319b6b300008ba7815d885e73b9a 100644 (file)
--- 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 65792e4a906db4fac167fc6befa33d983a6c1f7b..cac1c272abcee2572677f8e567d5b3686aef77b4 100644 (file)
--- 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);

diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile
index e0054cde34e1be07ac2337c9904e57f710a5349b..a75c70da5ce6fe54bedb66e9c5f475f0eeef99b4 100644 (file)
--- a/util/nvramtool/Makefile
+++ b/util/nvramtool/Makefile
@@ -37,7 +37,7 @@ OBJS += $(CLI_OBJS)
 
 OS_ARCH        = $(shell uname)
 ifeq ($(OS_ARCH), Darwin)
-LDFLAGS = -framework DirectIO
+LDFLAGS = -framework DirectHW
 endif
 ifeq ($(OS_ARCH), NetBSD)
 LDFLAGS = -l$(shell uname -p)

diff --git a/util/nvramtool/accessors/cmos-hw-unix.c b/util/nvramtool/accessors/cmos-hw-unix.c
index 24cc42d2dd208459a705a9b3e4f4fb2270f00597..6d42cb57ee2914fc5f9e78895fd0b626d04fe7da 100644 (file)
--- a/util/nvramtool/accessors/cmos-hw-unix.c
+++ b/util/nvramtool/accessors/cmos-hw-unix.c
@@ -15,7 +15,7 @@
 #include <sys/io.h>
 #endif
 #if (defined(__MACH__) && defined(__APPLE__))
-#include <DirectIO/darwinio.h>
+#include <DirectHW/DirectHW.h>
 #endif
 #if defined(__NetBSD__)
 #if defined(__i386__) || defined(__x86_64__) 

diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile
index bcdb107d719e570237b9c56c3707cc37ef37b127..00a1cc0d7b7fa7c22c32668e6e39c09da53e0f69 100644 (file)
--- a/util/superiotool/Makefile
+++ b/util/superiotool/Makefile
@@ -37,7 +37,7 @@ OBJS = superiotool.o ali.o fintek.o ite.o nsc.o nuvoton.o smsc.o winbond.o
 
 OS_ARCH = $(shell uname)
 ifeq ($(OS_ARCH), Darwin)
-LIBS = -framework IOKit -framework DirectIO -lpci -lz
+LIBS = -framework IOKit -framework DirectHW -lpci -lz
 endif
 ifeq ($(OS_ARCH), FreeBSD)
 CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \

diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index 63dfebdcf713b1f6e7cb0b95c0e1491bece49090..8a7d2aa479b4a0721bfa3730f762e994f1a5b855 100644 (file)
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -33,8 +33,8 @@
 #include <sys/io.h>
 #endif
 #if (defined(__MACH__) && defined(__APPLE__))
-/* DirectIO is available here: http://www.coresystems.de/en/directio */
-#include <DirectIO/darwinio.h>
+/* DirectHW is available here: http://www.coreboot.org/DirectHW */
+#include <DirectHW/DirectHW.h>
 #endif
 
 #ifdef PCI_SUPPORT