From: Simon Glass <sjg@chromium.org> Once the EFI app supports booting an OS, this bootmeth will work without CONFIG_EFI_LOADER being enabled. Rename it so this is clear. Signed-off-by: Simon Glass <sjg@chromium.org> --- boot/Kconfig | 4 ++-- boot/Makefile | 2 +- configs/khadas-vim3_android_ab_defconfig | 2 +- configs/khadas-vim3_android_defconfig | 2 +- configs/khadas-vim3l_android_ab_defconfig | 2 +- configs/khadas-vim3l_android_defconfig | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index a68d8af047b..9899b13f376 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -672,7 +672,7 @@ config BOOTMETH_EXTLINUX_LOCALBOOT This attempts to find a kernel and initrd on the disk and boot it, in the case where there is no "localcmd" in the environment. -config BOOTMETH_EFILOADER +config BOOTMETH_EFI bool "Bootdev support for EFI boot" depends on EFI_BINARY_EXEC imply CMD_TFTPBOOT if CMD_NET @@ -743,7 +743,7 @@ config BOOTMETH_DISTRO select BOOTMETH_SCRIPT if CMDLINE # E.g. Armbian uses scripts select BOOTMETH_EXTLINUX # E.g. Debian uses these select BOOTMETH_EXTLINUX_PXE if CMD_PXE && CMD_NET && DM_ETH - select BOOTMETH_EFILOADER if EFI_BINARY_EXEC # E.g. Ubuntu uses this + select BOOTMETH_EFI if EFI_BINARY_EXEC # E.g. Ubuntu uses this config SPL_BOOTMETH_VBE bool "Bootdev support for Verified Boot for Embedded (SPL)" diff --git a/boot/Makefile b/boot/Makefile index 7f4126ec4ea..3ab1fbb11c0 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -27,7 +27,7 @@ obj-$(CONFIG_$(PHASE_)BOOTSTD_PROG) += prog_boot.o obj-$(CONFIG_$(PHASE_)BOOTMETH_EXTLINUX) += ext_pxe_common.o bootmeth_extlinux.o obj-$(CONFIG_$(PHASE_)BOOTMETH_EXTLINUX_PXE) += ext_pxe_common.o bootmeth_pxe.o -obj-$(CONFIG_$(PHASE_)BOOTMETH_EFILOADER) += bootmeth_efi.o +obj-$(CONFIG_$(PHASE_)BOOTMETH_EFI) += bootmeth_efi.o obj-$(CONFIG_$(PHASE_)BOOTMETH_CROS) += bootmeth_cros.o obj-$(CONFIG_$(PHASE_)BOOTMETH_FEL) += bootmeth_fel.o obj-$(CONFIG_$(PHASE_)BOOTMETH_QFW) += bootmeth_qfw.o diff --git a/configs/khadas-vim3_android_ab_defconfig b/configs/khadas-vim3_android_ab_defconfig index a078c5d363a..3208a7d4e3a 100644 --- a/configs/khadas-vim3_android_ab_defconfig +++ b/configs/khadas-vim3_android_ab_defconfig @@ -27,7 +27,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_BOOTMETH_ANDROID=y # CONFIG_BOOTMETH_EXTLINUX is not set # CONFIG_BOOTMETH_EXTLINUX_PXE is not set -# CONFIG_BOOTMETH_EFILOADER is not set +# CONFIG_BOOTMETH_EFI is not set # CONFIG_BOOTMETH_EFI_BOOTMGR is not set # CONFIG_BOOTMETH_VBE is not set CONFIG_LEGACY_IMAGE_FORMAT=y diff --git a/configs/khadas-vim3_android_defconfig b/configs/khadas-vim3_android_defconfig index b77a44ce859..dde075eba84 100644 --- a/configs/khadas-vim3_android_defconfig +++ b/configs/khadas-vim3_android_defconfig @@ -27,7 +27,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_BOOTMETH_ANDROID=y # CONFIG_BOOTMETH_EXTLINUX is not set # CONFIG_BOOTMETH_EXTLINUX_PXE is not set -# CONFIG_BOOTMETH_EFILOADER is not set +# CONFIG_BOOTMETH_EFI is not set # CONFIG_BOOTMETH_EFI_BOOTMGR is not set # CONFIG_BOOTMETH_VBE is not set CONFIG_LEGACY_IMAGE_FORMAT=y diff --git a/configs/khadas-vim3l_android_ab_defconfig b/configs/khadas-vim3l_android_ab_defconfig index 43db61056ba..5e824bdb2dc 100644 --- a/configs/khadas-vim3l_android_ab_defconfig +++ b/configs/khadas-vim3l_android_ab_defconfig @@ -27,7 +27,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_BOOTMETH_ANDROID=y # CONFIG_BOOTMETH_EXTLINUX is not set # CONFIG_BOOTMETH_EXTLINUX_PXE is not set -# CONFIG_BOOTMETH_EFILOADER is not set +# CONFIG_BOOTMETH_EFI is not set # CONFIG_BOOTMETH_EFI_BOOTMGR is not set # CONFIG_BOOTMETH_VBE is not set CONFIG_LEGACY_IMAGE_FORMAT=y diff --git a/configs/khadas-vim3l_android_defconfig b/configs/khadas-vim3l_android_defconfig index 32d57a5b909..a1378327398 100644 --- a/configs/khadas-vim3l_android_defconfig +++ b/configs/khadas-vim3l_android_defconfig @@ -27,7 +27,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_BOOTMETH_ANDROID=y # CONFIG_BOOTMETH_EXTLINUX is not set # CONFIG_BOOTMETH_EXTLINUX_PXE is not set -# CONFIG_BOOTMETH_EFILOADER is not set +# CONFIG_BOOTMETH_EFI is not set # CONFIG_BOOTMETH_EFI_BOOTMGR is not set # CONFIG_BOOTMETH_VBE is not set CONFIG_LEGACY_IMAGE_FORMAT=y -- 2.43.0