ARM: relocation: don't undef CONFIG_SYS_ARM_WITHOUT_RELOC

[u-boot] / common / serial.c

diff --git a/common/serial.c b/common/serial.c
index dbc74bd58011633ff8a76182a61dabbc17148c03..7bebc12a66d0c077aecd78cbf960c0f507f205a9 100644 (file)
--- a/common/serial.c
+++ b/common/serial.c
@@ -54,10 +54,8 @@ 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)