1 files changed, 7 insertions, 9 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(":"):