diff options
| author | Tom Rini <trini@konsulko.com> | 2018-06-15 09:38:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-15 09:38:06 -0400 |
| commit | d94e89c7650f496ce1e9303093c1e2d268d91b1b (patch) | |
| tree | 36e556587e05858de00cc837f98122d80bdecf1f /scripts | |
| parent | 9d0dc69235e8327dba5536761c768d40c4e514e5 (diff) | |
| parent | b729ed0d95415bd694a6b67c0761f03ef5a1e2bc (diff) | |
| download | u-boot-d94e89c7650f496ce1e9303093c1e2d268d91b1b.tar.gz u-boot-d94e89c7650f496ce1e9303093c1e2d268d91b1b.tar.bz2 u-boot-d94e89c7650f496ce1e9303093c1e2d268d91b1b.zip | |
Merge tag 'xilinx-for-v2018.07-rc2' of git://git.denx.de/u-boot-microblaze
Xilinx fixes for v2018.07-rc2
Zynq:
- Fix missing watchdog header
- DT fixes
ZynqMP:
- emmc configuration split
- Enable SPD
- Fix PMUFW_INIT_FILE logic
- Coverity fixes in SoC code
timer
- Add timer_get_boot_us
mmc:
- Fix MMC HS200 tuning command
serial:
- Fix scrabled chars with OF_LIVE
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.spl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index ef018b5b40..252f13826d 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) endif ifdef CONFIG_ARCH_ZYNQMP +ifneq ($(CONFIG_PMUFW_INIT_FILE),"") +spl/boot.bin: zynqmp-check-pmufw +zynqmp-check-pmufw: FORCE + ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ + || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) +endif MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ - -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) + -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" endif spl/boot.bin: $(obj)/u-boot-spl.bin FORCE |