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>

2 files changed, 6 insertions, 2 deletions

diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index a5ec9d603..5ca817aeb 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 ed15c6f8a..a2188c82e 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}