conf: machine: mx8m[m,n,p]: use boot container class

Use the new boot container build on mainline BSP for mx8mm, mx8mn
and mx8mp machines.

Boot container serves as a replacement for imx-boot package present
in NXP BSP, and is created by U-Boot build system.

Define ATF machine name and required load address.

Define dependency on firmware package, as it provides DDR firmware
binaries needed to construct boot container.

Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/conf/machine/imx8mp-evk.conf b/conf/machine/imx8mp-evk.conf
index 7e55b93a..f790ffb4 100644
--- a/conf/machine/imx8mp-evk.conf
+++ b/conf/machine/imx8mp-evk.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX 8M Plus Evaluation Kit
 #@MAINTAINER: Jun Zhu <junzhu@nxp.com>
 
-MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:"
+MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mp:"
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa53.inc
@@ -59,8 +59,12 @@ DDR_FIRMWARE_NAME = " \
 # Set u-boot DTB
 UBOOT_DTB_NAME = "imx8mp-evk.dtb"
 
-# Set ATF platform name
+# Set ATF platform name and load address
 ATF_PLATFORM = "imx8mp"
+ATF_LOAD_ADDR = "0x970000"
+
+# Extra firmware package name, that is required to build boot container for fslc bsp
+IMX_EXTRA_FIRMWARE = "firmware-imx-8m"
 
 # Set imx-mkimage boot target
 IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}"
@@ -71,10 +75,11 @@ SERIAL_CONSOLES = "115200;ttymxc1"
 
 LOADADDR = ""
 UBOOT_SUFFIX = "bin"
-UBOOT_MAKE_TARGET = ""
+UBOOT_MAKE_TARGET = "all"
 IMX_BOOT_SEEK = "32"
 
 OPTEE_BIN_EXT = "8mp"
+TEE_LOAD_ADDR = "0x56000000"
 
 # Add additional firmware
 MACHINE_FIRMWARE_append = " linux-firmware-ath10k"