aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-10-22 20:32:02 -0400
committerTom Rini <trini@konsulko.com>2020-10-22 20:32:02 -0400
commit18261b8552232e342709e69eadec33090a7f04e4 (patch)
treeecd17a26e30f20db41fb4b67c0f9060398a145bf /Makefile
parentae4fdd7b0432bcb0bc2fe7d90b6d3e92001ab478 (diff)
parent194923246c199bc6a4baa2ffcda1e08677b6f07c (diff)
downloadu-boot-18261b8552232e342709e69eadec33090a7f04e4.zip
u-boot-18261b8552232e342709e69eadec33090a7f04e4.tar.gz
u-boot-18261b8552232e342709e69eadec33090a7f04e4.tar.bz2
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-sunxiWIP/22Oct2020
- sun8i emac changes (Andre) - SCP firmware (Samuel)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index cb28cf6..e08cd75 100644
--- a/Makefile
+++ b/Makefile
@@ -1332,6 +1332,7 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \
-I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \
-a atf-bl31-path=${BL31} \
-a default-dt=$(default_dt) \
+ -a scp-path=$(SCP) \
$(BINMAN_$(@F))
OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex
@@ -1441,11 +1442,13 @@ else
MKIMAGEFLAGS_u-boot.itb = -E
endif
+ifdef U_BOOT_ITS
u-boot.itb: u-boot-nodtb.bin \
$(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_OF_HOSTFILE),dts/dt.dtb) \
$(U_BOOT_ITS) FORCE
$(call if_changed,mkfitimage)
$(BOARD_SIZE_CHECK)
+endif
u-boot-spl.kwb: u-boot.img spl/u-boot-spl.bin FORCE
$(call if_changed,mkimage)