[Feature]Merge MP1_MR1 from MTK meta and prebulit
Change-Id: I7c6ce41ec9a078a1daa51fcc339e13ed412518c1
diff --git a/meta/meta-mediatek/classes/trustzone-fitimage.bbclass b/meta/meta-mediatek/classes/trustzone-fitimage.bbclass
old mode 100644
new mode 100755
index 0572ee4..b6e37b8
--- a/meta/meta-mediatek/classes/trustzone-fitimage.bbclass
+++ b/meta/meta-mediatek/classes/trustzone-fitimage.bbclass
@@ -63,7 +63,7 @@
fi
cat << EOF >> ${WORKDIR}/fit-image.its
- trustedos@1 {
+ trustedos_1 {
description = "Trusted OS Image";
data = /incbin/("${1}");
type = "tee";
@@ -72,7 +72,7 @@
compression = "${2}";
load = <${TRUSTEDOS_LOADADDRESS}>;
entry = <${TRUSTEDOS_ENTRYPOINT}>;
- hash@1 {
+ hash {
algo = "${trustedos_csum}";
};
};
@@ -94,7 +94,7 @@
if [ -d ${TL_SRC} ]; then
cat << EOF >> ${WORKDIR}/fit-image.its
- tee@1 {
+ tee_1 {
description = "Tee Image";
data = /incbin/("${1}");
type = "kernel";
@@ -103,14 +103,14 @@
compression = "${2}";
load = <${TEE_LOADADDRESS}>;
entry = <${TEE_ENTRYPOINT}>;
- hash@1 {
+ hash {
algo = "${trustzone_csum}";
};
};
EOF
else
cat << EOF >> ${WORKDIR}/fit-image.its
- tee@1 {
+ tee_1 {
description = "Tee Image";
data = /incbin/("${1}");
type = "kernel";
@@ -119,7 +119,7 @@
compression = "${2}";
load = <${TRUSTZONE_LOADADDRESS}>;
entry = <${TRUSTZONE_ENTRYPOINT}>;
- hash@1 {
+ hash {
algo = "${trustzone_csum}";
};
};
@@ -142,9 +142,9 @@
conf_desc="${MTK_PROJECT} configuration"
- trustzone_line="kernel = \"tee@1\";"
+ trustzone_line="kernel = \"tee_1\";"
if [ -n "${TRUSTEDOS_ENTRYPOINT}" ] && [ -n "${TRUSTEDOS_LOADADDRESS}" ] ; then
- trustedos_line="tee = \"trustedos@1\";"
+ trustedos_line="tee = \"trustedos_1\";"
sign_images_line="sign-images = \"kernel\", \"tee\";"
else
trustedos_line=""
@@ -152,12 +152,12 @@
fi
cat << EOF >> ${WORKDIR}/fit-image.its
- default = "conf@1";
- conf@1 {
+ default = "conf_1";
+ conf_1 {
description = "${conf_desc}";
${trustzone_line}
${trustedos_line}
- signature@1 {
+ signature {
algo = "${conf_csum}";
key-name-hint="${conf_key_name}";
${sign_images_line}
@@ -213,10 +213,10 @@
${HSM_ENV} HSM_KEY_NAME=${VERIFIED_KEY} uboot-mkimage -f ${WORKDIR}/fit-image.its ${TZ_ASSEMBLE_OUT}/${TZ_BINARY}
if [ "${SECURE_BOOT_ENABLE}" = "yes" ] && [ "${STANDALONE_SIGN_PREPARE}" != "yes" ]; then
- mkdir -p ./mykeys
- cp -f ${MTK_KEY_DIR}/${VERIFIED_KEY}.crt ./mykeys/dev.crt
- cp -f ${MTK_KEY_DIR}/${VERIFIED_KEY}.pem ./mykeys/dev.key
- ${HSM_ENV} HSM_KEY_NAME=${VERIFIED_KEY} uboot-mkimage -D "-I dts -O dtb -p 1024" -k ./mykeys -f ${WORKDIR}/fit-image.its -r ${TZ_ASSEMBLE_OUT}/${TZ_BINARY}
+ mkdir -p ${WORKDIR}/mykeys
+ cp -f ${MTK_KEY_DIR}/${VERIFIED_KEY}.crt ${WORKDIR}/mykeys/dev.crt
+ cp -f ${MTK_KEY_DIR}/${VERIFIED_KEY}.pem ${WORKDIR}/mykeys/dev.key
+ ${HSM_ENV} HSM_KEY_NAME=${VERIFIED_KEY} uboot-mkimage -D "-I dts -O dtb -p 1024" -k ${WORKDIR}/mykeys -f ${WORKDIR}/fit-image.its -r ${TZ_ASSEMBLE_OUT}/${TZ_BINARY}
fi
}