stand/efi: Initialize archsw at compile time
Sponsored by: Netflix
This commit is contained in:
+11
-11
@@ -71,7 +71,17 @@
|
|||||||
|
|
||||||
#include "loader_efi.h"
|
#include "loader_efi.h"
|
||||||
|
|
||||||
struct arch_switch archsw; /* MI/MD interface boundary */
|
struct arch_switch archsw = { /* MI/MD interface boundary */
|
||||||
|
.arch_autoload = efi_autoload,
|
||||||
|
.arch_getdev = efi_getdev,
|
||||||
|
.arch_copyin = efi_copyin,
|
||||||
|
.arch_copyout = efi_copyout,
|
||||||
|
#if defined(__amd64__) || defined(__i386__)
|
||||||
|
.arch_hypervisor = x86_hypervisor,
|
||||||
|
#endif
|
||||||
|
.arch_readin = efi_readin,
|
||||||
|
.arch_zfs_probe = efi_zfs_probe,
|
||||||
|
};
|
||||||
|
|
||||||
EFI_GUID acpi = ACPI_TABLE_GUID;
|
EFI_GUID acpi = ACPI_TABLE_GUID;
|
||||||
EFI_GUID acpi20 = ACPI_20_TABLE_GUID;
|
EFI_GUID acpi20 = ACPI_20_TABLE_GUID;
|
||||||
@@ -1202,16 +1212,6 @@ main(int argc, CHAR16 *argv[])
|
|||||||
char buf[32];
|
char buf[32];
|
||||||
bool uefi_boot_mgr;
|
bool uefi_boot_mgr;
|
||||||
|
|
||||||
archsw.arch_autoload = efi_autoload;
|
|
||||||
archsw.arch_getdev = efi_getdev;
|
|
||||||
archsw.arch_copyin = efi_copyin;
|
|
||||||
archsw.arch_copyout = efi_copyout;
|
|
||||||
#if defined(__amd64__) || defined(__i386__)
|
|
||||||
archsw.arch_hypervisor = x86_hypervisor;
|
|
||||||
#endif
|
|
||||||
archsw.arch_readin = efi_readin;
|
|
||||||
archsw.arch_zfs_probe = efi_zfs_probe;
|
|
||||||
|
|
||||||
#if !defined(__arm__)
|
#if !defined(__arm__)
|
||||||
efi_smbios_detect();
|
efi_smbios_detect();
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user