michael/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spl: set fdt address as spl_image arg in falcon mode

Browse Source 
The arg field of `struct spl_image_info` is used by jump_to_image_linux
as the argument for the kernel in falcon mode.

Since commit 601cebc29d ("cmd: spl: Remove ATAG support from this
command"), fdt is the only valid argument for kernel in falcon mode.

However fdt was only being set as the argument in nor and xip boot
modes, this patch fixes it for all boot modes and removes the now
redundant code from spl_nor and spl_xip.

Signed-off-by: Anshul Dalal <anshuld@ti.com>
This commit is contained in:
Anshul Dalal
2025-10-09 17:28:45 +05:30
committed by Tom Rini
parent 82e04e768f
commit f851171e14
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/spl/spl.c
View File

@@ -800,6 +800,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
fdt = spl_image_fdt_addr(&spl_image);
spl_fixup_fdt(fdt);
spl_board_prepare_for_linux();
spl_image.arg = fdt;
jumper = &jump_to_image_linux;
} else {
debug("Unsupported OS image.. Jumping nevertheless..\n");

4
common/spl/spl_nor.c
View File

@@ -69,10 +69,6 @@ static int spl_nor_load_image_os(struct spl_image_info *spl_image,
(void *)(CONFIG_SYS_OS_BASE + sizeof(struct legacy_img_hdr)),
spl_image->size);
#ifdef CONFIG_SPL_PAYLOAD_ARGS_ADDR
spl_image->arg = (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR;
#endif
return 0;
}
#endif

1
common/spl/spl_xip.c
View File

@@ -14,7 +14,6 @@ static int spl_xip(struct spl_image_info *spl_image,
{
#if CONFIG_IS_ENABLED(OS_BOOT)
if (!spl_start_uboot()) {
spl_image->arg = (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR;
spl_image->name = "Linux";
spl_image->os = IH_OS_LINUX;
spl_image->load_addr = CONFIG_SYS_LOAD_ADDR;