From fce19eb3e0d29fce674634d8c15415abd3447453 Mon Sep 17 00:00:00 2001
From: Gary Bisson <gary.bisson@boundarydevices.com>
Date: Mon, 28 Dec 2020 17:39:42 +0100
Subject: [PATCH] imx-atf: allow to be used with mainline bsp for all mx8
 machines

That way all platforms are setup the same way.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 conf/machine/imx8mqevk.conf        | 3 +++
 conf/machine/imx8qmmek.conf        | 3 +++
 conf/machine/imx8qxpmek.conf       | 3 +++
 recipes-bsp/imx-atf/imx-atf_2.2.bb | 6 ------
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mqevk.conf
index 2c9c8c29..3ff21bd4 100644
--- a/conf/machine/imx8mqevk.conf
+++ b/conf/machine/imx8mqevk.conf
@@ -43,6 +43,9 @@ DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin l
 # Set u-boot DTB
 UBOOT_DTB_NAME = "imx8mq-evk.dtb"
 
+# Set ATF platform name
+ATF_PLATFORM = "imx8mq"
+
 # Set imx-mkimage boot target
 IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk"
 
diff --git a/conf/machine/imx8qmmek.conf b/conf/machine/imx8qmmek.conf
index 4e459a5e..2b2606a6 100644
--- a/conf/machine/imx8qmmek.conf
+++ b/conf/machine/imx8qmmek.conf
@@ -53,6 +53,9 @@ IMX_BOOT_SEEK = "33"
 WKS_FILE_DEPENDS_append = " firmware-imx-8"
 IMAGE_BOOT_FILES += "hdmitxfw.bin hdmirxfw.bin dpfw.bin"
 
+# Set ATF platform name
+ATF_PLATFORM = "imx8qm"
+
 IMXBOOT_TARGETS = \
     "${@bb.utils.contains('UBOOT_CONFIG',         'sd', 'flash', \
                                                         'flash_flexspi', d)}"
diff --git a/conf/machine/imx8qxpmek.conf b/conf/machine/imx8qxpmek.conf
index 9b96c711..e3f5ca45 100644
--- a/conf/machine/imx8qxpmek.conf
+++ b/conf/machine/imx8qxpmek.conf
@@ -52,6 +52,9 @@ UBOOT_CONFIG[fspi] = "imx8qxp_mek_fspi_defconfig"
 
 IMX_BOOT_SEEK = "32"
 
+# Set ATF platform name
+ATF_PLATFORM = "imx8qx"
+
 IMXBOOT_TARGETS = \
     "${@bb.utils.contains('UBOOT_CONFIG',   'sd', 'flash', \
         bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_flexspi', \
diff --git a/recipes-bsp/imx-atf/imx-atf_2.2.bb b/recipes-bsp/imx-atf/imx-atf_2.2.bb
index e89822da..6fb857ec 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.2.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.2.bb
@@ -21,12 +21,6 @@ inherit deploy
 BOOT_TOOLS = "imx-boot-tools"
 
 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}" \
-- 
2.40.1