From 82dda962f0a6449672df3378bb6b5fe54372a927 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 14 Sep 2012 23:20:05 +0200 Subject: [PATCH] serial: Unconditionally enable CONFIG_SERIAL_MULTI 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 Cc: Marek Vasut Cc: Tom Rini --- config.mk | 2 +- drivers/serial/Makefile | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/config.mk b/config.mk index 51b47838cf..9099c1111e 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__ + -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 a8b500b222..cc1445352b 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 -- 2.39.5