From 83704c5a09c5bd6d9ad4400dd6555b916ff06a7a Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <stefan.reinauer@coreboot.org>
Date: Fri, 18 Mar 2011 22:00:15 +0000
Subject: [PATCH] Update port of flashrom package to Mac OS X using DirectHW
http://www.coreboot.org/DirectHW
Corresponding to flashrom svn r1282.
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
Makefile | 4 ++--
hwaccess.h | 2 +-
physmap.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index cd73262..fce2708 100644
--- a/Makefile
+++ b/Makefile
@@ -44,8 +44,8 @@ STRIP_ARGS = -s
endif
ifeq ($(OS_ARCH), Darwin)
CPPFLAGS += -I/opt/local/include -I/usr/local/include
-# DirectIO framework can be found in the DirectHW library.
-LDFLAGS += -framework IOKit -framework DirectIO -L/opt/local/lib -L/usr/local/lib
+# DirectHW framework can be found in the DirectHW library.
+LDFLAGS += -framework IOKit -framework DirectHW -L/opt/local/lib -L/usr/local/lib
endif
ifeq ($(OS_ARCH), FreeBSD)
CPPFLAGS += -I/usr/local/include
diff --git a/hwaccess.h b/hwaccess.h
index 63a2bf2..a58194f 100644
--- a/hwaccess.h
+++ b/hwaccess.h
@@ -194,7 +194,7 @@ cpu_to_be(64)
#else
#if defined(__DARWIN__)
/* Header is part of the DirectHW library. */
- #include <DirectIO/darwinio.h>
+ #include <DirectHW/DirectHW.h>
#define off64_t off_t
#define lseek64 lseek
#endif
diff --git a/physmap.c b/physmap.c
index bd3c59b..cb035a5 100644
--- a/physmap.c
+++ b/physmap.c
@@ -134,7 +134,7 @@ void cleanup_cpu_msr(void)
}
#elif defined(__DARWIN__)
-#define MEM_DEV "DirectIO"
+#define MEM_DEV "DirectHW"
static void *sys_physmap(unsigned long phys_addr, size_t len)
{
--
GitLab