Revert "[Feature][T8TSK-124]Optimize the startup time of the LK stage --update in sdk"
This reverts commit 80ee6846bac699ff7c284937529c6b4445affa5f.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I2930e4c642f03429559b6a5794a08f41e6f2cedf
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/classes/md-fitimage.bbclass b/meta-sdk/meta/meta-lynqSDK-T800/classes/md-fitimage.bbclass
index 782c417..1a48a6e 100644
--- a/meta-sdk/meta/meta-lynqSDK-T800/classes/md-fitimage.bbclass
+++ b/meta-sdk/meta/meta-lynqSDK-T800/classes/md-fitimage.bbclass
@@ -69,7 +69,7 @@
type = "kernel";
arch = "arm";
os = "linux";
- compression = "${MODEM_COMPRESS}";
+ compression = "none";
load = <${MD_LOADADDRESS}>;
entry = <${MD_ENTRYPOINT}>;
hash_1 {
@@ -119,7 +119,7 @@
fitimage_emit_section_maint imagestart
- fitimage_emit_section_md ${WORKDIR}/modem.img
+ fitimage_emit_section_md ${WORKDIR}/modem-org.img
fitimage_emit_section_maint sectend
@@ -137,11 +137,12 @@
#
# Step 3: Assemble the image
#
- uboot-mkimage -f ${WORKDIR}/fit-image.its ${WORKDIR}/${MD_DST_IMAGE}
+ ${HSM_ENV} HSM_KEY_NAME=${VERIFIED_KEY} uboot-mkimage -f ${WORKDIR}/fit-image.its ${WORKDIR}/${MD_IMAGE}
+
if [ "${SECURE_BOOT_ENABLE}" = "yes" ]; then
mkdir -p ${WORKDIR}/mykeys
cp ${MTK_KEY_DIR}/${VERIFIED_KEY}.crt ${WORKDIR}/mykeys/dev.crt
cp ${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 ${WORKDIR}/${MD_DST_IMAGE}
+ ${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 ${WORKDIR}/${MD_IMAGE}
fi
}
\ No newline at end of file
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/classes/mddsp-fitimage.bbclass b/meta-sdk/meta/meta-lynqSDK-T800/classes/mddsp-fitimage.bbclass
index e32ada4..593df1c 100644
--- a/meta-sdk/meta/meta-lynqSDK-T800/classes/mddsp-fitimage.bbclass
+++ b/meta-sdk/meta/meta-lynqSDK-T800/classes/mddsp-fitimage.bbclass
@@ -69,7 +69,7 @@
type = "kernel";
arch = "arm";
os = "linux";
- compression = "${DSP_COMPRESS}";
+ compression = "none";
load = <${MDDSP_LOADADDRESS}>;
entry = <${MDDSP_ENTRYPOINT}>;
hash_1 {
@@ -118,7 +118,7 @@
fitimage_emit_section_maint imagestart
- fitimage_emit_section_dsp ${WORKDIR}/dsp.bin
+ fitimage_emit_section_dsp ${WORKDIR}/dsp-org.bin
fitimage_emit_section_maint sectend
@@ -136,12 +136,12 @@
#
# Step 3: Assemble the image
#
- uboot-mkimage -f ${WORKDIR}/fit-image.its ${WORKDIR}/${DSP_DST_IMAGE}
+ ${HSM_ENV} HSM_KEY_NAME=${VERIFIED_KEY} uboot-mkimage -f ${WORKDIR}/fit-image.its ${WORKDIR}/${MDDSP_IMAGE}
if [ "${SECURE_BOOT_ENABLE}" = "yes" ]; then
mkdir -p ${WORKDIR}/mykeys
cp ${MTK_KEY_DIR}/${VERIFIED_KEY}.crt ${WORKDIR}/mykeys/dev.crt
cp ${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 ${WORKDIR}/${DSP_DST_IMAGE}
+ ${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 ${WORKDIR}/${MDDSP_IMAGE}
fi
}
\ No newline at end of file
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf b/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf
index 2efcd7a..4a131d4 100755
--- a/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf
+++ b/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf
@@ -180,8 +180,6 @@
MODEM_CUSTOM_EXIST = "${@ os.path.exists('${MODEM_CUSTOM}')}"
MODEM_DIR = "${@'${MODEM_INT}/${MODEM_PROJECT}' if ${MODEM_INT_EXIST} == True else '${MODEM_CUSTOM}/${MODEM_PROJECT}'}"
EXTRA_IMAGEDEPENDS += "${@'modem' if ${MODEM_INT_EXIST} == True or ${MODEM_CUSTOM_EXIST} == True else ''}"
-MODEM_COMPRESS = "lz4"
-DSP_COMPRESS = "lz4"
# MIPC
MIPC_MODEM_PROJECT = "mt2735_ivt_nlwg_wide_temp"
MIPC_INT = "${TOPDIR}/../src/telephonyware/3.0/mipc_internal"
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-modem/modem/modem_1.0.0.bb b/meta-sdk/meta/meta-lynqSDK-T800/recipes-modem/modem/modem_1.0.0.bb
index 69a6031..bcfec01 100644
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-modem/modem/modem_1.0.0.bb
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-modem/modem/modem_1.0.0.bb
@@ -3,61 +3,39 @@
LIC_FILES_CHKSUM = "file://${MTK_LICENSE_DIR}/MediaTekProprietary;md5=c5d17c6905715d0948a3d6087602d12d"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-DEPENDS += "u-boot-mkimage-native bc-native dtc-native flashtool"
+DEPENDS += "u-boot-mkimage-native bc-native dtc-native"
inherit workonsrc deploy nopackages
inherit md-fitimage mddsp-fitimage hsm-sign-env staging-copyfile
WORKONSRC = "${MODEM_DIR}"
+do_compile[noexec] = "1"
do_install[noexec] = "1"
-MD_SRC_IMAGE = "modem.img"
-MD_DST_IMAGE = "md1img.img"
-DSP_SRC_IMAGE = "dsp.bin"
-DSP_DST_IMAGE = "md1dsp.img"
+MD_IMAGE = "md1img.img"
+MDDSP_IMAGE = "md1dsp.img"
MD_OUT = "${WORKDIR}"
-run_lz4_compression() {
- dec_size=0
- fsize=$(stat -c "%s" "${MD_OUT}/${1}")
- dec_size=$(expr $dec_size + $fsize)
- lz4 -l -c9 ${MD_OUT}/${1} > ${MD_OUT}/${1}.lz4
- mv -f ${MD_OUT}/${1}.lz4 ${MD_OUT}/${1}
- printf "%08x\n" $dec_size |
- sed 's/\(..\)/\1 /g' | {
- read ch0 ch1 ch2 ch3;
- for ch in $ch3 $ch2 $ch1 $ch0; do
- printf `printf '%s%03o' '\\' 0x$ch` >> ${MD_OUT}/${1};
- done;
- }
-}
-
-do_compile () {
- #mkdir -p ${MD_OUT}
-
- cp -f ${S}/${MD_SRC_IMAGE} ${MD_OUT}/${MD_SRC_IMAGE}
- cp -f ${S}/${DSP_SRC_IMAGE} ${MD_OUT}/${DSP_SRC_IMAGE}
-
- if [ "${MODEM_COMPRESS}" = "lz4" ]; then
- run_lz4_compression "${MD_SRC_IMAGE}"
- fi
- if [ "${DSP_COMPRESS}" = "lz4" ]; then
- run_lz4_compression "${DSP_SRC_IMAGE}"
- fi
-
- do_assemble_fitimage
- do_assemble_mdfitimage
-}
-
do_deploy () {
install -d ${DEPLOYDIR}
find . -type d -exec install -d ${DEPLOYDIR}/{} \;
find . -type f -exec install -m 755 {} ${DEPLOYDIR}/{} \;
- install ${MD_OUT}/${MD_DST_IMAGE} ${DEPLOYDIR}/${MD_DST_IMAGE}
- install ${MD_OUT}/${DSP_DST_IMAGE} ${DEPLOYDIR}/${DSP_DST_IMAGE}
+ if [ "${SECURE_BOOT_ENABLE}" = "yes" ] ; then
+ cp ${DEPLOYDIR}/dsp.bin ${WORKDIR}/dsp-org.bin
+ cp ${DEPLOYDIR}/modem.img ${WORKDIR}/modem-org.img
+
+ do_assemble_fitimage
+ do_assemble_mdfitimage
+
+ else
+ cp ${DEPLOYDIR}/dsp.bin ${MD_OUT}/${MDDSP_IMAGE}
+ cp ${DEPLOYDIR}/modem.img ${MD_OUT}/${MD_IMAGE}
+ fi
+ install ${MD_OUT}/${MD_IMAGE} ${DEPLOYDIR}/${MD_IMAGE}
+ install ${MD_OUT}/${MDDSP_IMAGE} ${DEPLOYDIR}/${MDDSP_IMAGE}
}
-addtask deploy after do_compile
+addtask deploy after do_configure