diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-03 22:39:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-03 22:39:30 +0200 |
| commit | 93ce7948e38ffe6f9b4fd403c94c098bd892a5ff (patch) | |
| tree | 6561633ca32d06ecb23118522664ad83dd728fed /drivers/firmware/Makefile | |
| parent | driver core: Set default deferred_probe_timeout back to 0. (diff) | |
| parent | efi: clean up Kconfig dependencies on CONFIG_EFI (diff) | |
| download | linux-93ce7948e38ffe6f9b4fd403c94c098bd892a5ff.tar.xz linux-93ce7948e38ffe6f9b4fd403c94c098bd892a5ff.zip | |
Merge tag 'efi-next-for-v5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull more EFI updates from Ard Biesheuvel:
"Follow-up tweaks for EFI changes - they mostly address issues
introduced this merge window, except for Heinrich's patch:
- fix new DXE service invocations for mixed mode
- use correct Kconfig symbol when setting PE header flag
- clean up the drivers/firmware/efi Kconfig dependencies so that
features that depend on CONFIG_EFI are hidden from the UI when the
symbol is not enabled.
Also included is a RISC-V bugfix from Heinrich to avoid read-write
mappings of read-only firmware regions in the EFI page tables"
* tag 'efi-next-for-v5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
efi: clean up Kconfig dependencies on CONFIG_EFI
efi/x86: libstub: Make DXE calls mixed mode safe
efi: x86: Fix config name for setting the NX-compatibility flag in the PE header
riscv: read-only pages should not be writable
Diffstat (limited to 'drivers/firmware/Makefile')
| -rw-r--r-- | drivers/firmware/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index 1be0e8295222..28fcddcd688f 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -32,8 +32,7 @@ obj-y += broadcom/ obj-y += cirrus/ obj-y += meson/ obj-$(CONFIG_GOOGLE_FIRMWARE) += google/ -obj-$(CONFIG_EFI) += efi/ -obj-$(CONFIG_UEFI_CPER) += efi/ +obj-y += efi/ obj-y += imx/ obj-y += psci/ obj-y += smccc/ |