Switch iMX-based devices to latest NXP BSP

meta-lmp-base/recipes-bsp/u-boot/u-boot-fio_2020.04.bb

@@ -1,6 +1,6 @@
 require u-boot-fio-common.inc
 
-SRCREV = "92a53d593e3535b0986bc906eb62fef4eddb159a"
+SRCREV = "6643f501d6dfe632f0994d010fc82b39ca4fbe29"
 SRCBRANCH = "2020.04+fio"
 
 DEFAULT_PREFERENCE = "-1"

meta-lmp-base/recipes-kernel/linux/linux-lmp-lts_git.bb

@@ -1,10 +1,10 @@
-LINUX_VERSION ?= "5.4.58"
+LINUX_VERSION ?= "5.4.61"
 
 FIO_LMP_GIT_URL ?= "github.com"
 FIO_LMP_GIT_NAMESPACE ?= "foundriesio/"
 
-SRCREV_machine = "56d2635849c5ef58f80a62d6067b0e78ec17616f"
-SRCREV_meta = "c348b70767ef1abb7f139ae87874ffa36d6064d7"
+SRCREV_machine = "4b182dc630590174d377d8be0366c317cc6d0af1"
+SRCREV_meta = "9f43f9d2e5915a0d80a151af38273d6ec8db9680"
 KBRANCH = "linux-v5.4.y"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"

meta-lmp-base/recipes-kernel/linux/linux-lmp_git.bb

@@ -1,10 +1,10 @@
-LINUX_VERSION ?= "5.8.4"
+LINUX_VERSION ?= "5.8.5"
 
 FIO_LMP_GIT_URL ?= "github.com"
 FIO_LMP_GIT_NAMESPACE ?= "foundriesio/"
 
-SRCREV_machine = "b25c87796aea122bf7d75097aff8aaa1a651b612"
-SRCREV_meta = "68272783d9408b91a79797003a166a91bfe997ae"
+SRCREV_machine = "875d8db52330b097a33ede0e254fb460bc2f8ac0"
+SRCREV_meta = "5910f7271fb6c6bef1c7813b2e573577d44c1cb5"
 KBRANCH = "linux-v5.8.y"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"

meta-lmp-bsp/conf/machine/apalis-imx8.conf

@@ -0,0 +1,60 @@
+#@TYPE: Machine
+#@NAME: Toradex Apalis iMX8
+#@DESCRIPTION: Toradex Apalis iMX8 powered by a i.MX 8QuadMax SoC
+#@MAINTAINER: Stefan Agner <[email protected]>
+
+MACHINE_NAME = "Apalis-iMX8"
+
+SOC_SILICON_REV ?= ""
+
+MACHINEOVERRIDES =. "mx8:mx8qm:toradex:"
+
+IMX_DEFAULT_BSP = "nxp"
+
+require conf/machine/include/imx-base.inc
+# override imx-base.inc which sets this to cortexa72-cortexa53-crypto
+DEFAULTTUNE_mx8qm = "aarch64"
+require conf/machine/include/tune-cortexa72-cortexa53.inc
+
+# Don't include kernels in standard images
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+
+LOADADDR = ""
+
+# we do not want to have getty running on tty1 as we run
+# auto-serial-console there
+USE_VT = "0"
+
+KERNEL_DEVICETREE = " \
+    freescale/fsl-imx8qm-apalis-eval.dtb \
+    freescale/fsl-imx8qm-apalis-eval-ar0521.dtb \
+    freescale/fsl-imx8qm-apalis-ixora-v1.1.dtb \
+    freescale/fsl-imx8qm-apalis-ixora-v1.1-ar0521.dtb \
+    freescale/fsl-imx8qm-apalis-v1.1-eval.dtb \
+    freescale/fsl-imx8qm-apalis-v1.1-eval-ar0521.dtb \
+"
+
+UBOOT_SUFFIX = "bin"
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "apalis-imx8_defconfig,sdcard"
+
+UBOOT_ENTRYPOINT = "0x80280000"
+UBOOT_DTB_LOADADDRESS = "0x83000000"
+
+IMAGE_BOOTLOADER = "imx-boot"
+IMX_BOOT_SEEK = "32"
+
+IMAGE_BOOT_FILES += "hdmitxfw.bin dpfw.bin"
+WKS_FILE_DEPENDS_append = " u-boot-default-script"
+PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-base-scr"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-lmp-toradex-imx"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-fio"
+PREFERRED_VERSION_u-boot-fio ?= "2020.04"
+
+MACHINE_FIRMWARE_append = " linux-firmware-pcie8997"
+MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8"
+
+IMXBOOT_TARGETS = "flash_b0"
+
+BOARD_TYPE = "apalis"

meta-lmp-bsp/conf/machine/imx7ulpea-ucom.conf

@@ -0,0 +1,32 @@
+#@TYPE: Machine
+#@NAME: Embedded Artists i.MX7 ULP uCOM Board
+#@SOC: i.MX7D
+#@DESCRIPTION: Machine configuration for Embedded Artists i.MX7 ULP uCOM Board
+#@MAINTAINER: Ricardo Salveti <[email protected]>
+
+MACHINEOVERRIDES =. "mx7:mx7ulp:"
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/tune-cortexa7.inc
+
+SERIAL_CONSOLES = "115200;ttyLP0"
+
+MACHINE_FEATURES += " pci bluetooth optee"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-lmp-ea-imx"
+
+KERNEL_DEVICETREE = "imx7ulpea-ucom-kit_v2.dtb"
+
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-fio"
+PREFERRED_PROVIDER_u-boot = "u-boot-fio"
+PREFERRED_VERSION_u-boot-fio ?= "2020.04"
+PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-base-scr"
+
+SPL_BINARY = "SPL"
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "mx7ulp_com_defconfig"
+
+UBOOT_SUFFIX = "bin"
+UBOOT_MAKE_TARGET = ""
+
+WKS_FILE_DEPENDS_append = " u-boot-default-script"

meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc

@@ -155,6 +155,7 @@ KERNEL_DEVICETREE_append_cubox-i = " \
 "
 PREFERRED_PROVIDER_virtual/bootloader_cubox-i = "u-boot-fio"
 PREFERRED_PROVIDER_u-boot_cubox-i = "u-boot-fio"
+PREFERRED_VERSION_u-boot-fio_cubox-i ?= "2020.04"
 PREFERRED_PROVIDER_u-boot-fw-utils_cubox-i = "libubootenv"
 PREFERRED_RPROVIDER_u-boot-fw-utils_cubox-i = "libubootenv"
 WKS_FILE_DEPENDS_append_cubox-i = " u-boot-default-script"
@@ -175,6 +176,7 @@ UBOOT_EXTLINUX_cubox-i = ""
 PREFERRED_PROVIDER_u-boot-default-script_colibri-imx7-emmc = "u-boot-ostree-scr"
 PREFERRED_PROVIDER_virtual/bootloader_colibri-imx7-emmc = "u-boot-fio"
 PREFERRED_PROVIDER_u-boot_colibri-imx7-emmc = "u-boot-fio"
+PREFERRED_VERSION_u-boot-fio_colibri-imx7-emmc ?= "2020.04"
 PREFERRED_PROVIDER_u-boot-fw-utils_colibri-imx7-emmc = "libubootenv"
 PREFERRED_RPROVIDER_u-boot-fw-utils_colibri-imx7-emmc = "libubootenv"
 IMAGE_BOOT_FILES_colibri-imx7-emmc = "uEnv.txt u-boot.imx"
@@ -185,6 +187,19 @@ UBOOT_ENTRYPOINT_colibri-imx7-emmc = "0x81000000"
 UBOOT_DTB_LOADADDRESS_colibri-imx7-emmc = "0x82000000"
 UBOOT_RD_LOADADDRESS_colibri-imx7-emmc = "0x82100000"
 
+# Embedded Artists i.MX7ULP COM
+UBOOT_SIGN_ENABLE_imx7ulpea-ucom = "1"
+PREFERRED_PROVIDER_u-boot-default-script_imx7ulpea-ucom = "u-boot-base-scr"
+PREFERRED_PROVIDER_u-boot-default-script_sota_imx7ulpea-ucom = "u-boot-ostree-scr-fit"
+IMAGE_BOOT_FILES_imx7ulpea-ucom = "boot.scr uEnv.txt"
+IMAGE_BOOT_FILES_sota_imx7ulpea-ucom = "boot.itb SPL u-boot.itb"
+KERNEL_IMAGETYPE_sota_imx7ulpea-ucom = "fitImage"
+KERNEL_CLASSES_sota_imx7ulpea-ucom = " kernel-lmp-fitimage "
+OSTREE_KERNEL_imx7ulpea-ucom = "${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}-${MACHINE}"
+OSTREE_KERNEL_ARGS_COMMON_imx7ulpea-ucom ?= "earlycon=lpuart32,0x402D0000,115200 root=/dev/mmcblk0p2 rootfstype=ext4"
+SOTA_CLIENT_FEATURES_append_imx7ulpea-ucom = " ubootenv"
+UBOOT_CLASSES_imx7ulpea-ucom = "uboot-fitimage"
+
 # iMX6ULL
 UBOOT_SIGN_ENABLE_mx6ull = "1"
 PREFERRED_PROVIDER_virtual/kernel_mx6ull ?= "linux-lmp-fslc-imx"
@@ -254,9 +269,12 @@ PREFERRED_VERSION_optee-test_apalis-imx6 = "3.10.0"
 OPTEE_BINARY_apalis-imx6 = "tee-pager_v2.bin"
 
 # Toradex Apalis iMX8QM
-UBOOT_DTB_LOADADDRESS_apalis-imx8 = "0x84000000"
-UBOOT_RD_LOADADDRESS_apalis-imx8 = ""
-IMAGE_BOOT_FILES_append_apalis-imx8 = " uEnv-lmp.txt imx-boot"
+PREFERRED_PROVIDER_virtual/bootloader_apalis-imx8 ?= "u-boot-fio"
+PREFERRED_PROVIDER_u-boot_apalis-imx8 ?= "u-boot-fio"
+PREFERRED_VERSION_u-boot-fio_apalis-imx8 ?= "2020.04"
+SOTA_CLIENT_FEATURES_append_apalis-imx8 = " ubootenv"
+IMAGE_BOOT_FILES_apalis-imx8 = "imx-boot boot.scr uEnv.txt"
+IMAGE_BOOT_FILES_sota_apalis-imx8 = "imx-boot boot.itb"
 KERNEL_IMAGETYPE_sota_apalis-imx8 = "fitImage"
 KERNEL_CLASSES_sota_apalis-imx8 = " kernel-lmp-fitimage "
 OSTREE_KERNEL_mx8qm = "${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}-${MACHINE}"
@@ -265,20 +283,22 @@ OSTREE_KERNEL_ARGS_apalis-imx8 ?= "console=tty1 console=ttyLP1,115200 earlycon=l
 PREFERRED_PROVIDER_virtual/kernel_apalis-imx8 ?= "linux-lmp-dev"
 WKS_FILE_apalis-imx8_sota = "sdimage-imx8-sota.wks.in"
 PREFERRED_PROVIDER_u-boot-default-script_apalis-imx8 = "u-boot-base-scr"
-PREFERRED_PROVIDER_u-boot-default-script_sota_apalis-imx8 = "u-boot-ostree-scr"
-IMAGE_CLASSES_remove_apalis-imx8 = "image_type_tezi"
-IMAGE_FSTYPES_remove_apalis-imx8 = "teziimg"
+PREFERRED_PROVIDER_u-boot-default-script_sota_apalis-imx8 = "u-boot-ostree-scr-fit"
 
 # iMX8MM
+UBOOT_SIGN_ENABLE_mx8mm = "1"
+PREFERRED_PROVIDER_virtual/bootloader_mx8mm ?= "u-boot-fio"
+PREFERRED_PROVIDER_u-boot_mx8mm ?= "u-boot-fio"
+PREFERRED_VERSION_u-boot-fio_mx8mm ?= "2020.04"
 PREFERRED_PROVIDER_u-boot-fw-utils_mx8mm = "libubootenv"
 PREFERRED_RPROVIDER_u-boot-fw-utils_mx8mm = "libubootenv"
 SOTA_CLIENT_FEATURES_append_mx8mm = " ubootenv"
 UBOOT_DTB_LOADADDRESS_mx8mm = "0x43000000"
-IMAGE_BOOT_FILES_append_mx8mm = " boot.scr uEnv.txt"
-IMAGE_BOOT_FILES_sota_mx8mm = "imx-boot"
+IMAGE_BOOT_FILES_mx8mm = "imx-boot boot.scr uEnv.txt"
+IMAGE_BOOT_FILES_sota_mx8mm = "imx-boot boot.itb"
 WKS_FILE_DEPENDS_append_mx8mm = " u-boot-default-script"
 PREFERRED_PROVIDER_u-boot-default-script_mx8mm = "u-boot-base-scr"
-PREFERRED_PROVIDER_u-boot-default-script_sota_mx8mm = "u-boot-ostree-scr"
+PREFERRED_PROVIDER_u-boot-default-script_sota_mx8mm = "u-boot-ostree-scr-fit"
 KERNEL_IMAGETYPE_sota_mx8mm = "fitImage"
 KERNEL_CLASSES_sota_mx8mm = " kernel-lmp-fitimage "
 OSTREE_KERNEL_mx8mm = "${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}-${MACHINE}"
@@ -289,8 +309,10 @@ PREFERRED_PROVIDER_virtual/kernel_mx8mm ?= "linux-lmp-fslc-imx"
 MACHINE_FIRMWARE_mx8mm = "linux-firmware-imx-sdma-imx7d"
 WKS_FILE_mx8mm_sota = "sdimage-imx8-sota.wks.in"
 ## iMX8MM EVK
-PREFERRED_VERSION_optee-client_imx8mmevk = "3.6.0+git"
-PREFERRED_VERSION_optee-test_imx8mmevk = "3.6.0"
+PREFERRED_VERSION_optee-os-fio_imx8mmevk = "3.10.0+git"
+PREFERRED_VERSION_optee-client_imx8mmevk = "3.10.0"
+PREFERRED_VERSION_optee-examples_imx8mmevk = "3.10.0"
+PREFERRED_VERSION_optee-test_imx8mmevk = "3.10.0"
 MACHINE_FEATURES_remove_imx8mmevk = "qca9377 qca6174"
 
 # Cross machines / BSPs

meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc

@@ -1,8 +1,22 @@
+# Embedded Artists i.MX7ULP COM
+PREFERRED_PROVIDER_virtual/kernel_imx7ulpea-ucom = "linux-lmp-dev-mfgtool"
+KERNEL_REPO_imx7ulpea-ucom ?= "git://github.com/foundriesio/linux.git"
+LINUX_VERSION_imx7ulpea-ucom ?= "4.19.y"
+KERNEL_BRANCH_imx7ulpea-ucom ?= "linux-ea-v4.19.y"
+PREFERRED_VERSION_u-boot-fio-mfgtool_imx7ulpea-ucom ?= "2020.04"
+PREFERRED_PROVIDER_virtual/bootloader_imx7ulpea-ucom = "u-boot-fio-mfgtool"
+PREFERRED_PROVIDER_u-boot_imx7ulpea-ucom = "u-boot-fio-mfgtool"
+PREFERRED_PROVIDER_u-boot-default-script_imx7ulpea-ucom = "u-boot-ostree-scr-fit"
+UBOOT_CLASSES_imx7ulpea-ucom = "uboot-fitimage"
+IMAGE_BOOT_FILES_imx7ulpea-ucom = "boot.itb SPL u-boot.itb"
+KERNEL_IMAGETYPE_imx7ulpea-ucom = "fitImage"
+KERNEL_CLASSES_imx7ulpea-ucom = " kernel-lmp-fitimage "
+
 # iMX6ULL
 PREFERRED_PROVIDER_virtual/kernel_mx6ull = "linux-lmp-dev-mfgtool"
-KERNEL_REPO_mx6ull ?= "git://github.com/Freescale/linux-fslc.git"
+KERNEL_REPO_mx6ull ?= "git://source.codeaurora.org/external/imx/linux-imx.git"
 LINUX_VERSION_mx6ull ?= "5.4.y"
-KERNEL_BRANCH_mx6ull ?= "5.4-1.0.0-imx"
+KERNEL_BRANCH_mx6ull ?= "imx_5.4.24_2.1.0"
 PREFERRED_VERSION_optee-os-fio-mfgtool_mx6ull = "3.10.0+git"
 PREFERRED_VERSION_u-boot-fio-mfgtool_mx6ull ?= "2020.04"
 PREFERRED_PROVIDER_virtual/bootloader_mx6ull = "u-boot-fio-mfgtool"
@@ -14,6 +28,15 @@ IMAGE_BOOT_FILES_append_mx6ull = " boot.itb SPL u-boot.itb"
 KERNEL_IMAGETYPE_mx6ull = "fitImage"
 KERNEL_CLASSES_mx6ull = " kernel-lmp-fitimage "
 
+# iMX8MM
+PREFERRED_VERSION_optee-os-fio-mfgtool_mx8mm = "3.10.0+git"
+PREFERRED_VERSION_u-boot-fio-mfgtool_mx8mm ?= "2020.04"
+PREFERRED_PROVIDER_virtual/bootloader_mx8mm = "u-boot-fio-mfgtool"
+PREFERRED_PROVIDER_u-boot_mx8mm = "u-boot-fio-mfgtool"
+PREFERRED_PROVIDER_u-boot-default-script_mx8mm = "u-boot-ostree-scr"
+KERNEL_IMAGETYPE_mx8mm = "fitImage"
+KERNEL_CLASSES_mx8mm = " kernel-lmp-fitimage "
+
 # Apalis-iMX6
 PREFERRED_PROVIDER_virtual/kernel_apalis-imx6 = "linux-lmp-dev-mfgtool"
 KERNEL_REPO_apalis-imx6 ?= "git://github.com/foundriesio/linux.git"
@@ -28,3 +51,11 @@ UBOOT_CLASSES_apalis-imx6 = "uboot-fitimage"
 IMAGE_BOOT_FILES_apalis-imx6 = "boot.itb SPL u-boot.itb"
 KERNEL_IMAGETYPE_apalis-imx6 = "fitImage"
 KERNEL_CLASSES_apalis-imx6 = " kernel-lmp-fitimage "
+
+# Apalis-iMX8
+PREFERRED_VERSION_u-boot-fio-mfgtool_apalis-imx8 ?= "2020.04"
+PREFERRED_PROVIDER_virtual/bootloader_apalis-imx8 = "u-boot-fio-mfgtool"
+PREFERRED_PROVIDER_u-boot_apalis-imx8 = "u-boot-fio-mfgtool"
+PREFERRED_PROVIDER_u-boot-default-script_apalis-imx8 = "u-boot-ostree-scr-fit"
+KERNEL_IMAGETYPE_apalis-imx8 = "fitImage"
+KERNEL_CLASSES_apalis-imx8 = " kernel-lmp-fitimage "

meta-lmp-bsp/recipes-bsp/imx-atf/imx-atf/0001-Revert-Add-NXP-s-SoCs-partition-reboot-support.patch

@@ -0,0 +1,41 @@
+From a307f33f84b76871ac6879ce93d26525af3e5bd9 Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <[email protected]>
+Date: Tue, 19 May 2020 20:32:59 +0200
+Subject: [PATCH] Revert "Add NXP's SoCs partition reboot support."
+
+This reverts commit 13a5c7ece5a13c636e52f22b45f592b72b6453d1.
+With commit 13a5c7ece5a1 the SCFW will execute a reboot of the AP
+partition as a reaction to a psci_system_reboot, e.g. because of
+a Linux reboot.
+
+This does only reset the SoC partly, i.e. only IP which will not affect
+other partitions. As a result on Apalis iMX8 USB HSIC comes up in a
+state were it does not recognize our USB3503 hub correctly.
+
+Refer to the SCFW doc file sc_fw_port.pdf for more info on the various
+sc_reboot*, sc_reset* functionalities.
+
+Upstream-Status: Inappropriate [configuration]
+
+Related-to: ELB-2702
+Signed-off-by: Max Krummenacher <[email protected]>
+---
+ plat/imx/common/imx8_psci.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plat/imx/common/imx8_psci.c b/plat/imx/common/imx8_psci.c
+index bf0b2f6b1..310f81c2e 100644
+--- a/plat/imx/common/imx8_psci.c
++++ b/plat/imx/common/imx8_psci.c
+@@ -21,7 +21,7 @@ void __dead2 imx_system_off(void)
+
+ void __dead2 imx_system_reset(void)
+ {
+-	sc_pm_reboot(ipc_handle, SC_PM_RESET_TYPE_COLD);
++	sc_pm_reset(ipc_handle, SC_PM_RESET_TYPE_BOARD);
+ 	wfi();
+ 	ERROR("system reset failed.\n");
+ 	panic();
+-- 
+2.20.1
+

meta-lmp-bsp/recipes-bsp/imx-atf/imx-atf_%.bbappend

@@ -1,16 +1,5 @@
-# ATF overrides for Toradex-based devices (based on meta-toradex-nxp)
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
-PLATFORM_mx8qxp  = "imx8qx"
-
-## Apalis-iMX8
-PV_apalis-imx8 = "2.0+git${SRCPV}"
-SRCBRANCH_apalis-imx8 = "imx_4.14.98_2.3.0"
-SRCREV_apalis-imx8 = "bb209a0b4ccca2aa4a3a887f9606dc4a3d294adf"
-
-# imx-atf 1.5 uses bl31-imx8qxp.bin, 2.0 will use bl31-imx8qx.bin for a
-# platform specific filename. Provide both for now, so that the user of
-# the file need not care.
-do_deploy_append_mx8qxp () {
-    install -Dm 0644 ${S}/build/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-imx8qx.bin
-    install -Dm 0644 ${S}/build/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-imx8qxp.bin
-}
+SRC_URI_append_toradex = " \
+    file://0001-Revert-Add-NXP-s-SoCs-partition-reboot-support.patch \
+"

meta-lmp-bsp/recipes-bsp/imx-mkimage/imx-boot_%.bbappend

@@ -7,42 +7,3 @@ do_compile[depends] = " \
     imx-atf:do_deploy \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'virtual/optee-os:do_deploy', '', d)} \
 "
-
-# 8QM (e.g. apalis-imx8)
-SRCBRANCH_apalis-imx8 = "imx_4.14.98_2.3.0"
-SRCREV_apalis-imx8 = "d7f9440dd5c050cc22cb362d53d4048e689a0c01"
-SECO_CHIP ?= "qm"
-SECO_CHIP_apalis-imx8 = "qmb0"
-SECO_FIRMWARE = "mx8${SECO_CHIP}-ahab-container.img"
-REV_CHIP ?= "B0"
-
-compile_mx8() {
-    bbnote 8QM boot binary build
-    cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${SC_FIRMWARE_NAME} ${BOOT_STAGING}/scfw_tcm.bin
-    cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin
-    cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME}                     ${BOOT_STAGING}/u-boot.bin
-    cp ${DEPLOY_DIR_IMAGE}/${SECO_FIRMWARE}                  ${BOOT_STAGING}
-}
-
-deploy_mx8() {
-    install -d ${DEPLOYDIR}/${BOOT_TOOLS}
-    install -m 0644 ${BOOT_STAGING}/${SECO_FIRMWARE} ${DEPLOYDIR}/${BOOT_TOOLS}
-    install -m 0755 ${S}/${TOOLS_NAME}               ${DEPLOYDIR}/${BOOT_TOOLS}
-}
-
-do_compile_apalis-imx8() {
-    # mkimage_uboot requires libssl.so.1.1 from ${STAGING_LIBDIR_NATIVE}
-    export LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE}:$LD_LIBRARY_PATH
-    compile_${SOC_FAMILY}
-    # mkimage for i.MX8
-    if ${DEPLOY_OPTEE}; then
-        cp ${DEPLOY_DIR_IMAGE}/tee.bin ${BOOT_STAGING}
-    fi
-    for target in ${IMXBOOT_TARGETS}; do
-        bbnote "building ${SOC_TARGET} - ${target}"
-        make SOC=${SOC_TARGET} REV=${REV_CHIP} dtbs=${UBOOT_DTB_NAME} ${target}
-        if [ -e "${BOOT_STAGING}/flash.bin" ]; then
-            cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE}-${target}
-        fi
-    done
-}