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>

4 files changed, 28 insertions, 11 deletions

diff --git a/conf/machine/imx8mn-ddr4-evk.conf b/conf/machine/imx8mn-ddr4-evk.conf
index c35f7e74..442afdbd 100644
--- a/conf/machine/imx8mn-ddr4-evk.conf
+++ b/conf/machine/imx8mn-ddr4-evk.conf
@@ -11,10 +11,12 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \
 "
 UBOOT_CONFIG_BASENAME = "imx8mn_ddr4_evk"
+
+DDR_FIRMWARE_VERSION = "201810"
 DDR_FIRMWARE_NAME = " \
-    ddr4_imem_1d_201810.bin \
-    ddr4_dmem_1d_201810.bin \
-    ddr4_imem_2d_201810.bin \
-    ddr4_dmem_2d_201810.bin \
+    ddr4_imem_1d_${DDR_FIRMWARE_VERSION}.bin \
+    ddr4_dmem_1d_${DDR_FIRMWARE_VERSION}.bin \
+    ddr4_imem_2d_${DDR_FIRMWARE_VERSION}.bin \
+    ddr4_dmem_2d_${DDR_FIRMWARE_VERSION}.bin \
 "
 IMXBOOT_TARGETS_BASENAME = "flash_ddr4_evk"
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"
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 20bc9b77..6f21ce8e 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -1,4 +1,4 @@
-MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:"
+MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mm:"
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa53.inc
@@ -27,6 +27,10 @@ UBOOT_CONFIG[mfgtool]  = "${UBOOT_CONFIG_BASENAME}_defconfig"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 ATF_PLATFORM = "imx8mm"
+ATF_LOAD_ADDR = "0x920000"
+
+# Extra firmware package name, that is required to build boot container for fslc bsp
+IMX_EXTRA_FIRMWARE = "firmware-imx-8m"
 
 IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}"
 
@@ -36,10 +40,11 @@ SERIAL_CONSOLES = "115200;ttymxc1"
 
 LOADADDR = ""
 UBOOT_SUFFIX = "bin"
-UBOOT_MAKE_TARGET = ""
+UBOOT_MAKE_TARGET = "all"
 IMX_BOOT_SEEK = "33"
 
 OPTEE_BIN_EXT = "8mm"
+TEE_LOAD_ADDR = "0xbe000000"
 
 # Add additional firmware
 MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index 8e68f2fe..265b594c 100644
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -1,4 +1,4 @@
-MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:"
+MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mn:"
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa53.inc
@@ -28,6 +28,10 @@ UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 ATF_PLATFORM = "imx8mn"
+ATF_LOAD_ADDR = "0x960000"
+
+# Extra firmware package name, that is required to build boot container for fslc bsp
+IMX_EXTRA_FIRMWARE = "firmware-imx-8m"
 
 IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}"
 
@@ -38,7 +42,7 @@ SERIAL_CONSOLES = "115200;ttymxc1"
 BOOT_SPACE = "65536"
 LOADADDR = ""
 UBOOT_SUFFIX = "bin"
-UBOOT_MAKE_TARGET = ""
+UBOOT_MAKE_TARGET = "all"
 
 # Image boot offset as defined in section 6.1.6.1 "Primary image offset and IVT offset" of
 # i.MX 8M Nano Applications Processor Reference Manual, Rev. 0, 12/2019
@@ -46,6 +50,7 @@ UBOOT_MAKE_TARGET = ""
 IMX_BOOT_SEEK = "32"
 
 OPTEE_BIN_EXT = "8mn"
+TEE_LOAD_ADDR = "0x56000000"
 
 # Add additional firmware
 MACHINE_FIRMWARE_append = " linux-firmware-ath10k"