aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-14 23:46:48 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:59 -0700
commitc1f5805a9dd5ea50b108e1d39a16edf710ea17e6 (patch)
tree699998fe042fe046c0bd182d60b7a4993c263b65
parent036036d79c8535342594ab362143416d6a9bd11e (diff)
downloadu-boot-linaro-stable-c1f5805a9dd5ea50b108e1d39a16edf710ea17e6.tar.gz
serial: Compile drivers/serial/serial.c by default
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>
-rw-r--r--config.mk2
-rw-r--r--drivers/serial/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/config.mk b/config.mk
index 9099c1111..51b47838c 100644
--- a/config.mk
+++ b/config.mk
@@ -194,7 +194,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 cc1445352..3c32f97ab 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