From 413a8b64a5d2f179a93da58ac7719debd9718797 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 21 Aug 2023 11:48:06 -0700 Subject: fsl-eula-unpack.bbclass: Add v44 EULA sum Signed-off-by: Tom Hochstein --- classes/fsl-eula-unpack.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'classes') diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass index ce41b4d3..158b5c1c 100644 --- a/classes/fsl-eula-unpack.bbclass +++ b/classes/fsl-eula-unpack.bbclass @@ -52,6 +52,7 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V38 = "65c483bb431ccd9a1820e687 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V39 = "5a0bf11f745e68024f37b4724a5364fe" FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V40 = "add2d392714d3096ed7e0f7e2190724b" FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V42 = "ea25d099982d035af85d193c88a1b479" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V44 = "d7853b7bf2936b2c25c893eac7033374" FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V45 = "63a38e9f392d8813d6f1f4d0d6fbe657" FSL_EULA_FILE_MD5SUMS = " \ @@ -101,6 +102,7 @@ FSL_EULA_FILE_MD5SUMS = " \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V39} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V40} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V42} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V44} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V45} \ " -- cgit v1.2.3-54-g00ecf 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 +++++++--------- conf/machine/include/imx-base.inc | 14 ++++++++++++++ recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 9 +-------- 3 files changed, 22 insertions(+), 17 deletions(-) (limited to 'classes') 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 -- cgit v1.2.3-54-g00ecf