diff options
| author | kevans <kevans@FreeBSD.org> | 2018-03-15 19:31:39 +0000 |
|---|---|---|
| committer | kevans <kevans@FreeBSD.org> | 2018-03-15 19:31:39 +0000 |
| commit | 119a7e65d8b98e3a622f0e57e84a2eda0405f8e8 (patch) | |
| tree | 0babf0e9aedc9c461ac2788527a45de19837067d /sys/conf | |
| parent | 01d7241282fe3ff89d1b3ddb7f9a95512f8dd0f0 (diff) | |
| download | FreeBSD-src-119a7e65d8b98e3a622f0e57e84a2eda0405f8e8.zip FreeBSD-src-119a7e65d8b98e3a622f0e57e84a2eda0405f8e8.tar.gz | |
MFC r322278,324177: EFIRT Improvements
r322278 (imp): Fail to open efirt device when no EFI on system.
libefivar expects opening /dev/efi to indicate if the we can make efi
runtime calls. With a null routine, it was always succeeding leading
efi_variables_supported() to return the wrong value. Only succeed if
we have an efi_runtime table. Also, while I'm hear, out of an
abundance of caution, add a likely redundant check to make sure
efi_systbl is not NULL before dereferencing it. I know it can't be
NULL if efi_cfgtbl is non-NULL, but the compiler doesn't.
r324177 (andrew):
To prepare for adding EFI runtime services support on arm64 move the
machine independent parts of the existing code to a new file that can be
shared between amd64 and arm64.
Care has been taken to ensure that the MFC of r324177 did not clobber
cherry-picked MFC's.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files | 1 | ||||
| -rw-r--r-- | sys/conf/files.amd64 | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/files b/sys/conf/files index a40abde..b8e79cd 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1584,6 +1584,7 @@ dev/ed/if_ed_rtl80x9.c optional ed dev/ed/if_ed_pccard.c optional ed pccard dev/ed/if_ed_pci.c optional ed pci dev/efidev/efidev.c optional efirt +dev/efidev/efirt.c optional efirt dev/eisa/eisa_if.m standard dev/eisa/eisaconf.c optional eisa dev/e1000/if_em.c optional em \ diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 27dd471..26392d1 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -133,7 +133,7 @@ amd64/amd64/cpu_switch.S standard amd64/amd64/db_disasm.c optional ddb amd64/amd64/db_interface.c optional ddb amd64/amd64/db_trace.c optional ddb -amd64/amd64/efirt.c optional efirt +amd64/amd64/efirt_machdep.c optional efirt amd64/amd64/elf_machdep.c standard amd64/amd64/exception.S standard amd64/amd64/fpu.c standard |
