[U-Boot] [PATCH 66/71] serial: Unconditionally enable CONFIG_SERIAL_MULTI

Marek Vasut
2012-09-16T23:21:31Z

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>
---
common/Makefile | 2 +-
config.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/Makefile b/common/Makefile
index 57da76f..8b1ee5d 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

# core command
@@ -195,6 +194,7 @@ COBJS-y += dlmalloc.o
COBJS-y += image.o
COBJS-y += memsize.o
COBJS-y += stdio.o
+COBJS-$(CONFIG_SERIAL_MULTI) += serial.o

COBJS := $(sort $(COBJS-y))
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)
--
1.7.10.4