aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-01-27 10:15:39 -0500
committerTom Rini <trini@konsulko.com>2023-01-27 10:15:39 -0500
commit9ddbd70ff9f70b69053282e631c8886830e0fa5d (patch)
tree5cde271c461d66fe788dc6eacd8d95127dc8fdb7 /Makefile
parentb3b6cc28c240507503e471edc105e2d93a277126 (diff)
parentf0f86d39fec73479d4904e6d5b9db01a29597d58 (diff)
downloadu-boot-9ddbd70ff9f70b69053282e631c8886830e0fa5d.zip
u-boot-9ddbd70ff9f70b69053282e631c8886830e0fa5d.tar.gz
u-boot-9ddbd70ff9f70b69053282e631c8886830e0fa5d.tar.bz2
Merge tag 'xilinx-for-v2023.04-rc1' of https://source.denx.de/u-boot/custodians/u-boot-microblazeWIP/27Jan2023
Xilinx chnages for v2023.04-rc1 makefile: - Add multi_dtb_fit dependency clk: - Handle error cases microblaze: - Disable falcon mode and cleanup code around xilinx: - Enable regular expression matching in board_fit_config_name_match() - Fix FRU handling for 0xC1 format - Fix Xilinx legacy format eeprom parsing zynqmp: - Some DT updates/cleanups - Fix IDcode for xck24 - Remove empty mini config files - Add support for k24 versal: - Remove empty mini config files versal_net: - Setup timer when runs in EL3 - Build u-boot.elf for mini configurations zynq-gem: - Add support for new compatible strings - Remove support for Avnet Ultrazedev SOM - Handle SGMII with PCS phy spi: - Add support for gigadevice parts misc: - Remove CONFIG_TARGET_VENUS ifdef - Add missing headers to remove sparse warnings
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index eb354c0..9c38cc2 100644
--- a/Makefile
+++ b/Makefile
@@ -1441,6 +1441,7 @@ MKIMAGEFLAGS_u-boot.itb += -B 0x8
ifdef U_BOOT_ITS
u-boot.itb: u-boot-nodtb.bin \
$(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SANDBOX),dts/dt.dtb) \
+ $(if $(CONFIG_MULTI_DTB_FIT),$(FINAL_DTB_CONTAINER)) \
$(U_BOOT_ITS) FORCE
$(call if_changed,mkfitimage)
$(BOARD_SIZE_CHECK)