[U-Boot] [PATCH 67/72] serial: Unconditionally enable CONFIG_SERIAL_MULTI

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

Enable CONFIG_SERIAL_MULTI for all builds of U-Boot. That includes
both SPL builds and non-SPL builds, everything. To avoid poluting
this patch with removal of ifdef-endif constructions containing
CONFIG_SERIAL_MULTI, the CONFIG_SERIAL_MULTI is temporarily added
into CPPFLAGS in config.mk . This will be again removed in following
patch.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>
---
config.mk | 2 +-
drivers/serial/Makefile | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/config.mk b/config.mk
index c3822a2..88c72f1 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__
+ -D__KERNEL__ -DCONFIG_SERIAL_MULTI

# 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 1491d43..9b54c12 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -25,9 +25,7 @@ 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
--
1.7.10.4