brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

SPL: make jump_to_image_no_args a weak symbol

Browse Source 
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>
This commit is contained in:
Allen Martin 2012-10-19 21:08:22 +00:00 committed by Tom Warren
parent a2ab6b7d32
commit a759f1e0db
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/spl/spl.c
View File

@ -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 *); typedef void __noreturn (*image_entry_noargs_t)(u32 *);
image_entry_noargs_t image_entry = 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 */ /* Pass the saved boot_params from rom code */
#if defined(CONFIG_VIRTIO) || defined(CONFIG_ZEBU) #if defined(CONFIG_VIRTIO) || defined(CONFIG_ZEBU)
image_entry = (image_entry_noargs_t)0x80100000; image_entry = (image_entry_noargs_t)0x80100000;
@ -223,7 +223,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
default: default:
debug("Unsupported OS image.. Jumping nevertheless..\n"); debug("Unsupported OS image.. Jumping nevertheless..\n");
} }
jump_to_image_no_args(); jump_to_image_no_args(&spl_image);
} }
/* /*