From af1befc57af48bfd556a487487663cd3628433f5 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Thu, 4 Feb 2021 10:38:42 +0000 Subject: 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 --- conf/machine/include/imx8mm-evk.inc | 9 +++++++-- conf/machine/include/imx8mn-evk.inc | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'conf/machine/include') 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" -- cgit v1.2.3-54-g00ecf