[U-Boot] [PATCH 4/5] ARM: OMAP: Cleanup boot parameters usage

Tom Rini
2013-04-15T15:35:27Z

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 04/15/2013 11:08 AM, Sricharan R wrote:
> 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> ---
> arch/arm/cpu/armv7/lowlevel_init.S | 8 ++++-
> arch/arm/cpu/armv7/omap-common/boot-common.c | 20 ++---------
> arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 46
> ++----------------------
> arch/arm/include/asm/arch-omap4/sys_proto.h | 11 ++----
> arch/arm/include/asm/arch-omap5/sys_proto.h | 12 ++-----
> arch/arm/include/asm/omap_common.h | 3 ++
> common/spl/spl.c | 12 ++++---
> include/configs/am335x_evm.h | 1 +
> include/configs/pcm051.h | 1 +
> include/configs/ti814x_evm.h | 1 +
> include/spl.h | 1 - 11 files
> changed, 32 insertions(+), 84 deletions(-)

I can live with adding CONFIG_OMAP to the am335/ti81* parts.

[snip]
> diff --git a/common/spl/spl.c b/common/spl/spl.c index
> 6715e0d..4a7ce42 100644 --- a/common/spl/spl.c +++
> b/common/spl/spl.c @@ -125,17 +125,21 @@ void
> spl_parse_image_header(const struct image_header *header)
>
> __weak void __noreturn jump_to_image_no_args(struct spl_image_info
> *spl_image) { +#ifdef CONFIG_OMAP typedef void __noreturn
> (*image_entry_noargs_t)(u32 *); +#else + typedef void __noreturn
> (*image_entry_noargs_t)(void); +#endif image_entry_noargs_t
> image_entry = (image_entry_noargs_t) 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; +#ifdef CONFIG_OMAP +
> image_entry((u32 *)&gd->arch.omap_boot_params); +#else +
> image_entry(); #endif - u32 boot_params_ptr_addr =
> (u32)&boot_params_ptr; - image_entry((u32 *)boot_params_ptr_addr);
> }

We must correct jump_to_image_no_args to really be, in the default
case here just image_entry() and have omap-common override the weak
function with one that passes along our params, and comment what's
going on.

- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRbB4/AAoJENk4IS6UOR1WeWgP/3YpBeHa7RCjfc1ZfHjHSX4T
RlULN42HhNG/pka7S/bTo83whcVLDYz3WXYLWDYO6YVCnpaU1dfV2SuXeKjJIA9M
rfB/q2pIc6Wnjcfzrazdh7LS1A/0iV3qe4AUBgkaVJdQX+q5WwJoHVjzp1WH7aOH
/iXUR9pnhPnv8Uc+DJwtoT9fnDH5TkeMeSkVKe2mJEYPbSiKhmPHfKDvwbX7VfPl
IAD6ifda7rApH4QTWFyFj+9MsfW/XkdILmg4JaGQU5Gp6DwVC2cmNS47br5d9WeV
dsY+vA8Fezw+/HT5Jq7HBAmhy+gu7x7gpnYs5IzOSlWS+32W6HWoPzo/CHcnCaGt
1ltB44KevYu5FCrBA4KlJsoMx9JR1yJukOv3ezEFe2G9PBPyylLwTJ0tkVJb0b2H
fJO2fPCWbOHzvIy5nIFFY0sE9YsnKu8PAxqPFYaJGeUWQL87kRo9E0ep72HUv/Ia
rrOD6KWgp6cHi1qrFqbnVctWbDKBjBCyd3kc1nhGSmZTSTUkd/9Z6ie3i+wOyYsO
yBtG9S6riJDcECcE8nOxXRfW973aqxkH7ybNn5ekbYdP8iHq+UgFx8rfhf73gaen
c07fmIZJxz7i0KXNTsjHGycDMq7UqsihrdX47C9kcrcFqxEWAcZc8kXBlM1Kura2
EX40u9fhgitYG8EG4GGo
=5qv1
-----END PGP SIGNATURE-----