diff options
| author | Marek Vasut <marex@denx.de> | 2012-09-14 23:20:05 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-15 11:53:58 -0700 |
| commit | 82dda962f0a6449672df3378bb6b5fe54372a927 (patch) | |
| tree | f2c351aefd33802811175a166f256cf0f79de2bb | |
| parent | 7742aa65a89c28577e9674d688c34cf865587076 (diff) | |
| download | u-boot-imx-82dda962f0a6449672df3378bb6b5fe54372a927.zip u-boot-imx-82dda962f0a6449672df3378bb6b5fe54372a927.tar.gz u-boot-imx-82dda962f0a6449672df3378bb6b5fe54372a927.tar.bz2 | |
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 <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>
| -rw-r--r-- | config.mk | 2 | ||||
| -rw-r--r-- | drivers/serial/Makefile | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -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 a8b500b..cc14453 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 |