efi: clean up Kconfig dependencies on CONFIG_EFI

Geert reports that the new option CONFIG_EFI_DISABLE_RUNTIME is user visible even when EFI support is disabled, which is unnecessary and clutters the Kconfig interface.

So let's move this option into the existing Kconfig submenu that already depends on CONFIG_EFI, and while at it, give some other options the same treatment.

Also clean up a small wart where the efi/ subdirectory is listed twice. Let's just list it unconditionally so that both EFI and UEFI_CPER based pieces will be built independently (the latter only depends on the former on !X86)

---
 drivers/firmware/Makefile    |  3 +-
 drivers/firmware/efi/Kconfig | 52 +++++++++-----------
 2 files changed, 25 insertions(+), 30 deletions(-)

index 4e58cb474a68..dca73826e09a 100644
@@ -31,8 +31,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/

2.30.2

Hello Ard,

This makes sense to me.

Best regards,

Javier Martinez Canillas
Linux Engineering
Red Hat