Include the object tree and the source tree in the search path of the
FIT compîler (dtc). This allows to use paths relative to the root of the
source or object trees in the ITS instead of working backward from the
actual location of the ITS.
It also allows to use a build directory different of the source directory.
Signed-off-by: Jean-Jacques Hiblot <jjhib...@ti.com>
---
Changes in v2: None
Makefile | 5 +++--
board/theobroma-systems/lion_rk3368/fit_spl_atf.its | 6 +++---
board/theobroma-systems/puma_rk3399/fit_spl_atf.its | 8 ++++----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 26235d8933..9275c8930e 100644
--- a/Makefile
+++ b/Makefile
@@ -893,7 +893,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 $@
@@ -1154,7 +1155,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
diff --git a/board/theobroma-systems/lion_rk3368/fit_spl_atf.its
b/board/theobroma-systems/lion_rk3368/fit_spl_atf.its
index 6b04fbc7da..69202a117b 100644
--- a/board/theobroma-systems/lion_rk3368/fit_spl_atf.its
+++ b/board/theobroma-systems/lion_rk3368/fit_spl_atf.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";
};
diff --git a/board/theobroma-systems/puma_rk3399/fit_spl_atf.its
b/board/theobroma-systems/puma_rk3399/fit_spl_atf.its
index 530f059f3d..659183ecc1 100644
--- a/board/theobroma-systems/puma_rk3399/fit_spl_atf.its
+++ b/board/theobroma-systems/puma_rk3399/fit_spl_atf.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-rk3399.bin");
+ data = /incbin/("bl31-rk3399.bin");
type = "firmware";
arch = "arm64";
os = "arm-trusted-firmware";
@@ -33,14 +33,14 @@
};
pmu {
description = "Cortex-M0 firmware";
- data = /incbin/("../../../rk3399m0.bin");
+ data = /incbin/("rk3399m0.bin");
type = "pmu-firmware";
compression = "none";
load = <0x180000>;
};
fdt {
description = "RK3399-Q7 (Puma) flat device-tree";
- data = /incbin/("../../../u-boot.dtb");
+ data = /incbin/("u-boot.dtb");
type = "flat_dt";
compression = "none";
};
--
2.17.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
