diff options
| author | Tom Rini <[email protected]> | 2025-11-03 11:52:09 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-11-03 13:18:22 -0600 |
| commit | 28b81c07beec2b6bfc08b36bd4ba87699a9a4280 (patch) | |
| tree | 71c6da17478492d874dbb7ab476a040315fdf67a /arch | |
| parent | 9ccda31f54881d3321263a81599454a1d6efb65e (diff) | |
| parent | 1dde581e1affbbfad285a75b892cbebaa3f0bf19 (diff) | |
Merge patch series "Remove usage of CMD_BOOTx from SPL code"
Anshul Dalal <[email protected]> says:
Hi all,
We currently make use of CMD_BOOTI and CMD_BOOTZ in the SPL boot flow in
falcon mode, this isn't correct since all CMD_* configs are only meant
for U-Boot proper and not the SPL.
Therefore this patch set adds new LIB_BOOT[IMZ] configs that allow for
more granular selection of their respective compilation targets.
Additionally, this also allows us to more easily disable support for
raw images from secure falcon mode (SPL_OS_BOOT_SECURE) by doing the
following:
config LIB_SPL_BOOTI
...
depends on SPL_OS_BOOT && !SPL_OS_BOOT_SECURE
...
Link: https://lore.kernel.org/r/[email protected]
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/lib/Makefile | 10 | ||||
| -rw-r--r-- | arch/riscv/lib/Makefile | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index ade42d0ca43..05263eadad0 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -7,6 +7,10 @@ lib-$(CONFIG_USE_PRIVATE_LIBGCC) += ashldi3.o ashrdi3.o lshrdi3.o \ lib1funcs.o uldivmod.o div0.o \ div64.o muldi3.o +obj-$(CONFIG_$(PHASE_)LIB_BOOTI) += image.o +obj-$(CONFIG_$(PHASE_)LIB_BOOTZ) += zimage.o +obj-$(CONFIG_$(PHASE_)LIB_BOOTM) += bootm.o + ifdef CONFIG_CPU_V7M obj-y += vectors_m.o crt0.o else ifdef CONFIG_ARM64 @@ -30,15 +34,9 @@ endif obj-$(CONFIG_CPU_V7M) += cmd_boot.o obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o -obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o obj-$(CONFIG_CMD_BOOTM) += bootm.o -obj-$(CONFIG_CMD_BOOTZ) += bootm.o zimage.o else obj-$(CONFIG_$(PHASE_)FRAMEWORK) += spl.o -ifdef CONFIG_SPL_FRAMEWORK -obj-$(CONFIG_CMD_BOOTI) += image.o -obj-$(CONFIG_CMD_BOOTZ) += zimage.o -endif obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o endif ifdef CONFIG_ARM64 diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile index db8d235c699..f1f50918eff 100644 --- a/arch/riscv/lib/Makefile +++ b/arch/riscv/lib/Makefile @@ -6,8 +6,8 @@ # Copyright (C) 2017 Andes Technology Corporation # Rick Chen, Andes Technology Corporation <[email protected]> -obj-$(CONFIG_CMD_BOOTM) += bootm.o -obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o +obj-$(CONFIG_$(PHASE_)LIB_BOOTM) += bootm.o +obj-$(CONFIG_$(PHASE_)LIB_BOOTI) += image.o obj-$(CONFIG_CMD_GO) += boot.o obj-y += cache.o obj-$(CONFIG_SIFIVE_CACHE) += sifive_cache.o |