diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2022-10-03 19:32:23 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2022-10-03 19:32:23 +0000 |
| commit | 3bebd7fe563c4184636b053decf23d45b610e4e4 (patch) | |
| tree | 5dd5ffcb1eee715db0b09c9e987246f2df1c61dc /sys/arch | |
| parent | 664e716c25187e8df24c685ad24616ba16bf6205 (diff) | |
Reorganize the EFI code a bit. Move the efi.h header from dev/acpi to
dev/efi and rename the arm64 efi.c to efi_machdep.c, preparing the way
for MI EFI code and an amd64 implementation of EFI runtime support.
ok deraadt@, mlarkin@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arm64/arm64/machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/arm64/conf/files.arm64 | 4 | ||||
| -rw-r--r-- | sys/arch/arm64/dev/efi_machdep.c (renamed from sys/arch/arm64/dev/efi.c) | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/armv7/armv7_machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/riscv64/riscv64/machdep.c | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/arm64/arm64/machdep.c b/sys/arch/arm64/arm64/machdep.c index 41be380880d..01c25ad0a92 100644 --- a/sys/arch/arm64/arm64/machdep.c +++ b/sys/arch/arm64/arm64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.72 2022/09/05 19:18:56 kettenis Exp $ */ +/* $OpenBSD: machdep.c,v 1.73 2022/10/03 19:32:22 kettenis Exp $ */ /* * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se> * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org> @@ -49,7 +49,7 @@ #include <machine/db_machdep.h> #include <ddb/db_extern.h> -#include <dev/acpi/efi.h> +#include <dev/efi/efi.h> #include "softraid.h" #if NSOFTRAID > 0 diff --git a/sys/arch/arm64/conf/files.arm64 b/sys/arch/arm64/conf/files.arm64 index a7e74d81040..2a7bdba0c21 100644 --- a/sys/arch/arm64/conf/files.arm64 +++ b/sys/arch/arm64/conf/files.arm64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.arm64,v 1.60 2022/09/03 08:44:56 kettenis Exp $ +# $OpenBSD: files.arm64,v 1.61 2022/10/03 19:32:22 kettenis Exp $ maxpartitions 16 maxusers 2 8 128 @@ -65,7 +65,7 @@ file arch/arm64/dev/simplebus.c simplebus device efi {} attach efi at fdt -file arch/arm64/dev/efi.c efi +file arch/arm64/dev/efi_machdep.c efi device smbios attach smbios at efi diff --git a/sys/arch/arm64/dev/efi.c b/sys/arch/arm64/dev/efi_machdep.c index 46034ef319f..5f6bbb2488e 100644 --- a/sys/arch/arm64/dev/efi.c +++ b/sys/arch/arm64/dev/efi_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: efi.c,v 1.14 2022/07/30 17:56:54 kettenis Exp $ */ +/* $OpenBSD: efi_machdep.c,v 1.1 2022/10/03 19:32:22 kettenis Exp $ */ /* * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org> @@ -30,7 +30,7 @@ #include <dev/ofw/openfirm.h> #include <dev/ofw/fdt.h> -#include <dev/acpi/efi.h> +#include <dev/efi/efi.h> #include <dev/clock_subr.h> diff --git a/sys/arch/armv7/armv7/armv7_machdep.c b/sys/arch/armv7/armv7/armv7_machdep.c index b33e3f21fc3..83c04d91708 100644 --- a/sys/arch/armv7/armv7/armv7_machdep.c +++ b/sys/arch/armv7/armv7/armv7_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: armv7_machdep.c,v 1.64 2021/10/06 12:50:10 visa Exp $ */ +/* $OpenBSD: armv7_machdep.c,v 1.65 2022/10/03 19:32:22 kettenis Exp $ */ /* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */ /* @@ -121,9 +121,9 @@ #include <armv7/armv7/armv7_machdep.h> #include <dev/cons.h> +#include <dev/efi/efi.h> #include <dev/ofw/fdt.h> #include <dev/ofw/openfirm.h> -#include <dev/acpi/efi.h> #include <net/if.h> diff --git a/sys/arch/riscv64/riscv64/machdep.c b/sys/arch/riscv64/riscv64/machdep.c index 9e6b3cd9680..6685ad9481c 100644 --- a/sys/arch/riscv64/riscv64/machdep.c +++ b/sys/arch/riscv64/riscv64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.27 2022/03/22 06:48:36 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.28 2022/10/03 19:32:22 kettenis Exp $ */ /* * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se> @@ -49,7 +49,7 @@ #include <machine/db_machdep.h> #include <ddb/db_extern.h> -#include <dev/acpi/efi.h> +#include <dev/efi/efi.h> #include "softraid.h" #if NSOFTRAID > 0 |