[PATCH] efi: payload: enable both efi loader and payload for *_efi_defconfig

[Ahmad Fatoum]

We already have an efi_defconfig that's only for use as EFI payload/app.
Let's have all _efi_defconfig thus enable both efi-payload and efi
loader support for extra coverage.

Signed-off-by: Ahmad Fatoum <a.fatoum at barebox.org>
---
 Makefile          | 2 ++
 arch/arm/Makefile | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9c70aa0f49a3..6da8db039b5e 100644
--- a/Makefile
+++ b/Makefile
@@ -619,6 +619,8 @@ endif
 
 %_efiloader_defconfig: FORCE
 	$(call merge_into_defconfig,$*_defconfig,efi-loader)
+%_efi_defconfig: FORCE
+	$(call merge_into_defconfig,$*_defconfig,efi-loader efi-payload)
 
 config: outputmakefile scripts_basic FORCE
 	$(Q)$(MAKE) $(build)=scripts/kconfig KCONFIG_DEFCONFIG_LIST= $@
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5efc4c3457db..b38f694339a4 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -8,13 +8,11 @@ am335x_mlo_sdmmc_defconfig:
 am335x_mlo_rawflash_defconfig:
 	$(call merge_into_defconfig,am335x_mlo_defconfig,nomci)
 
-multi_v8_efi_defconfig:
-	$(call merge_into_defconfig,multi_v8_defconfig,efi-payload)
-generated_configs += multi_v8_efi_defconfig
-
 # Generic rule applying the fragment is in top-level Makefile
 generated_configs += $(patsubst %_defconfig,%_efiloader_defconfig, \
 		     multi_v7_defconfig multi_v8_defconfig)
+generated_configs += $(patsubst %_defconfig,%_efi_defconfig, \
+		     multi_v8_defconfig)
 
 KBUILD_CPPFLAGS	+= -D__ARM__ -fno-strict-aliasing
 # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:
-- 
2.47.3