smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

efi: Rename BOOTMETH_EFILOADER to BOOTMETH_EFI

Browse Source 
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>
This commit is contained in:
Simon Glass
2025-08-05 16:08:34 -06:00
parent 28b512bad3
commit 0d481b9ff7
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
boot/Kconfig
View File

@@ -672,7 +672,7 @@ config BOOTMETH_EXTLINUX_LOCALBOOT
This attempts to find a kernel and initrd on the disk and boot it, 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. in the case where there is no "localcmd" in the environment.
config BOOTMETH_EFILOADER config BOOTMETH_EFI
bool "Bootdev support for EFI boot" bool "Bootdev support for EFI boot"
depends on EFI_BINARY_EXEC depends on EFI_BINARY_EXEC
imply CMD_TFTPBOOT if CMD_NET 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_SCRIPT if CMDLINE # E.g. Armbian uses scripts
select BOOTMETH_EXTLINUX # E.g. Debian uses these select BOOTMETH_EXTLINUX # E.g. Debian uses these
select BOOTMETH_EXTLINUX_PXE if CMD_PXE && CMD_NET && DM_ETH 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 config SPL_BOOTMETH_VBE
bool "Bootdev support for Verified Boot for Embedded (SPL)" bool "Bootdev support for Verified Boot for Embedded (SPL)"

2
boot/Makefile
View File

@@ -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) += ext_pxe_common.o bootmeth_extlinux.o
obj-$(CONFIG_$(PHASE_)BOOTMETH_EXTLINUX_PXE) += ext_pxe_common.o bootmeth_pxe.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_CROS) += bootmeth_cros.o
obj-$(CONFIG_$(PHASE_)BOOTMETH_FEL) += bootmeth_fel.o obj-$(CONFIG_$(PHASE_)BOOTMETH_FEL) += bootmeth_fel.o
obj-$(CONFIG_$(PHASE_)BOOTMETH_QFW) += bootmeth_qfw.o obj-$(CONFIG_$(PHASE_)BOOTMETH_QFW) += bootmeth_qfw.o

2
configs/khadas-vim3_android_ab_defconfig
View File

@@ -27,7 +27,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_BOOTMETH_ANDROID=y CONFIG_BOOTMETH_ANDROID=y
# CONFIG_BOOTMETH_EXTLINUX is not set # CONFIG_BOOTMETH_EXTLINUX is not set
# CONFIG_BOOTMETH_EXTLINUX_PXE 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_EFI_BOOTMGR is not set
# CONFIG_BOOTMETH_VBE is not set # CONFIG_BOOTMETH_VBE is not set
CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_LEGACY_IMAGE_FORMAT=y

2
configs/khadas-vim3_android_defconfig
View File

@@ -27,7 +27,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_BOOTMETH_ANDROID=y CONFIG_BOOTMETH_ANDROID=y
# CONFIG_BOOTMETH_EXTLINUX is not set # CONFIG_BOOTMETH_EXTLINUX is not set
# CONFIG_BOOTMETH_EXTLINUX_PXE 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_EFI_BOOTMGR is not set
# CONFIG_BOOTMETH_VBE is not set # CONFIG_BOOTMETH_VBE is not set
CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_LEGACY_IMAGE_FORMAT=y

2
configs/khadas-vim3l_android_ab_defconfig
View File

@@ -27,7 +27,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_BOOTMETH_ANDROID=y CONFIG_BOOTMETH_ANDROID=y
# CONFIG_BOOTMETH_EXTLINUX is not set # CONFIG_BOOTMETH_EXTLINUX is not set
# CONFIG_BOOTMETH_EXTLINUX_PXE 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_EFI_BOOTMGR is not set
# CONFIG_BOOTMETH_VBE is not set # CONFIG_BOOTMETH_VBE is not set
CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_LEGACY_IMAGE_FORMAT=y

2
configs/khadas-vim3l_android_defconfig
View File

@@ -27,7 +27,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_BOOTMETH_ANDROID=y CONFIG_BOOTMETH_ANDROID=y
# CONFIG_BOOTMETH_EXTLINUX is not set # CONFIG_BOOTMETH_EXTLINUX is not set
# CONFIG_BOOTMETH_EXTLINUX_PXE 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_EFI_BOOTMGR is not set
# CONFIG_BOOTMETH_VBE is not set # CONFIG_BOOTMETH_VBE is not set
CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_LEGACY_IMAGE_FORMAT=y