Compile common/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 marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Anatolij Gustschin agust@denx.de Cc: Stefan Roese sr@denx.de --- common/Makefile | 2 +- config.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/Makefile b/common/Makefile index 8b1ee5d..7f63f09 100644 --- a/common/Makefile +++ b/common/Makefile @@ -194,7 +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-y += serial.o
COBJS := $(sort $(COBJS-y)) diff --git a/config.mk b/config.mk index 88c72f1..c3822a2 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__ -DCONFIG_SERIAL_MULTI + -D__KERNEL__
# Enable garbage collection of un-used sections for SPL ifeq ($(CONFIG_SPL_BUILD),y)