diff options
| author | Tom Rini <trini@konsulko.com> | 2018-07-27 13:09:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-07-27 13:09:30 -0400 |
| commit | 0e8a8a311020d317fcfcf594e8e3fb1598134593 (patch) | |
| tree | 5410444f60514df7074ba038aa3e33c44f7dcf23 /Makefile | |
| parent | 11e409284ee593c980e16d93d12c5e19c99b62c0 (diff) | |
| parent | 86b840b78d0eba652f65841a870d232ab743612e (diff) | |
| download | u-boot-0e8a8a311020d317fcfcf594e8e3fb1598134593.tar.gz u-boot-0e8a8a311020d317fcfcf594e8e3fb1598134593.tar.xz u-boot-0e8a8a311020d317fcfcf594e8e3fb1598134593.zip | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |