MIRRORS/meta-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/meta-imx.git synced 2025-07-19 10:29:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

eCockpit: imx-boot: Fix ATF selection for OP-TEE case [LF-6037]

Browse Source 
The eCockpit image cannot boot in the OP-TEE case. The problem is that
the recipe copies the non-OP-TEE ATF files to the expected locations
for imx-mkimage, while the OP-TEE ATF files are copied to the wrong
locations.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit 642de9fd64)
This commit is contained in:
Tom Hochstein 2023-03-16 20:55:26 -05:00
parent 82c29a7fab
commit 1770274736
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta-cockpit/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
View File

@ -11,14 +11,11 @@ do_compile:imx8qm-cockpit () {
cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE_COCKPIT}.bin-a53 ${BOOT_STAGING}/u-boot.bin
cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE_COCKPIT}.bin-a72 ${BOOT_STAGING}/u-boot-a72.bin
cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/bl31-imx8qm-cockpit.bin-a53 ${BOOT_STAGING}/bl31.bin
cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/bl31-imx8qm-cockpit.bin-a72 ${BOOT_STAGING}/bl31-a72.bin
if ${DEPLOY_OPTEE}; then
cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/mx8qm-mek_cockpit-scfw-tcm.bin ${BOOT_STAGING}/scfw_tcm.bin
cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/bl31-imx8qm-cockpit.bin-optee-a53 ${BOOT_STAGING}/bl31-optee-a53.bin
cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/bl31-imx8qm-cockpit.bin-optee-a72 ${BOOT_STAGING}/bl31-optee-a72.bin
cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/bl31-imx8qm-cockpit.bin-optee-a53 ${BOOT_STAGING}/bl31.bin
cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/bl31-imx8qm-cockpit.bin-optee-a72 ${BOOT_STAGING}/bl31-a72.bin
cp ${DEPLOY_DIR_IMAGE}/${MLPREFIX}optee/tee-a53.bin ${BOOT_STAGING}/tee.bin
cp ${DEPLOY_DIR_IMAGE}/${MLPREFIX}optee/tee-a72.bin ${BOOT_STAGING}
@ -35,6 +32,9 @@ do_compile:imx8qm-cockpit () {
else
cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/mx8qm-mek_cockpit-nospl-scfw-tcm.bin ${BOOT_STAGING}/scfw_tcm.bin
cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/bl31-imx8qm-cockpit.bin-a53 ${BOOT_STAGING}/bl31.bin
cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/bl31-imx8qm-cockpit.bin-a72 ${BOOT_STAGING}/bl31-a72.bin
make SOC=iMX8QM flash_cockpit
if [ -e "${BOOT_STAGING}/flash.bin" ]; then
cp ${BOOT_STAGING}/flash.bin ${BOOT_STAGING}/imx-boot-imx8qmmek-sd.bin-flash_cockpit