@@ -914,7 +914,8 @@ cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
>$(MKIMAGEOUTPUT) $(if $(KBUILD_VERBOSE:0=), && cat $(MKIMAGEOUTPUT))
quiet_cmd_mkfitimage = MKIMAGE $@
-cmd_mkfitimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -f $(U_BOOT_ITS) -p $(CONFIG_FIT_EXTERNAL_OFFSET) $@\
+cmd_mkfitimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -D "-i $(obj) -i $(src)"\
+ -f $(U_BOOT_ITS) $@ -p $(CONFIG_FIT_EXTERNAL_OFFSET)\
>$(MKIMAGEOUTPUT) $(if $(KBUILD_VERBOSE:0=), && cat $(MKIMAGEOUTPUT))
quiet_cmd_cat = CAT $@
@@ -1230,7 +1231,7 @@ endif
SPL_FIT_SOURCE := $(subst ",,$(CONFIG_SPL_FIT_SOURCE))
SPL_FIT_GENERATOR := $(subst ",,$(CONFIG_SPL_FIT_GENERATOR))
ifneq ($(SPL_FIT_SOURCE),)
-U_BOOT_ITS = $(SPL_FIT_SOURCE)
+U_BOOT_ITS = $(src)/$(SPL_FIT_SOURCE)
else
ifneq ($(SPL_FIT_GENERATOR),)
U_BOOT_ITS := u-boot.its
@@ -14,7 +14,7 @@
images {
uboot {
description = "U-Boot (64-bit)";
- data = /incbin/("../../../u-boot-nodtb.bin");
+ data = /incbin/("u-boot-nodtb.bin");
type = "standalone";
os = "U-Boot";
arch = "arm64";
@@ -23,7 +23,7 @@
};
atf {
description = "ARM Trusted Firmware";
- data = /incbin/("../../../bl31-rk3368.bin");
+ data = /incbin/("bl31-rk3368.bin");
type = "firmware";
os = "arm-trusted-firmware";
arch = "arm64";
@@ -34,7 +34,7 @@
fdt {
description = "RK3368-uQ7 (Lion) flat device-tree";
- data = /incbin/("../../../u-boot.dtb");
+ data = /incbin/("u-boot.dtb");
type = "flat_dt";
compression = "none";
};