mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 08:42:12 +02:00
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
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user