summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2010-10-06 23:16:10 +0000
committerhailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2010-10-06 23:16:10 +0000
commitf277d70138a8c058f5ef91e378d9374d9144ebe6 (patch)
tree5da8353549aa36d8e19733514fad9d15e040dea7
parent5136e552ad9c55cf2d9613e2c8517a4a189b4242 (diff)
downloadflashrom-f277d70138a8c058f5ef91e378d9374d9144ebe6.tar.gz
The Direct I/O library for Mac OS X is now called DirectHW to make sure
people can find it via an internet search. DirectIO was a generic name for a concept and thus not a good distinguisher for a library. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Idwer Vollering <vidwer@gmail.com> git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1198 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--Makefile1
-rw-r--r--README4
-rw-r--r--cbtable.c2
-rw-r--r--hwaccess.h1
4 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index e83fc0b..54f04b9 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ 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
endif
ifeq ($(OS_ARCH), FreeBSD)
diff --git a/README b/README
index a714d09..5b1799b 100644
--- a/README
+++ b/README
@@ -87,8 +87,8 @@ To compile on OpenBSD, use:
To compile and run on Darwin/Mac OS X:
- Install DirectIO from coresystems GmbH.
- DirectIO is available at http://www.coresystems.de/en/directio.
+ Install DirectHW from coresystems GmbH.
+ DirectHW is available at http://www.coresystems.de/en/directhw .
To cross-compile on Linux for DOS:
diff --git a/cbtable.c b/cbtable.c
index 2b02e71..dbb2cff 100644
--- a/cbtable.c
+++ b/cbtable.c
@@ -203,7 +203,7 @@ int coreboot_init(void)
struct lb_record *rec, *last;
#ifdef __DARWIN__
- /* This is a hack. DirectIO fails to map physical address 0x00000000.
+ /* This is a hack. DirectHW fails to map physical address 0x00000000.
* Why?
*/
start = 0x400;
diff --git a/hwaccess.h b/hwaccess.h
index 9bf37f2..63a2bf2 100644
--- a/hwaccess.h
+++ b/hwaccess.h
@@ -193,6 +193,7 @@ cpu_to_be(64)
#define INL(x) __extension__ ({ u_int inl_tmp = (x); inl(inl_tmp); })
#else
#if defined(__DARWIN__)
+ /* Header is part of the DirectHW library. */
#include <DirectIO/darwinio.h>
#define off64_t off_t
#define lseek64 lseek