rockchip: make_fit_atf.sh: use "-" instead of "@"

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I02b6a5f376184ea50c0db8714d225a1cd0cb39e1
This commit is contained in:
Joseph Chen 2020-11-14 04:12:45 +00:00 committed by Jianhong Chen
parent e4e3f4318d
commit 7d70ffaead
1 changed files with 5 additions and 5 deletions

View File

@ -53,12 +53,12 @@ function generate_bl31_node()
for NAME in `ls -l bl31_0x*.bin | sort --key=5 -nr | awk '{ print $9 }'` for NAME in `ls -l bl31_0x*.bin | sort --key=5 -nr | awk '{ print $9 }'`
do do
ATF_LOAD_ADDR=`echo ${NAME} | awk -F "_" '{ printf $2 }' | awk -F "." '{ printf $1 }'` ATF_LOAD_ADDR=`echo ${NAME} | awk -F "_" '{ printf $2 }' | awk -F "." '{ printf $1 }'`
# only atf@1 support compress # only atf-1 support compress
if [ "${COMPRESSION}" == "gzip" -a ${NUM} -eq 1 ]; then if [ "${COMPRESSION}" == "gzip" -a ${NUM} -eq 1 ]; then
openssl dgst -sha256 -binary -out ${NAME}.digest ${NAME} openssl dgst -sha256 -binary -out ${NAME}.digest ${NAME}
gzip -k -f -9 ${NAME} gzip -k -f -9 ${NAME}
echo " atf@${NUM} { echo " atf-${NUM} {
description = \"ARM Trusted Firmware\"; description = \"ARM Trusted Firmware\";
data = /incbin/(\"./${NAME}${SUFFIX}\"); data = /incbin/(\"./${NAME}${SUFFIX}\");
type = \"firmware\"; type = \"firmware\";
@ -75,7 +75,7 @@ function generate_bl31_node()
}; };
};" };"
else else
echo " atf@${NUM} { echo " atf-${NUM} {
description = \"ARM Trusted Firmware\"; description = \"ARM Trusted Firmware\";
data = /incbin/(\"./${NAME}\"); data = /incbin/(\"./${NAME}\");
type = \"firmware\"; type = \"firmware\";
@ -90,7 +90,7 @@ function generate_bl31_node()
fi fi
if [ ${NUM} -gt 1 ]; then if [ ${NUM} -gt 1 ]; then
LOADABLE_ATF=${LOADABLE_ATF}", \"atf@${NUM}\"" LOADABLE_ATF=${LOADABLE_ATF}", \"atf-${NUM}\""
fi fi
NUM=`expr ${NUM} + 1` NUM=`expr ${NUM} + 1`
done done
@ -166,7 +166,7 @@ cat << EOF
conf { conf {
description = "Rockchip armv8 with ATF"; description = "Rockchip armv8 with ATF";
rollback-index = <0x0>; rollback-index = <0x0>;
firmware = "atf@1"; firmware = "atf-1";
loadables = "uboot"${LOADABLE_ATF}${LOADABLE_OPTEE}; loadables = "uboot"${LOADABLE_ATF}${LOADABLE_OPTEE};
fdt = "fdt"; fdt = "fdt";
signature { signature {