tools: k3_fit_atf: add DM binary to the FIT image

Add DM (device manager) firmware image to the fit image that is loaded by
R5 SPL. This is needed with the HSM rearch where the firmware allocation
has been changed slightly.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tero Kristo <kristo@kernel.org>
This commit is contained in:
Tero Kristo 2021-06-11 11:45:17 +03:00 committed by Lokesh Vutla
parent f79753c3de
commit df5363a67f
2 changed files with 22 additions and 1 deletions

View File

@ -49,6 +49,10 @@ endif
ifdef CONFIG_ARM64 ifdef CONFIG_ARM64
ifeq ($(CONFIG_SOC_K3_J721E),)
export DM := /dev/null
endif
ifeq ($(CONFIG_TI_SECURE_DEVICE),y) ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
SPL_ITS := u-boot-spl-k3_HS.its SPL_ITS := u-boot-spl-k3_HS.its
$(SPL_ITS): export IS_HS=1 $(SPL_ITS): export IS_HS=1

View File

@ -21,6 +21,13 @@ if [ ! -f $TEE ]; then
TEE=/dev/null TEE=/dev/null
fi fi
[ -z "$DM" ] && DM="dm.bin"
if [ ! -e $DM ]; then
echo "WARNING DM file $DM NOT found, resulting might be non-functional" >&2
DM=/dev/null
fi
if [ ! -z "$IS_HS" ]; then if [ ! -z "$IS_HS" ]; then
HS_APPEND=_HS HS_APPEND=_HS
fi fi
@ -53,6 +60,16 @@ cat << __HEADER_EOF
load = <0x9e800000>; load = <0x9e800000>;
entry = <0x9e800000>; entry = <0x9e800000>;
}; };
dm {
description = "DM binary";
data = /incbin/("$DM");
type = "firmware";
arch = "arm32";
compression = "none";
os = "DM";
load = <0xa0000000>;
entry = <0xa0000000>;
};
spl { spl {
description = "SPL (64-bit)"; description = "SPL (64-bit)";
data = /incbin/("spl/u-boot-spl-nodtb.bin$HS_APPEND"); data = /incbin/("spl/u-boot-spl-nodtb.bin$HS_APPEND");
@ -94,7 +111,7 @@ do
$(basename $dtname) { $(basename $dtname) {
description = "$(basename $dtname .dtb)"; description = "$(basename $dtname .dtb)";
firmware = "atf"; firmware = "atf";
loadables = "tee", "spl"; loadables = "tee", "dm", "spl";
fdt = "$(basename $dtname)"; fdt = "$(basename $dtname)";
}; };
__CONF_SECTION_EOF __CONF_SECTION_EOF