diff options
| author | Marek Vasut <marex@denx.de> | 2012-09-29 18:16:28 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-15 11:53:58 -0700 |
| commit | 7742aa65a89c28577e9674d688c34cf865587076 (patch) | |
| tree | dd2a82cd09821b42d0aafea8da81a2063920f35b | |
| parent | 19b8fa0b61afbb46fc7429b9a2514e10b3297738 (diff) | |
| download | olio-uboot-2014.01-7742aa65a89c28577e9674d688c34cf865587076.tar.xz olio-uboot-2014.01-7742aa65a89c28577e9674d688c34cf865587076.zip | |
serial: Move common/serial.c to drivers/serial/
Move the common/serial.c into driver/serial/, since this file
provides serial multiplexing functions and it is imperative to
be linked with libserial.o instead of libcommon.o.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>
| -rw-r--r-- | common/Makefile | 1 | ||||
| -rw-r--r-- | drivers/serial/Makefile | 4 | ||||
| -rw-r--r-- | drivers/serial/serial.c (renamed from common/serial.c) | 0 |
3 files changed, 4 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile index 33c606abb..abca82072 100644 --- a/common/Makefile +++ b/common/Makefile @@ -32,7 +32,6 @@ COBJS-y += command.o COBJS-y += exports.o COBJS-$(CONFIG_SYS_HUSH_PARSER) += hush.o COBJS-y += s_record.o -COBJS-$(CONFIG_SERIAL_MULTI) += serial.o COBJS-y += xyzModem.o COBJS-y += cmd_disk.o diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index afaddeaa2..a8b500b22 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -25,6 +25,10 @@ include $(TOPDIR)/config.mk LIB := $(obj)libserial.o +ifndef CONFIG_SPL_BUILD +COBJS-$(CONFIG_SERIAL_MULTI) += serial.o +endif + COBJS-$(CONFIG_ALTERA_UART) += altera_uart.o COBJS-$(CONFIG_ALTERA_JTAG_UART) += altera_jtag_uart.o COBJS-$(CONFIG_ARM_DCC) += arm_dcc.o diff --git a/common/serial.c b/drivers/serial/serial.c index acb74af96..acb74af96 100644 --- a/common/serial.c +++ b/drivers/serial/serial.c |