From 0688f79193e697b1bd7444358a7b46c22b83ca2b Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 21 Aug 2023 11:48:06 -0700 Subject: 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 --- classes/use-imx-security-controller-firmware.bbclass | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'classes/use-imx-security-controller-firmware.bbclass') 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(":"): -- cgit v1.2.3-54-g00ecf