diff options
Diffstat (limited to 'common/serial.c')
| -rw-r--r-- | common/serial.c | 15 | 
1 files changed, 2 insertions, 13 deletions
| diff --git a/common/serial.c b/common/serial.c index 1345c08ae..25b235aa1 100644 --- a/common/serial.c +++ b/common/serial.c @@ -38,8 +38,7 @@ struct serial_device *__default_serial_console (void)  #elif defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) \     || defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4)  	return &serial_scc_device; -#elif defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \ -   || defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_405EX) \ +#elif defined(CONFIG_4xx) \     || defined(CONFIG_MB86R0x) || defined(CONFIG_MPC5xxx) \     || defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) \     || defined(CONFIG_MPC86xx) || defined(CONFIG_SYS_SC520) @@ -55,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) @@ -127,13 +123,6 @@ void serial_initialize (void)  	serial_register (&serial_scc_device);  #endif -#if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \ - || defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_405EX) \ - || defined(CONFIG_MPC5xxx) -	serial_register(&serial0_device); -	serial_register(&serial1_device); -#endif -  #if defined(CONFIG_SYS_NS16550_SERIAL)  #if defined(CONFIG_SYS_NS16550_COM1)  	serial_register(&eserial1_device); |