From 2ffe3ef03daeebe9a0f43a67c12399d6b20481c8 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 31 May 2025 10:44:08 +0100 Subject: [PATCH] boot: Use BOOT for pulling in bootm files The bootm.c and bootm_os.c files are used by various boot commands, not just bootm. Update the Makefile condition to use CONFIG_BOOT instead of CONFIG_CMD_BOOTM so that this code can be used when CMDLINE is disabled. Signed-off-by: Simon Glass --- boot/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/boot/Makefile b/boot/Makefile index 641f5921181..2b41b92230d 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -6,11 +6,9 @@ ifndef CONFIG_XPL_BUILD obj-$(CONFIG_BOOT_RETRY) += bootretry.o -obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o -obj-$(CONFIG_CMD_BOOTZ) += bootm.o bootm_os.o -obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o +obj-$(CONFIG_BOOT) += bootm.o bootm_os.o -obj-$(CONFIG_PXE_UTILS) += bootm.o pxe_utils.o +obj-$(CONFIG_PXE_UTILS) += pxe_utils.o endif @@ -30,7 +28,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_CROS) += bootm.o bootm_os.o bootmeth_cros.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 obj-$(CONFIG_$(PHASE_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o