imx-base.inc: Implement generic SOC revision design

Rework imx-boot and use-imx-security-controller-firmware.bbclass with a
generic SOC revision design implemented in imx-base.inc. This does
replace the machine feature design using `soc-rev*`, but maintains
backwards compatibility by incorporating that design into the default
settings.

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

3 files changed, 22 insertions, 17 deletions

diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass
index d3a7de83..f07580dd 100644
--- a/classes/use-imx-security-controller-firmware.bbclass
+++ b/classes/use-imx-security-controller-firmware.bbclass
@@ -16,15 +16,13 @@
 # This behavior ensures that derivatives which requires SECO Firmware to be
 # present in the image file have it properly defined.
 
-SECO_FIRMWARE_NAME                ?= ""
-SECO_FIRMWARE_NAME:mx8qm-generic-bsp  ?= "mx8qmb0-ahab-container.img"
-SECO_FIRMWARE_NAME:mx8qxp-generic-bsp ?= \
-    "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \
-                                                           'mx8qxc0-ahab-container.img', d)}"
-SECO_FIRMWARE_NAME:mx8dx-generic-bsp  ?= "mx8qxc0-ahab-container.img"
-SECO_FIRMWARE_NAME:mx8dxl-generic-bsp ?= "mx8dxla1-ahab-container.img"
-SECO_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulpa1-ahab-container.img"
-SECO_FIRMWARE_NAME:mx93-generic-bsp   ?= "mx93a0-ahab-container.img"
+SECO_FIRMWARE_NAME                    ?= ""
+SECO_FIRMWARE_NAME:mx8qm-generic-bsp  ?= "mx8qm${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx8qxp-generic-bsp ?= "mx8qx${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx8dx-generic-bsp  ?= "mx8qx${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx8dxl-generic-bsp ?= "mx8dxl${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx93-generic-bsp   ?= "mx93${IMX_SOC_REV_LOWER}-ahab-container.img"
 
 python () {
     if "mx8m-generic-bsp" in d.getVar('MACHINEOVERRIDES').split(":"):
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b0144cac..49c90c1e 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -169,6 +169,20 @@ DEFAULTTUNE:mx93-generic-bsp   ?= "cortexa55"
 
 INHERIT += "machine-overrides-extender"
 
+IMX_SOC_REV                    ??= "A0"
+IMX_SOC_REV:mx8qm-generic-bsp  ??= "B0"
+IMX_SOC_REV:mx8qxp-generic-bsp ??= \
+    "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'B0', \
+                                                           'C0', d)}"
+IMX_SOC_REV:mx8dx-generic-bsp  ??= "C0"
+IMX_SOC_REV:mx8dxl-generic-bsp ??= "A1"
+IMX_SOC_REV:mx8ulp-generic-bsp ??= \
+    "${@bb.utils.contains('MACHINE_FEATURES', 'soc-reva0', 'A0', \
+                                                           'A1', d)}"
+
+IMX_SOC_REV_LOWER   = "${@d.getVar('IMX_SOC_REV').lower()}"
+IMX_SOC_REV_UPPER   = "${@d.getVar('IMX_SOC_REV').upper()}"
+
 #######
 ### NXP BSP specific overrides
 #######
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index b41c3bf4..1d501ec1 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -68,14 +68,7 @@ SOC_FAMILY:mx8x-generic-bsp   = "mx8x"
 SOC_FAMILY:mx8ulp-generic-bsp = "mx8ulp"
 SOC_FAMILY:mx93-generic-bsp   = "mx93"
 
-REV_OPTION ?= ""
-REV_OPTION:mx8qxp-generic-bsp = \
-    "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', '', \
-                                                           'REV=C0', d)}"
-REV_OPTION:mx8dx-generic-bsp  = "REV=C0"
-REV_OPTION:mx8ulp-generic-bsp = \
-    "${@bb.utils.contains('MACHINE_FEATURES', 'soc-reva0', '', \
-                                                           'REV=A1', d)}"
+REV_OPTION ?= "REV=${IMX_SOC_REV_UPPER}"
 
 do_uboot_assemble_fitimage:prepend:imx-generic-bsp() {
     for config in ${UBOOT_MACHINE}; do