imx-atf: allow to be used with mainline bsp for mx8m machines

Since ATF is required for i.MX8M series to boot the SOC, allow it to be
built when use-mainline-bsp is set.

Move ATF build platform definition to target machine configuration
files, since MACHINEOVERRIDES extender filters out the override that is
used to identify it in the recipe. Therefore, for those mx8m machines
that are ready to be built with mainline BSP - ATF build platform is
explicitly defined in the machine config in order to be properly set for
ATF build.

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

diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf
index 231d7ff72ca40e6e772dddc165df648379e83b07..fcd78fb5afed75731796eadd7ac14183c34ea037 100644 (file)
--- a/conf/machine/imx8mmevk.conf
+++ b/conf/machine/imx8mmevk.conf
@@ -56,6 +56,9 @@ DDR_FIRMWARE_NAME = " \
 # Set u-boot DTB
 UBOOT_DTB_NAME = "imx8mm-evk.dtb"
 
+# Set ATF platform name
+ATF_PLATFORM = "imx8mm"
+
 # Set imx-mkimage boot target
 IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}"
 

diff --git a/conf/machine/imx8mnevk.conf b/conf/machine/imx8mnevk.conf
index f0d785cdff171e0fbc8ccb71fa568b201ce0cc41..fa0cb7b425c9847f646f240ac575c66d64f673c9 100644 (file)
--- a/conf/machine/imx8mnevk.conf
+++ b/conf/machine/imx8mnevk.conf
@@ -44,6 +44,9 @@ DDR_FIRMWARE_NAME = "ddr4_imem_1d_201810.bin \
 # Set u-boot DTB
 UBOOT_DTB_NAME = "imx8mn-ddr4-evk.dtb"
 
+# Set ATF platform name
+ATF_PLATFORM = "imx8mn"
+
 # Set imx-mkimage boot target
 IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_ddr4_evk_flexspi', 'flash_ddr4_evk', d)}"
 

diff --git a/conf/machine/imx8mpevk.conf b/conf/machine/imx8mpevk.conf
index f76240b683526543dfaea7619e49084784e9b0fb..9addae7d5b79461b5a9c6c72c1e7470071d19563 100644 (file)
--- a/conf/machine/imx8mpevk.conf
+++ b/conf/machine/imx8mpevk.conf
@@ -51,6 +51,9 @@ DDR_FIRMWARE_NAME = " \
 # Set u-boot DTB
 UBOOT_DTB_NAME = "imx8mp-evk.dtb"
 
+# Set ATF platform name
+ATF_PLATFORM = "imx8mp"
+
 # Set imx-mkimage boot target
 IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}"
 

diff --git a/recipes-bsp/imx-atf/imx-atf_2.2.bb b/recipes-bsp/imx-atf/imx-atf_2.2.bb
index ca07dcad8002405327cb09b5513046d006f83397..e89822daabe6e32fff120d289028241f0dbf2346 100644 (file)
--- a/recipes-bsp/imx-atf/imx-atf_2.2.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.2.bb
@@ -20,20 +20,17 @@ inherit deploy
 
 BOOT_TOOLS = "imx-boot-tools"
 
-PLATFORM        ?= "INVALID"
-PLATFORM_mx8qm   = "imx8qm"
-PLATFORM_mx8x    = "imx8qx"
-PLATFORM_mx8mq   = "imx8mq"
-PLATFORM_mx8mm   = "imx8mm"
-PLATFORM_mx8mn   = "imx8mn"
-PLATFORM_mx8mp   = "imx8mp"
-PLATFORM_mx8dx   = "imx8dx"
-PLATFORM_imx8dxlevk = "imx8dxl"
-PLATFORM_mx8dxlevk-phantom = "imx8qx"
+ATF_PLATFORM ??= "INVALID"
+ATF_PLATFORM_mx8qm   = "imx8qm"
+ATF_PLATFORM_mx8x    = "imx8qx"
+ATF_PLATFORM_mx8mq   = "imx8mq"
+ATF_PLATFORM_mx8dx   = "imx8dx"
+ATF_PLATFORM_imx8dxlevk = "imx8dxl"
+ATF_PLATFORM_mx8dxlevk-phantom = "imx8qx"
 
 EXTRA_OEMAKE += " \
     CROSS_COMPILE="${TARGET_PREFIX}" \
-    PLAT=${PLATFORM} \
+    PLAT=${ATF_PLATFORM} \
 "
 
 BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}"
@@ -51,12 +48,12 @@ do_compile() {
 do_install[noexec] = "1"
 
 do_deploy() {
-    install -Dm 0644 ${S}/build/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${PLATFORM}.bin
+    install -Dm 0644 ${S}/build/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${ATF_PLATFORM}.bin
     if ${BUILD_OPTEE}; then
-       install -m 0644 ${S}/build-optee/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${PLATFORM}.bin-optee
+       install -m 0644 ${S}/build-optee/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${ATF_PLATFORM}.bin-optee
     fi
 }
 addtask deploy after do_compile
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(mx8)"
+COMPATIBLE_MACHINE = "(mx8|use-mainline-bsp)"