<p>Philipp Deppenwiese <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/19741">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  build bot (Jenkins): Verified
  Philipp Deppenwiese: Looks good to me, approved
  Arthur Heymans: Looks good to me, but someone else must approve
  Philippe Mathieu-Daudé: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nvramtool: Fix build with OpenBSD<br><br>OpenBSD needs the same includes as NetBSD. It also doesn't have x86_64_iopl<br>function, but amd64_iopl.<br><br>Change-Id: I28273d4d87a3a77cf35412a0695325c0535e42e5<br>Signed-off-by: Piotr Kubaj <pkubaj@anongoth.pl><br>Reviewed-on: https://review.coreboot.org/19741<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Arthur Heymans <arthur@aheymans.xyz><br>Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org><br>Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com><br>---<br>M util/nvramtool/Makefile<br>M util/nvramtool/accessors/cmos-hw-unix.c<br>2 files changed, 6 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile</span><br><span>index bb623bb..8da7c76 100644</span><br><span>--- a/util/nvramtool/Makefile</span><br><span>+++ b/util/nvramtool/Makefile</span><br><span>@@ -34,7 +34,7 @@</span><br><span> ifeq ($(OS_ARCH), Darwin)</span><br><span> LDFLAGS = -framework DirectHW</span><br><span> endif</span><br><span style="color: hsl(0, 100%, 40%);">-ifeq ($(OS_ARCH), NetBSD)</span><br><span style="color: hsl(120, 100%, 40%);">+ifeq ($(OS_ARCH),$(filter $(OS_ARCH),NetBSD OpenBSD))</span><br><span> LDFLAGS = -l$(shell uname -p)</span><br><span> endif</span><br><span> ifeq ($(shell uname -o 2>/dev/null), Cygwin)</span><br><span>diff --git a/util/nvramtool/accessors/cmos-hw-unix.c b/util/nvramtool/accessors/cmos-hw-unix.c</span><br><span>index 33d6994..c66fa3e 100644</span><br><span>--- a/util/nvramtool/accessors/cmos-hw-unix.c</span><br><span>+++ b/util/nvramtool/accessors/cmos-hw-unix.c</span><br><span>@@ -17,7 +17,7 @@</span><br><span> #if (defined(__MACH__) && defined(__APPLE__))</span><br><span> #include <DirectHW/DirectHW.h></span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">-#if defined(__NetBSD__)</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__NetBSD__) || defined(__OpenBSD__)</span><br><span> #if defined(__i386__) || defined(__x86_64__)</span><br><span> #include <machine/sysarch.h></span><br><span> </span><br><span>@@ -58,8 +58,12 @@</span><br><span> }</span><br><span> #endif</span><br><span> #ifdef __x86_64__</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __OpenBSD__</span><br><span style="color: hsl(120, 100%, 40%);">+#define iopl amd64_iopl</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span> #define iopl x86_64_iopl</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> #ifdef __i386__</span><br><span> #define iopl i386_iopl</span><br><span> #endif</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/19741">change 19741</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/19741"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I28273d4d87a3a77cf35412a0695325c0535e42e5 </div>
<div style="display:none"> Gerrit-Change-Number: 19741 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Piotr Kubaj <pkubaj@anongoth.pl> </div>
<div style="display:none"> Gerrit-Reviewer: Arthur Heymans <arthur@aheymans.xyz> </div>
<div style="display:none"> Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net> </div>
<div style="display:none"> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Philippe Mathieu-Daudé <f4bug@amsat.org> </div>
<div style="display:none"> Gerrit-Reviewer: Piotr Kubaj <pkubaj@anongoth.pl> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>