diff options
author | Tom Rini <trini@konsulko.com> | 2019-01-24 10:47:05 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-01-24 10:47:05 -0500 |
commit | ce0d1e48165fdd3bde4bb431f1d2e100b1617a6e (patch) | |
tree | 8b30f2052d732ae7cfae221be6a9287f87e1de78 /scripts | |
parent | aff66f22d6eeb27c6329c0a3c1ebc52914c8affa (diff) | |
parent | 4efdbc88b79bd8bd3e285cd238e1942d669a7088 (diff) | |
download | u-boot-ce0d1e48165fdd3bde4bb431f1d2e100b1617a6e.tar.gz |
Merge tag 'xilinx-for-v2019.04' of git://git.denx.de/u-boot-microblaze
Xilinx changes for v2019.04
tools:
- Fix zynqmpimage generation
zynq:
- Some configs/Kconfig/DT updates
- Enable REMAKE_ELF and OF_SEPARATE
- Topic boards update
- i2c cleanups and conversion to DM_I2C
zynqmp:
- Some configs/Kconfig/DT updates
- Board config cleanup
- Move arch folder to mach-zynqmp
versal:
- Enable DM_I2C, CMD_DM
zynq-gem:
- Fix driver cache handling
i2c:
- Live tree simple update
phy:
- Fixed phy cleanup
travis:
- Wire Versal SoC
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile.spl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 29626e0025..e5b604e2d2 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -190,7 +190,10 @@ MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" endif -spl/boot.bin: $(obj)/u-boot-spl.bin FORCE +$(obj)/$(SPL_BIN)-align.bin: $(obj)/$(SPL_BIN).bin + @dd if=$< of=$@ conv=block,sync bs=4 2>/dev/null; + +spl/boot.bin: $(obj)/$(SPL_BIN)-align.bin FORCE $(call if_changed,mkimage) endif |