diff options
| author | Allen Martin <amartin@nvidia.com> | 2012-10-19 21:08:22 +0000 |
|---|---|---|
| committer | Tom Warren <twarren@nvidia.com> | 2012-10-29 09:07:05 -0700 |
| commit | a759f1e0db7be05ab562e060cf024af262920426 (patch) | |
| tree | fdabce14ef333f6d1b8e40912d07684cbf8ae7cd /common | |
| parent | a2ab6b7d320423ab4d925d75c588c2a13fce61c6 (diff) | |
| download | u-boot-imx-a759f1e0db7be05ab562e060cf024af262920426.zip u-boot-imx-a759f1e0db7be05ab562e060cf024af262920426.tar.gz u-boot-imx-a759f1e0db7be05ab562e060cf024af262920426.tar.bz2 | |
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: Allen Martin <amartin@nvidia.com>
Acked-by: Tom Rini <trini@ti.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 0d829c0..f068abd 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -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); } /* |