Move EFI header files to a location where they can be used on other

architectures besides amd64.

ok deraadt@, krw@

22 files changed, 2 insertions, 2 deletions

diff --git a/sys/arch/amd64/stand/efiboot/Makefile.common b/sys/arch/amd64/stand/efiboot/Makefile.common
index f01b4970e3e..e1cb63387fb 100644
--- a/sys/arch/amd64/stand/efiboot/Makefile.common
+++ b/sys/arch/amd64/stand/efiboot/Makefile.common
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile.common,v 1.4 2015/11/07 17:53:23 yasuoka Exp $
+#	$OpenBSD: Makefile.common,v 1.5 2016/05/11 08:30:58 kettenis Exp $
 
 S=		${.CURDIR}/../../../../..
 SADIR=		${.CURDIR}/../..
-EFIDIR=		${.CURDIR}/../../efi
+EFIDIR=		${S}/stand/efi
 
 OBJCOPY?=	objcopy
 OBJDUMP?=	objdump
diff --git a/sys/arch/amd64/stand/efi/include/README b/sys/stand/efi/include/README
index a1b59cc7fd7..a1b59cc7fd7 100644
--- a/sys/arch/amd64/stand/efi/include/README
+++ b/sys/stand/efi/include/README
diff --git a/sys/arch/amd64/stand/efi/include/amd64/efibind.h b/sys/stand/efi/include/amd64/efibind.h
index 1d0dcd951c3..1d0dcd951c3 100644
--- a/sys/arch/amd64/stand/efi/include/amd64/efibind.h
+++ b/sys/stand/efi/include/amd64/efibind.h
diff --git a/sys/arch/amd64/stand/efi/include/efi.h b/sys/stand/efi/include/efi.h
index a143e7f3578..a143e7f3578 100644
--- a/sys/arch/amd64/stand/efi/include/efi.h
+++ b/sys/stand/efi/include/efi.h
diff --git a/sys/arch/amd64/stand/efi/include/efi_nii.h b/sys/stand/efi/include/efi_nii.h
index 97b63b4fb7b..97b63b4fb7b 100644
--- a/sys/arch/amd64/stand/efi/include/efi_nii.h
+++ b/sys/stand/efi/include/efi_nii.h
diff --git a/sys/arch/amd64/stand/efi/include/efiapi.h b/sys/stand/efi/include/efiapi.h
index e149c2c0ea1..e149c2c0ea1 100644
--- a/sys/arch/amd64/stand/efi/include/efiapi.h
+++ b/sys/stand/efi/include/efiapi.h
diff --git a/sys/arch/amd64/stand/efi/include/eficon.h b/sys/stand/efi/include/eficon.h
index 9eaf4aeded5..9eaf4aeded5 100644
--- a/sys/arch/amd64/stand/efi/include/eficon.h
+++ b/sys/stand/efi/include/eficon.h
diff --git a/sys/arch/amd64/stand/efi/include/eficonsctl.h b/sys/stand/efi/include/eficonsctl.h
index 0ad3d759842..0ad3d759842 100644
--- a/sys/arch/amd64/stand/efi/include/eficonsctl.h
+++ b/sys/stand/efi/include/eficonsctl.h
diff --git a/sys/arch/amd64/stand/efi/include/efidebug.h b/sys/stand/efi/include/efidebug.h
index 97670b13d45..97670b13d45 100644
--- a/sys/arch/amd64/stand/efi/include/efidebug.h
+++ b/sys/stand/efi/include/efidebug.h
diff --git a/sys/arch/amd64/stand/efi/include/efidef.h b/sys/stand/efi/include/efidef.h
index 772818b7bea..772818b7bea 100644
--- a/sys/arch/amd64/stand/efi/include/efidef.h
+++ b/sys/stand/efi/include/efidef.h
diff --git a/sys/arch/amd64/stand/efi/include/efidevp.h b/sys/stand/efi/include/efidevp.h
index 56fab8437e2..56fab8437e2 100644
--- a/sys/arch/amd64/stand/efi/include/efidevp.h
+++ b/sys/stand/efi/include/efidevp.h
diff --git a/sys/arch/amd64/stand/efi/include/efierr.h b/sys/stand/efi/include/efierr.h
index 1c1a6f886ee..1c1a6f886ee 100644
--- a/sys/arch/amd64/stand/efi/include/efierr.h
+++ b/sys/stand/efi/include/efierr.h
diff --git a/sys/arch/amd64/stand/efi/include/efifpswa.h b/sys/stand/efi/include/efifpswa.h
index ed3ea3ce551..ed3ea3ce551 100644
--- a/sys/arch/amd64/stand/efi/include/efifpswa.h
+++ b/sys/stand/efi/include/efifpswa.h
diff --git a/sys/arch/amd64/stand/efi/include/efifs.h b/sys/stand/efi/include/efifs.h
index 765a41a490d..765a41a490d 100644
--- a/sys/arch/amd64/stand/efi/include/efifs.h
+++ b/sys/stand/efi/include/efifs.h
diff --git a/sys/arch/amd64/stand/efi/include/efigop.h b/sys/stand/efi/include/efigop.h
index 77cfba0a4d0..77cfba0a4d0 100644
--- a/sys/arch/amd64/stand/efi/include/efigop.h
+++ b/sys/stand/efi/include/efigop.h
diff --git a/sys/arch/amd64/stand/efi/include/efinet.h b/sys/stand/efi/include/efinet.h
index 4dc315b69c0..4dc315b69c0 100644
--- a/sys/arch/amd64/stand/efi/include/efinet.h
+++ b/sys/stand/efi/include/efinet.h
diff --git a/sys/arch/amd64/stand/efi/include/efipart.h b/sys/stand/efi/include/efipart.h
index 9f25ff62610..9f25ff62610 100644
--- a/sys/arch/amd64/stand/efi/include/efipart.h
+++ b/sys/stand/efi/include/efipart.h
diff --git a/sys/arch/amd64/stand/efi/include/efiprot.h b/sys/stand/efi/include/efiprot.h
index 6ed8a28692d..6ed8a28692d 100644
--- a/sys/arch/amd64/stand/efi/include/efiprot.h
+++ b/sys/stand/efi/include/efiprot.h
diff --git a/sys/arch/amd64/stand/efi/include/efipxebc.h b/sys/stand/efi/include/efipxebc.h
index 840fe0d53e6..840fe0d53e6 100644
--- a/sys/arch/amd64/stand/efi/include/efipxebc.h
+++ b/sys/stand/efi/include/efipxebc.h
diff --git a/sys/arch/amd64/stand/efi/include/efiser.h b/sys/stand/efi/include/efiser.h
index 501ab34df8e..501ab34df8e 100644
--- a/sys/arch/amd64/stand/efi/include/efiser.h
+++ b/sys/stand/efi/include/efiser.h
diff --git a/sys/arch/amd64/stand/efi/include/efistdarg.h b/sys/stand/efi/include/efistdarg.h
index 06d4be49dfb..06d4be49dfb 100644
--- a/sys/arch/amd64/stand/efi/include/efistdarg.h
+++ b/sys/stand/efi/include/efistdarg.h
diff --git a/sys/arch/amd64/stand/efi/include/i386/efibind.h b/sys/stand/efi/include/i386/efibind.h
index 3ebdf105a33..3ebdf105a33 100644
--- a/sys/arch/amd64/stand/efi/include/i386/efibind.h
+++ b/sys/stand/efi/include/i386/efibind.h