[U-Boot] [PATCH] ppc4xx: Remove now unused CONFIG_UART1_CONSOLE

[Wolfgang Denk]

Dear Stefan Roese,

In message <1285059190-10056-1-git-send-email-sr at denx.de> you wrote:
> CONFIG_UART1_CONSOLE was a PPC4xx specific implementation and is now
> removed since the move from the 4xx UART driver to the common NS16550
> UART driver. Let's remove all references to this define now.
> 
> Signed-off-by: Stefan Roese <sr at denx.de>
> ---
>  README                         |    7 -------
>  common/serial.c                |    5 +----
>  drivers/serial/serial_netarm.c |    5 -----
>  3 files changed, 1 insertions(+), 16 deletions(-)

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.


>  		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).

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
First study the enemy.  Seek weakness.
	-- Romulan Commander, "Balance of Terror", stardate 1709.2