We won't enable this in the defconfigs yet, until this gets wider testing, but let's provide a fragment and a pattern rule to generate efiloader enabled defconfigs.
Signed-off-by: Ahmad Fatoum <[email protected]> --- Makefile | 3 +++ arch/arm/Makefile | 4 ++++ common/boards/configs/efi-loader.config | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 common/boards/configs/efi-loader.config diff --git a/Makefile b/Makefile index d74c57da2a99..c4a758493abc 100644 --- a/Makefile +++ b/Makefile @@ -618,6 +618,9 @@ include $(srctree)/arch/$(SRCARCH)/Makefile export KBUILD_DEFCONFIG CC_VERSION_TEXT endif +%_efiloader_defconfig: FORCE + $(call merge_into_defconfig,$*_defconfig,efi-loader) + config: outputmakefile scripts_basic FORCE $(Q)$(MAKE) $(build)=scripts/kconfig KCONFIG_DEFCONFIG_LIST= $@ diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 4d84f3bf9c72..5efc4c3457db 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -12,6 +12,10 @@ 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) + KBUILD_CPPFLAGS += -D__ARM__ -fno-strict-aliasing # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: ifeq ($(CONFIG_CPU_64),y) diff --git a/common/boards/configs/efi-loader.config b/common/boards/configs/efi-loader.config new file mode 100644 index 000000000000..7fadc60e41a8 --- /dev/null +++ b/common/boards/configs/efi-loader.config @@ -0,0 +1,2 @@ +CONFIG_EFI_LOADER=y +CONFIG_FS_EFIVARFS=y -- 2.47.3
