diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2020-12-15 12:14:38 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-12-15 12:14:38 +0100 |
| commit | 3dcb8b53cbd2cc5618863b19ef00f8ea82f27e83 (patch) | |
| tree | 83017fb4ceb0c01a83a4ac42cd38494b3f8e8807 /drivers | |
| parent | efi: stub: get rid of efi_get_max_fdt_addr() (diff) | |
| parent | efi: arm: force use of unsigned type for EFI_PHYS_ALIGN (diff) | |
| download | linux-dev-3dcb8b53cbd2cc5618863b19ef00f8ea82f27e83.tar.xz linux-dev-3dcb8b53cbd2cc5618863b19ef00f8ea82f27e83.zip | |
Merge tag 'efi-next-for-v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/core
Pull followup fixes for EFI from Ard Biesheuvel:
- fix the build breakage on IA64 caused by recent capsule loader changes
- suppress a type mismatch build warning in the expansion of
EFI_PHYS_ALIGN on ARM
Link: https://lore.kernel.org/r/20201215080144.17077-1-ardb@kernel.org
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/efi/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/firmware/efi/Makefile | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig index b452cfa2100b..5ac2a37ed025 100644 --- a/drivers/firmware/efi/Kconfig +++ b/drivers/firmware/efi/Kconfig @@ -147,7 +147,7 @@ config EFI_BOOTLOADER_CONTROL config EFI_CAPSULE_LOADER tristate "EFI capsule loader" - depends on EFI + depends on EFI && !IA64 help This option exposes a loader interface "/dev/efi_capsule_loader" for users to load EFI capsules. This driver requires working runtime diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile index d6ca2da19339..467e94259679 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile @@ -12,7 +12,10 @@ KASAN_SANITIZE_runtime-wrappers.o := n obj-$(CONFIG_ACPI_BGRT) += efi-bgrt.o obj-$(CONFIG_EFI) += efi.o vars.o reboot.o memattr.o tpm.o -obj-$(CONFIG_EFI) += capsule.o memmap.o +obj-$(CONFIG_EFI) += memmap.o +ifneq ($(CONFIG_EFI_CAPSULE_LOADER),) +obj-$(CONFIG_EFI) += capsule.o +endif obj-$(CONFIG_EFI_PARAMS_FROM_FDT) += fdtparams.o obj-$(CONFIG_EFI_VARS) += efivars.o obj-$(CONFIG_EFI_ESRT) += esrt.o |