diff options
author | Piotr Kubaj <pkubaj@anongoth.pl> | 2017-05-17 20:33:47 +0200 |
---|---|---|
committer | Philipp Deppenwiese <zaolin.daisuki@gmail.com> | 2018-04-16 22:18:26 +0000 |
commit | 1b36c9de66eb91981983df21e7f3c05c19a15709 (patch) | |
tree | b8ea23f7336e2e493d018c0377d0a3dcd9550902 /util | |
parent | a4bf0b7cd18595d1ff37ccaa53112cb3b94dc512 (diff) |
nvramtool: Fix build with OpenBSD
OpenBSD needs the same includes as NetBSD. It also doesn't have x86_64_iopl
function, but amd64_iopl.
Change-Id: I28273d4d87a3a77cf35412a0695325c0535e42e5
Signed-off-by: Piotr Kubaj <pkubaj@anongoth.pl>
Reviewed-on: https://review.coreboot.org/19741
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
Diffstat (limited to 'util')
-rw-r--r-- | util/nvramtool/Makefile | 2 | ||||
-rw-r--r-- | util/nvramtool/accessors/cmos-hw-unix.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile index bb623bbe1a..8da7c76c8c 100644 --- a/util/nvramtool/Makefile +++ b/util/nvramtool/Makefile @@ -34,7 +34,7 @@ OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), Darwin) LDFLAGS = -framework DirectHW endif -ifeq ($(OS_ARCH), NetBSD) +ifeq ($(OS_ARCH),$(filter $(OS_ARCH),NetBSD OpenBSD)) LDFLAGS = -l$(shell uname -p) endif ifeq ($(shell uname -o 2>/dev/null), Cygwin) diff --git a/util/nvramtool/accessors/cmos-hw-unix.c b/util/nvramtool/accessors/cmos-hw-unix.c index 33d699415f..c66fa3e365 100644 --- a/util/nvramtool/accessors/cmos-hw-unix.c +++ b/util/nvramtool/accessors/cmos-hw-unix.c @@ -17,7 +17,7 @@ #if (defined(__MACH__) && defined(__APPLE__)) #include <DirectHW/DirectHW.h> #endif -#if defined(__NetBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) #if defined(__i386__) || defined(__x86_64__) #include <machine/sysarch.h> @@ -58,8 +58,12 @@ static inline uint32_t inl(uint16_t port) } #endif #ifdef __x86_64__ +#ifdef __OpenBSD__ +#define iopl amd64_iopl +#else #define iopl x86_64_iopl #endif +#endif #ifdef __i386__ #define iopl i386_iopl #endif |