[Feature]Merge MP1_MR1 from MTK meta and prebulit
Change-Id: I7c6ce41ec9a078a1daa51fcc339e13ed412518c1
diff --git a/meta/meta-mediatek/classes/bl33-fitimage.bbclass b/meta/meta-mediatek/classes/bl33-fitimage.bbclass
old mode 100644
new mode 100755
index d74bb58..3643003
--- a/meta/meta-mediatek/classes/bl33-fitimage.bbclass
+++ b/meta/meta-mediatek/classes/bl33-fitimage.bbclass
@@ -63,7 +63,7 @@
fi
cat << EOF >> ${WORKDIR}/fit-image.its
- bl33@1 {
+ bl33_1 {
description = "LK based BL33 Image";
data = /incbin/("${1}");
type = "kernel";
@@ -72,7 +72,7 @@
compression = "${2}";
load = <${BL33_LOADADDRESS}>;
entry = <${BL33_ENTRYPOINT}>;
- hash@1 {
+ hash {
algo = "${bl33_csum}";
};
};
@@ -94,11 +94,11 @@
conf_desc="${MTK_PROJECT} configuration"
cat << EOF >> ${WORKDIR}/fit-image.its
- default = "conf@1";
- conf@1 {
+ default = "conf_1";
+ conf_1 {
description = "${conf_desc}";
- kernel = "bl33@1";
- signature@1 {
+ kernel = "bl33_1";
+ signature {
algo = "${conf_csum}";
key-name-hint="${conf_key_name}";
sign-images = "kernel";
diff --git a/meta/meta-mediatek/classes/kernel-fitimage-extension.bbclass b/meta/meta-mediatek/classes/kernel-fitimage-extension.bbclass
old mode 100644
new mode 100755
index 4bb8c1b..3844a05
--- a/meta/meta-mediatek/classes/kernel-fitimage-extension.bbclass
+++ b/meta/meta-mediatek/classes/kernel-fitimage-extension.bbclass
@@ -92,7 +92,7 @@
fi
cat << EOF >> fit-image.its
- kernel@${1} {
+ kernel_${1} {
description = "Linux kernel";
data = /incbin/("${2}");
type = "kernel";
@@ -101,7 +101,7 @@
compression = "${3}";
load = <${UBOOT_LOADADDRESS}>;
entry = <${ENTRYPOINT}>;
- hash@1 {
+ hash {
algo = "${kernel_csum}";
};
};
@@ -122,14 +122,14 @@
fi
cat << EOF >> fit-image.its
- fdt@${1} {
+ fdt_${1} {
description = "Flattened Device Tree blob";
data = /incbin/("${2}");
type = "flat_dt";
arch = "${UBOOT_ARCH}";
compression = "none";
load = <${DTB_LOADADDRESS}>;
- hash@1 {
+ hash {
algo = "${dtb_csum}";
};
};
@@ -156,17 +156,17 @@
fdt_line=""
else
conf_desc="Boot Linux kernel with FDT blob"
- fdt_line="fdt = \"fdt@${2}\";"
+ fdt_line="fdt = \"fdt_${2}\";"
fi
- kernel_line="kernel = \"kernel@${1}\";"
+ kernel_line="kernel = \"kernel_${1}\";"
cat << EOF >> fit-image.its
- default = "conf@1";
- conf@1 {
+ default = "conf_1";
+ conf_1 {
description = "${conf_desc}";
${kernel_line}
${fdt_line}
- signature@1 {
+ signature {
algo = "${conf_csum}";
key-name-hint="${conf_key_name}";
sign-images="fdt","kernel";
diff --git a/meta/meta-mediatek/classes/lk-image.bbclass b/meta/meta-mediatek/classes/lk-image.bbclass
old mode 100644
new mode 100755
index f7e0ec6..86960a2
--- a/meta/meta-mediatek/classes/lk-image.bbclass
+++ b/meta/meta-mediatek/classes/lk-image.bbclass
@@ -60,7 +60,7 @@
cat << EOF >> $1
images {
- bl@1 {
+ bl_1 {
description = "bl";
padding = /incbin/("${2}");
data = /incbin/("${3}");
@@ -68,7 +68,7 @@
compression = "none";
load = <${4}>;
entry = <${5}>;
- hash@1 {
+ hash {
algo = "${6}";
};
};
@@ -95,12 +95,12 @@
cat << EOF >> $1
configurations {
- default = "conf@1";
- conf@1 {
+ default = "conf_1";
+ conf_1 {
description = "bl";
- kernel = "bl@1";
+ kernel = "bl_1";
${ack_iv_prop}
- signature@1 {
+ signature {
algo = "${2},${3}";
key-name-hint = "${4}";
sign-images = "kernel";
diff --git a/meta/meta-mediatek/classes/ramdisk-fitimage-extension.bbclass b/meta/meta-mediatek/classes/ramdisk-fitimage-extension.bbclass
old mode 100644
new mode 100755
index ed7e413..cc37b05
--- a/meta/meta-mediatek/classes/ramdisk-fitimage-extension.bbclass
+++ b/meta/meta-mediatek/classes/ramdisk-fitimage-extension.bbclass
@@ -94,7 +94,7 @@
fi
cat << EOF >> fit-image.its
- kernel@${1} {
+ kernel_${1} {
description = "Linux kernel";
data = /incbin/("${2}");
type = "kernel";
@@ -103,7 +103,7 @@
compression = "${3}";
load = <${UBOOT_LOADADDRESS}>;
entry = <${ENTRYPOINT}>;
- hash@1 {
+ hash {
algo = "${kernel_csum}";
};
};
@@ -124,7 +124,7 @@
fi
cat << EOF >> fit-image.its
- ramdisk@${1} {
+ ramdisk_${1} {
description = "Ramdisk Image";
data = /incbin/("${2}");
type = "ramdisk";
@@ -133,7 +133,7 @@
compression = "none";
load = <${RAMDISK_LOADADDRESS}>;
entry = <${RAMDISK_LOADADDRESS}>;
- hash@1 {
+ hash {
algo = "${ramdisk_csum}";
};
};
@@ -154,14 +154,14 @@
fi
cat << EOF >> fit-image.its
- fdt@${1} {
+ fdt_${1} {
description = "Flattened Device Tree blob";
data = /incbin/("${2}");
type = "flat_dt";
arch = "${UBOOT_ARCH}";
compression = "none";
load = <${DTB_LOADADDRESS}>;
- hash@1 {
+ hash {
algo = "${dtb_csum}";
};
};
@@ -189,25 +189,25 @@
fdt_line=""
else
conf_desc="Boot Linux kernel with FDT blob"
- fdt_line="fdt = \"fdt@${2}\";"
+ fdt_line="fdt = \"fdt_${2}\";"
fi
- kernel_line="kernel = \"kernel@${1}\";"
+ kernel_line="kernel = \"kernel_${1}\";"
# Test if we have ramdisk image
if [ -z "${3}" ] ; then
ramdisk_line=""
else
- ramdisk_line="ramdisk = \"ramdisk@${3}\";"
+ ramdisk_line="ramdisk = \"ramdisk_${3}\";"
fi
cat << EOF >> fit-image.its
- default = "conf@1";
- conf@1 {
+ default = "conf_1";
+ conf_1 {
description = "${conf_desc}";
${kernel_line}
${ramdisk_line}
${fdt_line}
- signature@1 {
+ signature {
algo = "${conf_csum}";
key-name-hint="${conf_key_name}";
sign-images="fdt","kernel";
diff --git a/meta/meta-mediatek/classes/recovery-kernel-fitimage.bbclass b/meta/meta-mediatek/classes/recovery-kernel-fitimage.bbclass
old mode 100644
new mode 100755
index b4c9bd4..e822659
--- a/meta/meta-mediatek/classes/recovery-kernel-fitimage.bbclass
+++ b/meta/meta-mediatek/classes/recovery-kernel-fitimage.bbclass
@@ -90,7 +90,7 @@
fi
cat << EOF >> fit-recovery-image.its
- kernel@${1} {
+ kernel_${1} {
description = "Linux kernel";
data = /incbin/("${2}");
type = "kernel";
@@ -99,7 +99,7 @@
compression = "${3}";
load = <${UBOOT_LOADADDRESS}>;
entry = <${ENTRYPOINT}>;
- hash@1 {
+ hash {
algo = "${kernel_csum}";
};
};
@@ -120,14 +120,14 @@
fi
cat << EOF >> fit-recovery-image.its
- fdt@${1} {
+ fdt_${1} {
description = "Flattened Device Tree blob";
data = /incbin/("${2}");
type = "flat_dt";
arch = "${UBOOT_ARCH}";
compression = "none";
load = <${DTB_LOADADDRESS}>;
- hash@1 {
+ hash {
algo = "${dtb_csum}";
};
};
@@ -154,17 +154,17 @@
fdt_line=""
else
conf_desc="Boot Linux kernel with FDT blob"
- fdt_line="fdt = \"fdt@${2}\";"
+ fdt_line="fdt = \"fdt_${2}\";"
fi
- kernel_line="kernel = \"kernel@${1}\";"
+ kernel_line="kernel = \"kernel_${1}\";"
cat << EOF >> fit-recovery-image.its
- default = "conf@1";
- conf@1 {
+ default = "conf_1";
+ conf_1 {
description = "${conf_desc}";
${kernel_line}
${fdt_line}
- signature@1 {
+ signature {
algo = "${conf_csum}";
key-name-hint="${conf_key_name}";
sign-images="fdt","kernel";
diff --git a/meta/meta-mediatek/classes/recovery-ramdisk-kernel-fitimage.bbclass b/meta/meta-mediatek/classes/recovery-ramdisk-kernel-fitimage.bbclass
index ff61d4c..391f6b7 100755
--- a/meta/meta-mediatek/classes/recovery-ramdisk-kernel-fitimage.bbclass
+++ b/meta/meta-mediatek/classes/recovery-ramdisk-kernel-fitimage.bbclass
@@ -75,7 +75,7 @@
fi
cat << EOF >> fit-recovery-ramdisk-image.its
- kernel@${1} {
+ kernel_${1} {
description = "Linux kernel";
data = /incbin/("${2}");
type = "kernel";
@@ -84,7 +84,7 @@
compression = "${3}";
load = <${UBOOT_LOADADDRESS}>;
entry = <${UBOOT_ENTRYPOINT}>;
- hash@1 {
+ hash {
algo = "${kernel_csum}";
};
};
@@ -105,7 +105,7 @@
fi
cat << EOF >> fit-recovery-ramdisk-image.its
- ramdisk@${1} {
+ ramdisk_${1} {
description = "Ramdisk Image";
data = /incbin/("${2}");
type = "ramdisk";
@@ -114,7 +114,7 @@
compression = "none";
load = <${RECOVERY_RAMDISK_LOADADDRESS}>;
entry = <${RECOVERY_RAMDISK_LOADADDRESS}>;
- hash@1 {
+ hash {
algo = "${ramdisk_csum}";
};
};
@@ -135,14 +135,14 @@
fi
cat << EOF >> fit-recovery-ramdisk-image.its
- fdt@${1} {
+ fdt_${1} {
description = "Flattened Device Tree blob";
data = /incbin/("${2}");
type = "flat_dt";
arch = "${ARCH}";
compression = "none";
load = <${DTB_LOADADDRESS}>;
- hash@1 {
+ hash {
algo = "${dtb_csum}";
};
};
@@ -170,25 +170,25 @@
fdt_line=""
else
conf_desc="Boot Linux kernel with FDT blob"
- fdt_line="fdt = \"fdt@${2}\";"
+ fdt_line="fdt = \"fdt_${2}\";"
fi
- kernel_line="kernel = \"kernel@${1}\";"
+ kernel_line="kernel = \"kernel_${1}\";"
# Test if we have ramdisk image
if [ -z "${3}" ] ; then
ramdisk_line=""
else
- ramdisk_line="ramdisk = \"ramdisk@${3}\";"
+ ramdisk_line="ramdisk = \"ramdisk_${3}\";"
fi
cat << EOF >> fit-recovery-ramdisk-image.its
- default = "conf@1";
- conf@1 {
+ default = "conf_1";
+ conf_1 {
description = "${conf_desc}";
${kernel_line}
${ramdisk_line}
${fdt_line}
- signature@1 {
+ signature {
algo = "${conf_csum}";
key-name-hint="${conf_key_name}";
sign-images="fdt","kernel";
diff --git a/meta/meta-mediatek/classes/scpsys-fitimage.bbclass b/meta/meta-mediatek/classes/scpsys-fitimage.bbclass
old mode 100644
new mode 100755
index 9b3c8b0..8789169
--- a/meta/meta-mediatek/classes/scpsys-fitimage.bbclass
+++ b/meta/meta-mediatek/classes/scpsys-fitimage.bbclass
@@ -116,13 +116,13 @@
fi
cat << EOF >> ${WORKDIR}/fit-image.its
- ${3}@1 {
- description = "${4}";
+ ${3}_1 {
+ description = "scp firmware";
data = /incbin/("${1}");
type = "${7}";
compression = "${2}";
- load = <${5} ${6}>;
- hash@1 {
+ load = <0x00 0x130000>;
+ hash {
algo = "sha256";
};
};
@@ -138,13 +138,13 @@
fi
cat << EOF >> ${WORKDIR}/fit-image.its
- ${3}@1 {
+ ${3}_1 {
description = "${3}";
data = /incbin/("${1}");
type = "loadable";
compression = "${2}";
- load = <${4} ${5}>;
- hash@1 {
+ load = <${4}>;
+ hash {
algo = "sha256";
};
};
@@ -173,12 +173,11 @@
fi
cat << EOF >> ${WORKDIR}/fit-image.its
- default = "conf@1";
- conf@1 {
+ default = "conf_1";
+ conf_1 {
description = "${conf_desc}";
- kernel = "scpsys@1";
- ${dram_node}
- signature@1 {
+ kernel = "scpsys_1";
+ signature {
algo = "${conf_csum}";
key-name-hint="${conf_key_name}";
sign-images = "kernel"${dram_img_type}
diff --git a/meta/meta-mediatek/classes/spmfw-fitimage.bbclass b/meta/meta-mediatek/classes/spmfw-fitimage.bbclass
old mode 100644
new mode 100755
index 54df817..4e6a362
--- a/meta/meta-mediatek/classes/spmfw-fitimage.bbclass
+++ b/meta/meta-mediatek/classes/spmfw-fitimage.bbclass
@@ -70,7 +70,7 @@
fi
cat << EOF >> ${WORKDIR}/fit-image.its
- spmfw@1 {
+ spmfw_1 {
description = "SPM firmware";
data = /incbin/("${1}");
type = "kernel";
@@ -79,7 +79,7 @@
compression = "${2}";
load = <${SPMFW_LOADADDRESS}>;
entry = <${SPMFW_ENTRYPOINT}>;
- hash@1 {
+ hash {
algo = "${spmfw_csum}";
};
};
@@ -100,15 +100,15 @@
conf_key_name="dev"
conf_desc="spmfw configuration"
- spmfw_line="kernel = \"spmfw@1\";"
+ spmfw_line="kernel = \"spmfw_1\";"
sign_images_line="sign-images = \"kernel\";"
cat << EOF >> ${WORKDIR}/fit-image.its
- default = "conf@1";
- conf@1 {
+ default = "conf_1";
+ conf_1 {
description = "${conf_desc}";
${spmfw_line}
- signature@1 {
+ signature {
algo = "${conf_csum}";
key-name-hint="${conf_key_name}";
${sign_images_line}
diff --git a/meta/meta-mediatek/classes/sspm-fitimage.bbclass b/meta/meta-mediatek/classes/sspm-fitimage.bbclass
old mode 100644
new mode 100755
index 75fca59..575b79a
--- a/meta/meta-mediatek/classes/sspm-fitimage.bbclass
+++ b/meta/meta-mediatek/classes/sspm-fitimage.bbclass
@@ -68,7 +68,7 @@
fi
cat << EOF >> ${WORKDIR}/fit-image.its
- sspm@1 {
+ sspm_1 {
description = "SSPM firmware";
data = /incbin/("${1}");
type = "kernel";
@@ -98,15 +98,15 @@
conf_key_name="dev"
conf_desc="sspm configuration"
- sspm_line="kernel = \"sspm@1\";"
+ sspm_line="kernel = \"sspm_1\";"
sign_images_line="sign-images = \"kernel\";"
cat << EOF >> ${WORKDIR}/fit-image.its
- default = "conf@1";
- conf@1 {
+ default = "conf_1";
+ conf_1 {
description = "${conf_desc}";
${sspm_line}
- signature@1 {
+ signature {
algo = "${conf_csum}";
key-name-hint="${conf_key_name}";
${sign_images_line}
diff --git a/meta/meta-mediatek/classes/tinysys-fitimage.bbclass b/meta/meta-mediatek/classes/tinysys-fitimage.bbclass
old mode 100644
new mode 100755
index f348265..0a21806
--- a/meta/meta-mediatek/classes/tinysys-fitimage.bbclass
+++ b/meta/meta-mediatek/classes/tinysys-fitimage.bbclass
@@ -63,7 +63,7 @@
fi
cat << EOF >> ${WORKDIR}/fit-image.its
- tinysys@1 {
+ tinysys_1 {
description = "TINYSYS Image";
data = /incbin/("${1}");
type = "kernel";
@@ -72,7 +72,7 @@
compression = "${2}";
load = <${TINYSYS_LOADADDRESS}>;
entry = <${TINYSYS_ENTRYPOINT}>;
- hash@1 {
+ hash {
algo = "${tinysys_csum}";
};
};
@@ -94,11 +94,11 @@
conf_desc="${MTK_PROJECT} configuration"
cat << EOF >> ${WORKDIR}/fit-image.its
- default = "conf@1";
- conf@1 {
+ default = "conf_1";
+ conf_1 {
description = "${conf_desc}";
- kernel = "tinysys@1";
- signature@1 {
+ kernel = "tinysys_1";
+ signature {
algo = "${conf_csum}";
key-name-hint="${conf_key_name}";
sign-images = "kernel";
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
}
diff --git a/meta/meta-mediatek/classes/u-boot-fitimage.bbclass b/meta/meta-mediatek/classes/u-boot-fitimage.bbclass
old mode 100644
new mode 100755
index ffdc171..a166df8
--- a/meta/meta-mediatek/classes/u-boot-fitimage.bbclass
+++ b/meta/meta-mediatek/classes/u-boot-fitimage.bbclass
@@ -67,7 +67,7 @@
fi
cat << EOF >> ${WORKDIR}/fit-image.its
- kernel@1 {
+ kernel_1 {
description = "U-Boot";
data = /incbin/("${1}");
type = "kernel";
@@ -76,7 +76,7 @@
compression = "${2}";
load = <${UBOOT_FIT_LOADADDRESS}>;
entry = <${UBOOT_FIT_ENTRYPOINT}>;
- hash@1 {
+ hash {
algo = "${uboot_csum}";
};
};
@@ -97,7 +97,7 @@
fi
cat << EOF >> ${WORKDIR}/fit-image.its
- fdt@1 {
+ fdt_1 {
description = "sig blob for u-boot verified boot";
data = /incbin/("${1}");
type = "kernel";
@@ -106,7 +106,7 @@
compression = "${2}";
load = <${UBOOT_DTB_LOADADDRESS}>;
entry = <${UBOOT_DTB_LOADADDRESS}>;
- hash@1 {
+ hash {
algo = "${dtb_csum}";
};
};
@@ -128,20 +128,20 @@
conf_desc="${MTK_PROJECT} configuration"
- uboot_line="kernel = \"kernel@1\";"
+ uboot_line="kernel = \"kernel_1\";"
if [ "${SECURE_BOOT_ENABLE}" = "yes" ]; then
- fdt_line="fdt = \"fdt@1\";"
+ fdt_line="fdt = \"fdt_1\";"
else
fdt_line=""
fi
cat << EOF >> ${WORKDIR}/fit-image.its
- default = "conf@1";
- conf@1 {
+ default = "conf_1";
+ conf_1 {
description = "${conf_desc}";
${uboot_line}
${fdt_line}
- signature@1 {
+ signature {
algo = "${conf_csum}";
key-name-hint="${conf_key_name}";
sign-images="fdt","kernel";