On Tue, Aug 06, 2013 at 01:28:53PM -0500, Dan Murphy wrote:
> On 08/02/2013 03:26 PM, Tom Rini wrote:
> > With device trees, boards do not always set CONFIG_MACH_TYPE now, so we
> > must not rely on this define being set. The kernel uses ~0 to see if we
> > have a valid machine number or not, so set that as the default, invalid
> > machine, id and only fix if CONFIG_MACH_TYPE is set.
> >
> > Cc: Albert ARIBAUD <albert.u.b...@aribaud.net>
> > Signed-off-by: Tom Rini <tr...@ti.com>
> > ---
> > arch/arm/lib/spl.c | 7 ++++++-
> > 1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
> > index 583bdb3..26d0be4 100644
> > --- a/arch/arm/lib/spl.c
> > +++ b/arch/arm/lib/spl.c
> > @@ -45,12 +45,17 @@ void __weak board_init_f(ulong dummy)
> > #ifdef CONFIG_SPL_OS_BOOT
> > void __noreturn jump_to_image_linux(void *arg)
> > {
> > + unsigned long machid = 0xffffffff;
> > +#ifdef CONFIG_MACH_TYPE
> > + machid = CONFIG_MACH_TYPE;
> > +#endif
> > +
> > debug("Entering kernel arg pointer: 0x%p\n", arg);
> > typedef void (*image_entry_arg_t)(int, int, void *)
> > __attribute__ ((noreturn));
> > image_entry_arg_t image_entry =
> > (image_entry_arg_t) spl_image.entry_point;
> > cleanup_before_linux();
> > - image_entry(0, CONFIG_MACH_TYPE, arg);
> > + image_entry(0, machid, arg);
> > }
> > #endif
> The code looks fine just don't see how it is part of the "common"
> patch set seriesUncovered porting omap5 platforms over as they do not set CONFIG_MACH_TYPE (and no need to start). -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
