diff options
author | SRICHARAN R | 2013-04-23 19:41:24 -0500 |
---|---|---|
committer | Tom Rini | 2013-05-10 07:25:56 -0500 |
commit | 4a0eb75752167bef51993307a10677295cef315b (patch) | |
tree | e1bb753ed7ebfe79ba34c373a2164e42faaa4cdd /common | |
parent | fda06812a068f916f64d9d1b3d1730e8213195b3 (diff) | |
download | u-boot-4a0eb75752167bef51993307a10677295cef315b.tar.gz u-boot-4a0eb75752167bef51993307a10677295cef315b.tar.xz u-boot-4a0eb75752167bef51993307a10677295cef315b.zip |
ARM: OMAP: Cleanup boot parameters usage
The boot parameters are read from individual variables
assigned for each of them. This been corrected and now
they are stored as a part of the global data 'gd'
structure. So read them from 'gd' instead.
Signed-off-by: Sricharan R <r.sricharan@ti.com>
[trini: Add igep0033 hunk]
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'common')
-rw-r--r-- | common/spl/spl.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 6715e0d203..e6aa89bdd0 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c | |||
@@ -125,17 +125,13 @@ void spl_parse_image_header(const struct image_header *header) | |||
125 | 125 | ||
126 | __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) | 126 | __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) |
127 | { | 127 | { |
128 | typedef void __noreturn (*image_entry_noargs_t)(u32 *); | 128 | typedef void __noreturn (*image_entry_noargs_t)(void); |
129 | |||
129 | image_entry_noargs_t image_entry = | 130 | image_entry_noargs_t image_entry = |
130 | (image_entry_noargs_t) spl_image->entry_point; | 131 | (image_entry_noargs_t) spl_image->entry_point; |
131 | 132 | ||
132 | debug("image entry point: 0x%X\n", spl_image->entry_point); | 133 | debug("image entry point: 0x%X\n", spl_image->entry_point); |
133 | /* Pass the saved boot_params from rom code */ | 134 | image_entry(); |
134 | #if defined(CONFIG_VIRTIO) || defined(CONFIG_ZEBU) | ||
135 | image_entry = (image_entry_noargs_t)0x80100000; | ||
136 | #endif | ||
137 | u32 boot_params_ptr_addr = (u32)&boot_params_ptr; | ||
138 | image_entry((u32 *)boot_params_ptr_addr); | ||
139 | } | 135 | } |
140 | 136 | ||
141 | #ifdef CONFIG_SPL_RAM_DEVICE | 137 | #ifdef CONFIG_SPL_RAM_DEVICE |