From 7742aa65a89c28577e9674d688c34cf865587076 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marex@denx.de>
Date: Sat, 29 Sep 2012 18:16:28 +0200
Subject: [PATCH] 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>
---
common/Makefile | 1 -
drivers/serial/Makefile | 4 ++++
{common => drivers/serial}/serial.c | 0
3 files changed, 4 insertions(+), 1 deletion(-)
rename {common => drivers/serial}/serial.c (100%)
diff --git a/common/Makefile b/common/Makefile
index 33c606abb2..abca820726 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 afaddeaa26..a8b500b222 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
similarity index 100%
rename from common/serial.c
rename to drivers/serial/serial.c
--
2.39.5