[U-Boot] [PATCH] ppc4xx: Remove now unused CONFIG_UART1_CONSOLE
Stefan Roese
sr at denx.de
Wed Oct 6 17:38:04 CEST 2010
Hi Wolfgang,
On Wednesday 06 October 2010 16:35:38 Wolfgang Denk wrote:
> This commit breaks some boards, for example:
>
> -> ./MAKEALL TB5200
> Configuring for TB5200 board...
> serial.c: In function '__default_serial_console':
> serial.c:94: warning: no return statement in function returning non-void
>
> The warning is actually an uncaught error (which is not a surprize in
> this mess^H^H^H^Hmaze of #ifdeffery.
Yes, pretty ugly.
> > set to -1 to disable autoboot.
> >
> > diff --git a/common/serial.c b/common/serial.c
> > index dbc74bd..25b235a 100644
> > --- a/common/serial.c
> > +++ b/common/serial.c
> > @@ -54,10 +54,7 @@ struct serial_device *__default_serial_console (void)
> >
> > #else
> > #error "Bad CONFIG_CONS_INDEX."
> > #endif
> >
> > -#elif defined(CONFIG_UART1_CONSOLE)
> > - return &serial1_device;
> > -#else
> > - return &serial0_device;
>
> I think you should not remove the "#else" and "return
> &serial0_device;" lines here (but I may be wrong).
I'll check and send a patch to fix this. Thanks.
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de
More information about the U-Boot
mailing list