Skip to content
Snippets Groups Projects
Commit a759f1e0 authored by Allen Martin's avatar Allen Martin Committed by Tom Warren
Browse files

SPL: make jump_to_image_no_args a weak symbol


Change jump_to_image_no_args() to a weak symbol to allow override by
SoC specific code.  This is required by tegra because the SPL runs on
a different CPU from the image it is loading, so tegra specific
initialization is required to start the host CPU.  Pass in spl_image
as a parameter for the same reason.

Signed-off-by: default avatarAllen Martin <amartin@nvidia.com>
Acked-by: default avatarTom Rini <trini@ti.com>
Acked-by: default avatarSimon Glass <sjg@chromium.org>
Tested-by: default avatarSimon Glass <sjg@chromium.org>
Signed-off-by: default avatarTom Warren <twarren@nvidia.com>
parent a2ab6b7d
No related branches found
No related tags found
No related merge requests found
......@@ -113,13 +113,13 @@ void spl_parse_image_header(const struct image_header *header)
}
}
static void __noreturn jump_to_image_no_args(void)
__weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
{
typedef void __noreturn (*image_entry_noargs_t)(u32 *);
image_entry_noargs_t image_entry =
(image_entry_noargs_t) spl_image.entry_point;
(image_entry_noargs_t) spl_image->entry_point;
debug("image entry point: 0x%X\n", spl_image.entry_point);
debug("image entry point: 0x%X\n", spl_image->entry_point);
/* Pass the saved boot_params from rom code */
#if defined(CONFIG_VIRTIO) || defined(CONFIG_ZEBU)
image_entry = (image_entry_noargs_t)0x80100000;
......@@ -223,7 +223,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
default:
debug("Unsupported OS image.. Jumping nevertheless..\n");
}
jump_to_image_no_args();
jump_to_image_no_args(&spl_image);
}
/*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment