From 68cc1d3fec0ed82b53c85ad8f97287d020387335 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Sun, 20 Feb 2022 15:56:58 +0100
Subject: layer: rework recipes to use soc familiy overrides

Follow meta-freescale commit 30f5ce1d ("Generalize overrides subsystem for
NXP and Mainline support").

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 recipes-images/images/packagegroup-tdx-cli.bb       |  6 +++---
 recipes-images/images/packagegroup-tdx-graphical.bb | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/recipes-images/images/packagegroup-tdx-cli.bb b/recipes-images/images/packagegroup-tdx-cli.bb
index 737f25a..626903f 100644
--- a/recipes-images/images/packagegroup-tdx-cli.bb
+++ b/recipes-images/images/packagegroup-tdx-cli.bb
@@ -77,7 +77,7 @@ RRECOMMENDS:packagegroup-devel-tdx-cli = "\
     spidev-test \
     strace \
 "
-RRECOMMENDS:packagegroup-devel-tdx-cli:remove:use-nxp-bsp:colibri-vf = "perf"
+RRECOMMENDS:packagegroup-devel-tdx-cli:remove:colibri-vf = "perf"
 
 SUMMARY:packagegroup-machine-tdx-cli = "Machine specific tools"
 RRECOMMENDS:packagegroup-machine-tdx-cli = "\
@@ -101,7 +101,7 @@ RRECOMMENDS_packagegroup-machine-tdx-cli:colibri-imx6ull-emmc = "\
 RRECOMMENDS:packagegroup-machine-tdx-cli:colibri-imx7 = "\
     mtd-utils-ubifs \
 "
-RRECOMMENDS:packagegroup-machine-tdx-cli:mx8 = "\
+RRECOMMENDS:packagegroup-machine-tdx-cli:mx8-generic-bsp = "\
     mwifiexap \
 "
 RRECOMMENDS:packagegroup-machine-tdx-cli:tegra124 = "\
@@ -156,7 +156,7 @@ RRECOMMENDS:packagegroup-utils-tdx-cli = "\
     ${USB_GADGET} \
     util-linux \
 "
-RRECOMMENDS:packagegroup-utils-tdx-cli:append:mx8 = " \
+RRECOMMENDS:packagegroup-utils-tdx-cli:append:mx8-generic-bsp = " \
     cpuburn-a53 \
 "
 RRECOMMENDS:packagegroup-utils-tdx-cli:append:tegra124 = " \
diff --git a/recipes-images/images/packagegroup-tdx-graphical.bb b/recipes-images/images/packagegroup-tdx-graphical.bb
index 7363d4a..ad5b4ef 100644
--- a/recipes-images/images/packagegroup-tdx-graphical.bb
+++ b/recipes-images/images/packagegroup-tdx-graphical.bb
@@ -22,7 +22,7 @@ RRECOMMENDS:packagegroup-tdx-graphical = " \
                           packagegroup-x11-utils-tdx-graphical', \
                          '', d), d)} \
 "
-RRECOMMENDS:packagegroup-tdx-graphical:append:mx8 = " \
+RRECOMMENDS:packagegroup-tdx-graphical:append:mx8-nxp-bsp = " \
     packagegroup-drm-utils-tdx-graphical \
 "
 RRECOMMENDS:packagegroup-tdx-graphical:append:upstream = " \
@@ -48,12 +48,12 @@ GSTREAMER_MX6QDL = " \
     imx-gst1.0-plugin-gplay \
     imx-gst1.0-plugin-grecorder \
 "
-RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx6dl = " ${GSTREAMER_MX6QDL}"
-RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx6q = " ${GSTREAMER_MX6QDL}"
+RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx6dl-nxp-bsp = " ${GSTREAMER_MX6QDL}"
+RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx6q-nxp-bsp = " ${GSTREAMER_MX6QDL}"
 RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:colibri-imx6ull = ""
 RRECOMMENDS_packagegroup-gstreamer-tdx-graphical:colibri-imx6ull-emmc = ""
-RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx7 = " imx-gst1.0-plugin"
-RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx8 = " \
+RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx7-nxp-bsp = " imx-gst1.0-plugin"
+RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx8-nxp-bsp = " \
     imx-gst1.0-plugin \
     imx-gst1.0-plugin-gplay \
     imx-gst1.0-plugin-grecorder \
@@ -72,16 +72,16 @@ RRECOMMENDS:packagegroup-gpu-tdx-graphical = " \
 IMAGE_INSTALL_GPU_MX6QDL = " \
     packagegroup-fsl-gpu-libs \
 "
-RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx6dl = " \
+RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx6dl-nxp-bsp = " \
     ${IMAGE_INSTALL_GPU_MX6QDL} \
 "
-RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx6q = " \
+RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx6q-nxp-bsp = " \
     ${IMAGE_INSTALL_GPU_MX6QDL} \
     ${IMAGE_INSTALL_OPENCL_IMX} \
 "
 RRECOMMENDS:packagegroup-gpu-tdx-graphical:colibri-imx6ull = ""
 RRECOMMENDS_packagegroup-gpu-tdx-graphical:colibri-imx6ull-emmc = ""
-RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8 = " \
+RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8-nxp-bsp = " \
     tinycompress \
     libvdk-imx \
     vulkan-headers \
@@ -89,11 +89,11 @@ RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8 = " \
     vulkan-tools \
     ${IMAGE_INSTALL_OPENCL_IMX} \
 "
-RRECOMMENDS:packagegroup-gpu-tdx-graphical:remove:mx8mm = " \
+RRECOMMENDS:packagegroup-gpu-tdx-graphical:remove:mx8mm-nxp-bsp = " \
     vulkan \
     ${IMAGE_INSTALL_OPENCL_IMX} \
 "
-RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8qm = " \
+RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8qm-nxp-bsp = " \
     libopenvx-imx \
 "
 RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:tegra124 = " \
-- 
cgit v1.2.3