summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-11-17 21:15:57 -0500
committerTom Rini <trini@konsulko.com>2019-11-17 21:15:57 -0500
commitd64efd920e429f1c5dc085e2e8614c5d139ec37d (patch)
treefb1b00b875c2efd1a3d5310227c0d214cd48cf45 /scripts
parentfd8adc33b8f999cb09c3ba8ea8860ded28e8d6ca (diff)
parent59b01eb7a17a7c0915fd8aff8f818699b4624137 (diff)
downloadu-boot-d64efd920e429f1c5dc085e2e8614c5d139ec37d.tar.gz
u-boot-d64efd920e429f1c5dc085e2e8614c5d139ec37d.tar.xz
u-boot-d64efd920e429f1c5dc085e2e8614c5d139ec37d.zip
Merge tag 'u-boot-rockchip-20191118' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Add support for rockchip SoC: PX30, RK3308 - Add and migrate to use common dram driver: PX30, RK3328, RK3399 - Add rk3399 board Tinker-s support - Board config update for Rock960, Rockpro64
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.spl4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index f8ce7da2d2..314b02ba07 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -71,7 +71,11 @@ HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(srctree)/board/$(VENDOR)/common/Makef
libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/)
libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
+ifeq ($(CONFIG_TPL_BUILD),y)
+libs-$(CONFIG_TPL_FRAMEWORK) += common/spl/
+else
libs-$(CONFIG_SPL_FRAMEWORK) += common/spl/
+endif
libs-y += common/init/
# Special handling for a few options which support SPL/TPL