mirror of
https://github.com/fail0verflow/switch-coreboot.git
synced 2025-05-04 01:39:18 -04:00
msrtool: Update to use DirectHW on Mac OS X
http://www.coreboot.org/DirectHW Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6443 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
parent
0238a9caa3
commit
9018b6ee64
4 changed files with 6 additions and 6 deletions
2
util/msrtool/configure
vendored
2
util/msrtool/configure
vendored
|
@ -155,7 +155,7 @@ CFLAGS=`trycompile "libpci (from pciutils)" "${pc_CFLAGS}" "-I/usr/local/include
|
||||||
rm -f .config.c
|
rm -f .config.c
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
LDFLAGS=`trylink "libpci (from pciutils)" "${pc_LDFLAGS}" "-lpci -lz" "-L/usr/local/lib -lpci -lz" "-framework DirectIO -lpci -lz"` || {
|
LDFLAGS=`trylink "libpci (from pciutils)" "${pc_LDFLAGS}" "-lpci -lz" "-L/usr/local/lib -lpci -lz" "-framework DirectHW -lpci -lz"` || {
|
||||||
rm -f .config.c .config.o
|
rm -f .config.c .config.o
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,8 +26,8 @@
|
||||||
|
|
||||||
#include "msrtool.h"
|
#include "msrtool.h"
|
||||||
|
|
||||||
/* This Darwin support requires DirectIO, which is available at
|
/* This Darwin support requires DirectHW, which is available at
|
||||||
* http://www.coresystems.de/en/directio
|
* http://www.coreboot.org/DirectHW
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int darwin_probe(const struct sysdef *system)
|
int darwin_probe(const struct sysdef *system)
|
||||||
|
|
|
@ -49,7 +49,7 @@ static struct targetdef alltargets[] = {
|
||||||
|
|
||||||
static struct sysdef allsystems[] = {
|
static struct sysdef allsystems[] = {
|
||||||
{ "linux", "Linux with /dev/cpu/*/msr", linux_probe, linux_open, linux_close, linux_rdmsr },
|
{ "linux", "Linux with /dev/cpu/*/msr", linux_probe, linux_open, linux_close, linux_rdmsr },
|
||||||
{ "darwin", "OS X with DirectIO", darwin_probe, darwin_open, darwin_close, darwin_rdmsr },
|
{ "darwin", "Mac OS X with DirectHW", darwin_probe, darwin_open, darwin_close, darwin_rdmsr },
|
||||||
{ "freebsd", "FreeBSD with /dev/cpuctl*", freebsd_probe, freebsd_open, freebsd_close, freebsd_rdmsr },
|
{ "freebsd", "FreeBSD with /dev/cpuctl*", freebsd_probe, freebsd_open, freebsd_close, freebsd_rdmsr },
|
||||||
{ SYSTEM_EOT }
|
{ SYSTEM_EOT }
|
||||||
};
|
};
|
||||||
|
|
|
@ -24,9 +24,9 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#if (defined(__MACH__) && defined(__APPLE__))
|
#if (defined(__MACH__) && defined(__APPLE__))
|
||||||
/* DirectIO is available here: http://www.coresystems.de/en/directio */
|
/* DirectHW is available here: http://www.coreboot.org/DirectHW */
|
||||||
#define __DARWIN__
|
#define __DARWIN__
|
||||||
#include <DirectIO/darwinio.h>
|
#include <DirectHW/DirectHW.h>
|
||||||
#endif
|
#endif
|
||||||
#if defined(__FreeBSD__)
|
#if defined(__FreeBSD__)
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
|
|
Loading…
Add table
Reference in a new issue