summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-11-05 07:42:00 -0700
committerTom Rini <trini@ti.com>2012-11-05 07:42:00 -0700
commit6acc7c3cbc05873d62118640cf964e9c9665804c (patch)
tree448da0bf67e0c4fa2ff033a67036ef96c7530697 /common
parenta6e8dcaf350fe8e780e29c57ececfece039725c7 (diff)
parent46d626d3926cf6b9f9c477782c5a0ee620a424cd (diff)
downloadu-boot-imx-6acc7c3cbc05873d62118640cf964e9c9665804c.zip
u-boot-imx-6acc7c3cbc05873d62118640cf964e9c9665804c.tar.gz
u-boot-imx-6acc7c3cbc05873d62118640cf964e9c9665804c.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl.c8
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);
}
/*