diff options
| author | Tom Rini <[email protected]> | 2025-11-03 11:52:09 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-11-03 11:52:09 -0600 |
| commit | 2c16b803b82ace18077f08de58c6a079a94faa0f (patch) | |
| tree | e2986d50012b80fd59154994ac050a016c9f60d6 /common | |
| 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 'common')
| -rw-r--r-- | common/spl/Kconfig | 16 | ||||
| -rw-r--r-- | common/spl/spl.c | 5 |
2 files changed, 19 insertions, 2 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 24d6ce5d739..6027f24b1fe 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1216,6 +1216,22 @@ config SPL_OS_BOOT_SECURE to use falcon mode by disabling certain inherently non-securable options in the SPL boot flow. +config SPL_BOOTZ + bool "Allow booting a zImage style Linux kernel from SPL" + depends on SPL_OS_BOOT && !SPL_OS_BOOT_SECURE + default y if ARM && !ARM64 + select SPL_LIB_BOOTZ + help + Boot a linux zimage from memory in falcon boot. + +config SPL_BOOTI + bool "Allow booting an Image style Linux kernel from SPL" + depends on SPL_OS_BOOT && !SPL_OS_BOOT_SECURE + default y if ARM64 || RISCV + select SPL_LIB_BOOTI + help + Boot an uncompressed linux kernel image from memory in falcon boot. + config SPL_OS_BOOT_ARGS bool "Allow SPL to load args for kernel in falcon mode" depends on (SPL_OS_BOOT || SPL_LOAD_FIT_OPENSBI_OS_BOOT) && !SPL_OS_BOOT_SECURE diff --git a/common/spl/spl.c b/common/spl/spl.c index 64313cb8dfe..4dae3d0940d 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -340,7 +340,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 (IS_ENABLED(CONFIG_SPL_OS_BOOT) && IS_ENABLED(CONFIG_SPL_BOOTI)) { ulong start, size; if (!booti_setup((ulong)header, &start, &size, 0)) { @@ -354,7 +354,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 (IS_ENABLED(CONFIG_SPL_OS_BOOT) && + IS_ENABLED(CONFIG_SPL_BOOTZ)) { ulong start, end; if (!bootz_setup((ulong)header, &start, &end)) { |