From c1f5805a9dd5ea50b108e1d39a16edf710ea17e6 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 14 Sep 2012 23:46:48 +0200 Subject: 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 Cc: Marek Vasut Cc: Tom Rini Cc: Anatolij Gustschin Cc: Stefan Roese --- config.mk | 2 +- drivers/serial/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.mk b/config.mk index 9099c1111e..51b47838cf 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 cc1445352b..3c32f97abb 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 -- cgit v1.2.1