diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2018-04-07 16:06:22 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-11 13:22:05 -0400 |
| commit | a9d7990dc4bde63a30ebeb2f2f49f6e2b9283605 (patch) | |
| tree | 617340fa09a1bfb10df16181ddc46df2511b1677 /drivers/serial | |
| parent | 6ce3d67c70766ac9c8164e6c05c03894a108d487 (diff) | |
| download | u-boot-a9d7990dc4bde63a30ebeb2f2f49f6e2b9283605.tar.gz u-boot-a9d7990dc4bde63a30ebeb2f2f49f6e2b9283605.tar.bz2 u-boot-a9d7990dc4bde63a30ebeb2f2f49f6e2b9283605.zip | |
serial: Fix Makefile during SPL and TPL build
This patch fixes a situation where CONFIG_DM_SERIAL is enabled for
regular U-Boot and SPL, but not for TPL. In that case, the build
will try to include serial-uclass into the TPL nonetheless, because
CONFIG_DM_SERIAL is set.
The solution is to check if the build is for SPL or TPL and in that
case, check if CONFIG_$(SPL_TPL_)DM_SERIAL is also set. Only in that
case, include serial-uclass.c . If the build is for regular U-Boot,
CONFIG_BUILD is not set, so only check if CONFIG_DM_SERIAL is set
and if so, include serial-uclass.c
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/Makefile | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index cac9a8b312..6937ef9628 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -5,11 +5,27 @@ # SPDX-License-Identifier: GPL-2.0+ # +ifdef CONFIG_SPL_BUILD + +ifeq ($(CONFIG_$(SPL_TPL_)BUILD)$(CONFIG_$(SPL_TPL_)DM_SERIAL),yy) +obj-y += serial-uclass.o +else +obj-y += serial.o +endif + +else + ifdef CONFIG_DM_SERIAL -obj-$(CONFIG_$(SPL_TPL_)DM_SERIAL) += serial-uclass.o -obj-$(CONFIG_PL01X_SERIAL) += serial_pl01x.o +obj-y += serial-uclass.o else obj-y += serial.o +endif + +endif + +ifdef CONFIG_DM_SERIAL +obj-$(CONFIG_PL01X_SERIAL) += serial_pl01x.o +else obj-$(CONFIG_PL010_SERIAL) += serial_pl01x.o obj-$(CONFIG_PL011_SERIAL) += serial_pl01x.o obj-$(CONFIG_SYS_NS16550_SERIAL) += serial_ns16550.o |