[U-Boot] [PATCH 4/6] console & omap-common/spl: Enable use of eserial

[Marek Vasut]

Dear Andrew Bradford,

> Dear Marek Vasut,
> 
> On Thu, 27 Sep 2012 18:34:18 +0200
> 
> Marek Vasut <marex at denx.de> wrote:
> > Dear Andrew Bradford,
> > 
> > > Enable use of eserial devices for common and omap-common/spl.
> > > 
> > > This probably isn't the right way to do this as the changes aren't
> > > needed for 'common' configurations, just for one case.
> > > 
> > > Signed-off-by: Andrew Bradford <andrew at bradfordembedded.com>
> > > ---
> > > 
> > >  arch/arm/cpu/armv7/omap-common/spl.c |    7 ++++++-
> > >  common/console.c                     |   24
> > > 
> > > ++++++++++++++++++++---- include/common.h                     |
> > > 5 +++++ 3 files changed, 31 insertions(+), 5 deletions(-)
> > > 
> > > diff --git a/arch/arm/cpu/armv7/omap-common/spl.c
> > > b/arch/arm/cpu/armv7/omap-common/spl.c index 4d1ac85..6258c0e 100644
> > > --- a/arch/arm/cpu/armv7/omap-common/spl.c
> > > +++ b/arch/arm/cpu/armv7/omap-common/spl.c
> > > @@ -210,7 +210,12 @@ void preloader_console_init(void)
> > > 
> > >  	gd->flags |= GD_FLG_RELOC;
> > >  	gd->baudrate = CONFIG_BAUDRATE;
> > > 
> > > -	serial_init();		/* serial communications
> > > setup */
> > > +	/* serial communications setup */
> > > +#ifdef CONFIG_SERIAL_MULTI
> > > +	ESERIAL_FUNC(CONFIG_CONS_INDEX, init)();
> > 
> > Uh, if you implement default_serial_console properly(), you won't
> > need this. Actually, I'm in the process of rolling out V2 of my
> > serial patchset, which will make your life much more easier. Can you
> > rebase the patchset on my series? I'll poke you about it.
> 
> I see that your serial patches have made it into u-boot/next, should I
> rebase this patch set with the requested changes on top of u-boot/next
> and resubmit?

Yes

> Sorry, I'm not entirely clear on the role /next plays.

Simple. Merge window for current release is long closed, anything that goes into 
next release is in /next. The /master branch is now only being tested and only 
stabilization patches are accepted.

> Or is it recommended to rebase my changes on top of the tree I worked
> with before but with your serial patches applied?  Or some other method?

Rebase on next please. Thanks!

> Thanks,
> Andrew

Best regards,
Marek Vasut