[U-Boot] [PATCH 71/72] serial: Compile drivers/serial/serial.c by default

Marek Vasut
2012-09-29T21:53:04Z

Compile drivers/serial/serial.c by default both into SPL and into
non-SPL builds, since CONFIG_SERIAL_MULTI is now the default state.
Also having common/serial.c in by default now, it's pointless to keep
-DCONFIG_SERIAL_MULTI in CPPFLAGS any longer, so remove it as well.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefan Roese <sr@denx.de>
---
config.mk | 2 +-
drivers/serial/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.mk b/config.mk
index 88c72f1..c3822a2 100644
--- a/config.mk
+++ b/config.mk
@@ -193,7 +193,7 @@ OBJCFLAGS += --gap-fill=0xff
gccincdir := $(shell $(CC) -print-file-name=include)

CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS) \
- -D__KERNEL__ -DCONFIG_SERIAL_MULTI
+ -D__KERNEL__

# Enable garbage collection of un-used sections for SPL
ifeq ($(CONFIG_SPL_BUILD),y)
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 9b54c12..0eaf227 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk

LIB := $(obj)libserial.o

-COBJS-$(CONFIG_SERIAL_MULTI) += serial.o
+COBJS-y += serial.o

COBJS-$(CONFIG_ALTERA_UART) += altera_uart.o
COBJS-$(CONFIG_ALTERA_JTAG_UART) += altera_jtag_uart.o
--
1.7.10.4