4 files changed, 20 insertions, 14 deletions

diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf
index 231d7ff72..fcd78fb5a 100644
--- 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 f0d785cdf..fa0cb7b42 100644
--- 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 f76240b68..9addae7d5 100644
--- 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 ca07dcad8..e89822daa 100644
--- 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)"