ppc4xx: Remove now unused CONFIG_UART1_CONSOLE
PATCH 1/1 ppc4xx: Remove now unused CONFIG_UART1_CONSOLE
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.
--- README | 7 ------- common/serial.c | 5 +---- drivers/serial/serial_netarm.c | 5 ----- 3 files changed, 1 insertions(+), 16 deletions(-)
README +0 -7
@@ -544,13 +544,6 @@ The following options need to be configured: Leave undefined to disable this feature, including disable the buffer and hardware handshake. -- Console UART Number: - CONFIG_UART1_CONSOLE - - AMCC PPC4xx only. - If defined internal UART1 (and not UART0) is used - as default U-Boot console. - - Boot Delay: CONFIG_BOOTDELAY - in seconds Delay before automatically booting the default image; set to -1 to disable autoboot.
common/serial.c +1 -4
@@ -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; +return &serial0_device;#endif #elif defined(CONFIG_MPC512X)#if (CONFIG_PSC_CONSOLE ==3 )
drivers/serial/serial_netarm.c +0 -5
@@ -51,13 +51,8 @@ DECLARE_GLOBAL_DATA_PTR; } -#ifndef CONFIG_UART1_CONSOLE volatile netarm_serial_channel_t *serial_reg_ch1 =get_serial_channel (0 );volatile netarm_serial_channel_t *serial_reg_ch2 =get_serial_channel (1 ); -#else -volatile netarm_serial_channel_t *serial_reg_ch1 =get_serial_channel (1 ); -volatile netarm_serial_channel_t *serial_reg_ch2 =get_serial_channel (0 ); -#endif extern void _netarm_led_FAIL1 (void );
Signature · 1 line
1.7.3
PATCH 1/1 ppc4xx: Remove now unused CONFIG_UART1_CONSOLE
Quoted 3 lines · On Tuesday 21 September 2010 10:53:10 Stefan Roese wrote:
CONFIG_UART1_CONSOLEwas 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.
Applied to u-boot-ppc4xx/next. 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
PATCH 1/1 ppc4xx: Remove now unused CONFIG_UART1_CONSOLE
In reply to Stefan RoeseDear Stefan Roese,
Quoted 10 lines · In message <[email protected]> you wrote:
CONFIG_UART1_CONSOLEwas 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 <[email protected]>--- 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.
common/serial.c struct serial_device *__default_serial_console (void) · line 60
Quoted 13 lines
README +0
-0set to -1 to disable autoboot.common/serial.c +0
-4@@ -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
Signature · 5 lines
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
PATCH 1/1 ppc4xx: Remove now unused CONFIG_UART1_CONSOLE
Hi Wolfgang,
Quoted 9 lines · 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-voidThe warning is actually an uncaught error (which is not a surprize in this mess^H^H^H^Hmaze of #ifdeffery.
Yes, pretty ugly.
Quoted 12 lines
Quoted 12 lines
README +0
-0set to -1 to disable autoboot.common/serial.c +0
-0@@ -54,10 +54,7 @@ struct serial_device *__default_serial_console (void)#else #error "Bad CONFIG_CONS_INDEX."#endif
Quoted 7 lines
common/serial.c struct serial_device *__default_serial_console (void) · line 60
Quoted 4 lines
common/serial.c +0
-4-#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