summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-07-27 13:09:30 -0400
committerTom Rini <trini@konsulko.com>2018-07-27 13:09:30 -0400
commit0e8a8a311020d317fcfcf594e8e3fb1598134593 (patch)
tree5410444f60514df7074ba038aa3e33c44f7dcf23 /Makefile
parent11e409284ee593c980e16d93d12c5e19c99b62c0 (diff)
parent86b840b78d0eba652f65841a870d232ab743612e (diff)
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a3d9df81a6..675d011c95 100644
--- a/Makefile
+++ b/Makefile
@@ -1111,8 +1111,8 @@ u-boot.sha1: u-boot.bin
u-boot.dis: u-boot
$(OBJDUMP) -d $< > $@
-ifdef CONFIG_TPL
-SPL_PAYLOAD := tpl/u-boot-with-tpl.bin
+ifneq ($(CONFIG_SPL_PAYLOAD),)
+SPL_PAYLOAD := $(CONFIG_SPL_PAYLOAD:"%"=%)
else
SPL_PAYLOAD := u-boot.bin
endif