From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Fri, 21 May 2021 21:31:27 +0000 (-0500)
Subject: Drop overrides for i.MX 8DXL Phantom MEK
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5dba941277fce453198bb14aef13116675e2629f;p=meta-freescale.git

Drop overrides for i.MX 8DXL Phantom MEK

The i.MX 8DXL Phantom MEK will never be released, so drop the overrides
that have crept into the meta-data.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---

diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass
index 55a2cc47..7c79fc62 100644
--- a/classes/use-imx-security-controller-firmware.bbclass
+++ b/classes/use-imx-security-controller-firmware.bbclass
@@ -22,7 +22,6 @@ SECO_FIRMWARE_NAME_mx8qm         = "mx8qmb0-ahab-container.img"
 SECO_FIRMWARE_NAME_mx8qxp        = \
     "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \
                                                            'mx8qxc0-ahab-container.img', d)}"
-SECO_FIRMWARE_NAME_mx8phantomdxl = "mx8qxc0-ahab-container.img"
 SECO_FIRMWARE_NAME_mx8dxl        = "mx8dxla1-ahab-container.img"
 
 python () {
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb
index ade228d0..bd69f6ea 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb
@@ -17,7 +17,6 @@ BOARD_TYPE ?= "mek"
 SC_FIRMWARE_NAME ?= "INVALID"
 SC_FIRMWARE_NAME_mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"
 SC_FIRMWARE_NAME_mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin"
-SC_FIRMWARE_NAME_mx8phantomdxl = "mx8dxl-phantom-${BOARD_TYPE}-scfw-tcm.bin"
 SC_FIRMWARE_NAME_mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin"
 SC_FIRMWARE_NAME_mx8dx = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin"
 
@@ -39,4 +38,4 @@ INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8phantomdxl|mx8dxl|mx8dx)"
+COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)"
diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
index e6b52abe..af51529b 100644
--- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb
+++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
@@ -21,4 +21,4 @@ do_install () {
 	oe_runmake DESTDIR=${D} install
 }
 
-COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8phantomdxl|mx8dxl|mx8dx)"
+COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)"
diff --git a/recipes-bsp/imx-seco/imx-seco_3.7.5.bb b/recipes-bsp/imx-seco/imx-seco_3.7.5.bb
index 7b9c4c98..c3d86e7a 100644
--- a/recipes-bsp/imx-seco/imx-seco_3.7.5.bb
+++ b/recipes-bsp/imx-seco/imx-seco_3.7.5.bb
@@ -23,4 +23,4 @@ do_deploy () {
     install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
 }
 
-COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8phantomdxl|mx8dxl|mx8dx)"
+COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)"
diff --git a/recipes-support/opencv/opencv_4.5.2.imx.bb b/recipes-support/opencv/opencv_4.5.2.imx.bb
index 2d71acfc..a86fd3ec 100644
--- a/recipes-support/opencv/opencv_4.5.2.imx.bb
+++ b/recipes-support/opencv/opencv_4.5.2.imx.bb
@@ -269,7 +269,6 @@ PACKAGECONFIG_append_mx8    = " dnn text"
 PACKAGECONFIG_OPENCL        = ""
 PACKAGECONFIG_OPENCL_mx8    = "opencl"
 PACKAGECONFIG_OPENCL_mx8dxl = ""
-PACKAGECONFIG_OPENCL_mx8phantomdxl = ""
 PACKAGECONFIG_OPENCL_mx8mm  = ""
 PACKAGECONFIG_OPENCL_mx8mnlite  = ""
 PACKAGECONFIG_append        = " ${PACKAGECONFIG_OPENCL}"