Merge tag 'efi-next-for-v5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --combined drivers/firmware/Makefile
index 1be0e82952225426e79ed1991878a853a94a37fd,dca73826e09a6091cc177014e81b669d7eced844..28fcddcd688fc2fd0f977df39126bf251808b970
--- 1/drivers/firmware/Makefile
--- 2/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@@ -15,7 -15,6 +15,7 @@@ obj-$(CONFIG_INTEL_STRATIX10_RSU)     +
  obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o
  obj-$(CONFIG_ISCSI_IBFT)      += iscsi_ibft.o
  obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o
 +obj-$(CONFIG_MTK_ADSP_IPC)    += mtk-adsp-ipc.o
  obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o
  obj-$(CONFIG_FW_CFG_SYSFS)    += qemu_fw_cfg.o
  obj-$(CONFIG_QCOM_SCM)                += qcom-scm.o
@@@ -32,8 -31,7 +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/