On Fri Mar 14, 2025 at 9:25 AM IST, Anshul Dalal wrote: > Using CMD_* configs from spl doesn't make logical sense. Therefore this > patch replaces the checks for CMD_BOOT[IZ] with newly added configs > SPL_HAS_BOOT[IZ]. > > SPL_HAS_BOOTZ is enabled by default for 32-bit ARM systems and > SPL_HAS_BOOTI is enabled by default for 64-bit ARM and RISCV. This > ensures configs relying on CMD_BOOT[IZ] in falcon boot still work. > > Signed-off-by: Anshul Dalal <ansh...@ti.com> > --- > Changes in v5: > * Remove imply clause for CMD_BOOTZ instead add default y for SPL_HAS_BOOTZ > * Update commit message to reflect the changes > * Remove 'More info' link > v4: https://lore.kernel.org/u-boot/20250313032842.1189977-1-ansh...@ti.com/ > Changes in v4: > * Don't set SPL_HAS_BOOTI for sandbox by default > * Updated prompts for SPL_HAS_BOOT[IZ] > * Removed check for SPL_HAS_FRAMEWORK from Makefile > v3: https://lore.kernel.org/u-boot/20250312124757.789013-1-ansh...@ti.com/ > Changes in v3: > * Add imply clause for CMD_BOOTZ to enable SPL_HAS_BOOTZ > * Fix broken check for bootz_setup > v2: https://lore.kernel.org/u-boot/20250312094241.629707-1-ansh...@ti.com/ > Changes in v2: > * Add SPL_HAS_BOOT[IZ] configs > v1: https://lore.kernel.org/u-boot/20250311093709.3372104-1-ansh...@ti.com/ > --- > arch/arm/lib/Makefile | 6 ++---- > common/spl/Kconfig | 14 ++++++++++++++ > common/spl/spl.c | 5 +++-- > 3 files changed, 19 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile > index 1c95dd6fed2..e409f7a7947 100644 > --- a/arch/arm/lib/Makefile > +++ b/arch/arm/lib/Makefile > @@ -35,10 +35,8 @@ 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_SPL_HAS_BOOTI) += image.o > +obj-$(CONFIG_SPL_HAS_BOOTZ) += zimage.o > obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o > endif > ifdef CONFIG_ARM64 > diff --git a/common/spl/Kconfig b/common/spl/Kconfig > index 21a5cefee7a..1d690bee389 100644 > --- a/common/spl/Kconfig > +++ b/common/spl/Kconfig > @@ -1153,6 +1153,20 @@ config SPL_OS_BOOT > Enable booting directly to an OS from SPL. > for more info read doc/README.falcon > > +config SPL_HAS_BOOTZ > + bool "Allow booting a zImage style Linux kernel from SPL" > + depends on SPL_OS_BOOT > + default y if ARM && !ARM64 > + help > + Boot a linux zimage from memory in falcon boot. > + > +config SPL_HAS_BOOTI > + bool "Allow booting an Image style Linux kernel from SPL" > + depends on SPL_OS_BOOT > + default y if ARM64 || RISCV > + help > + Boot an uncompressed linux kernel image from memory in falcon boot. > + > config SPL_PAYLOAD_ARGS_ADDR > hex "Address in memory to load 'args' file for Falcon Mode to" > depends on SPL_OS_BOOT || SPL_LOAD_FIT_OPENSBI_OS_BOOT > diff --git a/common/spl/spl.c b/common/spl/spl.c > index 76fd56dfe4b..445c3ef24fe 100644 > --- a/common/spl/spl.c > +++ b/common/spl/spl.c > @@ -335,7 +335,7 @@ int spl_parse_image_header(struct spl_image_info > *spl_image, > panic("** no mkimage signature but raw image not supported"); > } > > - if (CONFIG_IS_ENABLED(OS_BOOT) && IS_ENABLED(CONFIG_CMD_BOOTI)) { > + if (CONFIG_IS_ENABLED(OS_BOOT) && IS_ENABLED(CONFIG_SPL_HAS_BOOTI)) { > ulong start, size; > > if (!booti_setup((ulong)header, &start, &size, 0)) { > @@ -349,7 +349,8 @@ int spl_parse_image_header(struct spl_image_info > *spl_image, > spl_image->load_addr, spl_image->size); > return 0; > } > - } else if (CONFIG_IS_ENABLED(OS_BOOT) && IS_ENABLED(CONFIG_CMD_BOOTZ)) { > + } else if (CONFIG_IS_ENABLED(OS_BOOT) && > + IS_ENABLED(CONFIG_SPL_HAS_BOOTZ)) { > ulong start, end; > > if (!bootz_setup((ulong)header, &start, &end)) {
Superseded by v6: https://lore.kernel.org/u-boot/20250403215522.1284502-1-ansh...@ti.com/ Anshul
