diff options
author | Simon Glass <sjg@chromium.org> | 2015-10-17 19:41:26 -0600 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2015-11-04 14:49:53 +0100 |
commit | 325c8d569ea9358ee3952984ec55961efab6d602 (patch) | |
tree | 97a5c495f5bb811b15dad5bcc2d5049a979b4814 /drivers/serial/serial_zynq.c | |
parent | c2490bf546d0312674db2afb4ba117d4e48c9ac1 (diff) | |
download | u-boot-325c8d569ea9358ee3952984ec55961efab6d602.tar.gz |
arm: zynq: serial: Drop non-device-tree serial driver portions
Since we use device tree in SPL also, we can drop this code.
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'drivers/serial/serial_zynq.c')
-rw-r--r-- | drivers/serial/serial_zynq.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index 3b12c01538..926ba51dbb 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -195,7 +195,6 @@ DECLARE_PSSERIAL_FUNCTIONS(1); static struct serial_device uart_zynq_serial1_device = INIT_PSSERIAL_STRUCTURE(1, "ttyPS1"); -#if CONFIG_IS_ENABLED(OF_CONTROL) __weak struct serial_device *default_serial_console(void) { const void *blob = gd->fdt_blob; @@ -218,20 +217,6 @@ __weak struct serial_device *default_serial_console(void) return NULL; } -#else -__weak struct serial_device *default_serial_console(void) -{ -#if defined(CONFIG_ZYNQ_SERIAL_UART0) - if (uart_zynq_ports[0]) - return &uart_zynq_serial0_device; -#endif -#if defined(CONFIG_ZYNQ_SERIAL_UART1) - if (uart_zynq_ports[1]) - return &uart_zynq_serial1_device; -#endif - return NULL; -} -#endif void zynq_serial_initialize(void) { |