From 80345fbe89c5ac96975f9c7ef38e8dc8d2a36346 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Mon, 14 Dec 2020 16:03:50 -0600
Subject: [PATCH] imx8qxpmek: Update the i.MX 8QXP default build to rev C0

The current machine configuration support for 8QXP MEK is for rev B0 silicon.
Support for rev C0 is implemented using a machine override `mx8qxpc0`.

Update the default build to rev C0 silicon. Support for rev B0 is provided
with a new machine feature `soc-revb0`. The machine override is removed.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 classes/use-imx-security-controller-firmware.bbclass | 5 +++--
 recipes-bsp/imx-mkimage/imx-boot_1.0.bb              | 4 +++-
 recipes-bsp/imx-mkimage/imx-mkimage_git.bb           | 4 +++-
 recipes-bsp/imx-seco/imx-seco-libs_git.bb            | 2 +-
 recipes-bsp/imx-seco/imx-seco_3.7.1.bb               | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass
index 7b82bcaf..52b1bf37 100644
--- a/classes/use-imx-security-controller-firmware.bbclass
+++ b/classes/use-imx-security-controller-firmware.bbclass
@@ -19,8 +19,9 @@
 SECO_FIRMWARE_NAME              ?= ""
 
 SECO_FIRMWARE_NAME_mx8qm         = "mx8qmb0-ahab-container.img"
-SECO_FIRMWARE_NAME_mx8qxp        = "mx8qxb0-ahab-container.img"
-SECO_FIRMWARE_NAME_mx8qxpc0      = "mx8qxc0-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 = "mx8qxb0-ahab-container.img"
 SECO_FIRMWARE_NAME_mx8dxl        = "mx8dxla0-ahab-container.img"
 
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index a5ec9d60..5ca817ae 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -65,7 +65,9 @@ SOC_FAMILY_mx8m = "mx8m"
 SOC_FAMILY_mx8x = "mx8x"
 
 REV_OPTION ?= ""
-REV_OPTION_mx8qxpc0 = "REV=C0"
+REV_OPTION_mx8qxp = \
+    "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', '', \
+                                                           'REV=C0', d)}"
 
 compile_mx8m() {
     bbnote 8MQ/8MM/8MN/8MP boot binary build
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
index ed15c6f8..a2188c82 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
@@ -13,7 +13,9 @@ inherit native deploy
 CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR} -L ${STAGING_LIBDIR}"
 
 REV_CHIP ?= "B0"
-REV_CHIP_mx8qxpc0 = "C0"
+REV_CHIP_mx8qxp = \
+    "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'B0', \
+                                                           'C0', d)}"
 
 do_compile () {
     cd ${S}
diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
index 8184b56a..0cc0187d 100644
--- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb
+++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
@@ -20,4 +20,4 @@ do_install () {
 	oe_runmake DESTDIR=${D} install
 }
 
-COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8qxpc0|mx8phantomdxl|mx8dxl)"
+COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8phantomdxl|mx8dxl)"
diff --git a/recipes-bsp/imx-seco/imx-seco_3.7.1.bb b/recipes-bsp/imx-seco/imx-seco_3.7.1.bb
index 62c22dc2..28469390 100644
--- a/recipes-bsp/imx-seco/imx-seco_3.7.1.bb
+++ b/recipes-bsp/imx-seco/imx-seco_3.7.1.bb
@@ -23,4 +23,4 @@ do_deploy () {
     install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
 }
 
-COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8qxpc0|mx8phantomdxl|mx8dxl)"
+COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8phantomdxl|mx8dxl)"
-- 
2.40.1