aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2010-09-21 10:24:36 +0200
committerStefan Roese <sr@denx.de>2010-09-23 09:02:05 +0200
commite3c78c9b3c6a984934f98d3d622618edaa149fbd (patch)
tree289a153d11f6156810326b03c68ade54393ebdd4
parent550650ddd0fde00f245bc3da72d7272844198394 (diff)
downloadu-boot-linaro-stable-e3c78c9b3c6a984934f98d3d622618edaa149fbd.tar.gz
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. Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--README7
-rw-r--r--common/serial.c5
-rw-r--r--drivers/serial/serial_netarm.c5
3 files changed, 1 insertions, 16 deletions
diff --git a/README b/README
index aa11c3774..c7a8e9ddf 100644
--- a/README
+++ b/README
@@ -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.
diff --git a/common/serial.c b/common/serial.c
index dbc74bd58..25b235aa1 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;
+ return &serial0_device;
#endif
#elif defined(CONFIG_MPC512X)
#if (CONFIG_PSC_CONSOLE == 3)
diff --git a/drivers/serial/serial_netarm.c b/drivers/serial/serial_netarm.c
index 2eb539340..d04790d27 100644
--- a/drivers/serial/serial_netarm.c
+++ b/drivers/serial/serial_netarm.c
@@ -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);