From cff573d3a455c20d427e70db84fd2acfe59194d1 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 18 Mar 2011 22:08:39 +0000 Subject: [PATCH] DirectHW fixes for coreboot utilities See http://www.coreboot.org/DirectHW for more information Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6454 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/inteltool/Makefile | 2 +- util/inteltool/inteltool.c | 2 +- util/inteltool/inteltool.h | 4 ++-- util/nvramtool/Makefile | 2 +- util/nvramtool/accessors/cmos-hw-unix.c | 2 +- util/superiotool/Makefile | 2 +- util/superiotool/superiotool.h | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile index c6894c0af..db7fca0b2 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 f32ec73cb..a4161063f 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 65792e4a9..cac1c272a 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 +#include #endif #include @@ -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 e0054cde3..a75c70da5 100644 --- 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 24cc42d2d..6d42cb57e 100644 --- a/util/nvramtool/accessors/cmos-hw-unix.c +++ b/util/nvramtool/accessors/cmos-hw-unix.c @@ -15,7 +15,7 @@ #include #endif #if (defined(__MACH__) && defined(__APPLE__)) -#include +#include #endif #if defined(__NetBSD__) #if defined(__i386__) || defined(__x86_64__) diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile index bcdb107d7..00a1cc0d7 100644 --- 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 63dfebdcf..8a7d2aa47 100644 --- a/util/superiotool/superiotool.h +++ b/util/superiotool/superiotool.h @@ -33,8 +33,8 @@ #include #endif #if (defined(__MACH__) && defined(__APPLE__)) -/* DirectIO is available here: http://www.coresystems.de/en/directio */ -#include +/* DirectHW is available here: http://www.coreboot.org/DirectHW */ +#include #endif #ifdef PCI_SUPPORT -- 2.25.1