From 2c9cc2c0ff1d033ece55b4bf2c0a2e577d03f6f6 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 21 Aug 2024 18:44:51 +0200 Subject: [PATCH] firmware-ele-imx: add new version 0.1.2 recipe for ccimx91 Signed-off-by: Javier Viguera --- meta-digi-arm/conf/layer.conf | 2 ++ meta-digi-arm/conf/machine/ccimx91-dvk.conf | 12 +++---- meta-digi-arm/conf/machine/ccimx93-dvk.conf | 5 ++- meta-digi-arm/conf/machine/include/ccimx9.inc | 4 --- .../firmware-imx/firmware-ele-imx_0.1.0.bb | 2 +- .../firmware-imx/firmware-ele-imx_0.1.2.bb | 32 +++++++++++++++++++ 6 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.2.bb diff --git a/meta-digi-arm/conf/layer.conf b/meta-digi-arm/conf/layer.conf index 415dc41df..5d8b7fc6a 100644 --- a/meta-digi-arm/conf/layer.conf +++ b/meta-digi-arm/conf/layer.conf @@ -30,11 +30,13 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V42 = "ea25d099982d035af85d193c FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V45 = "63a38e9f392d8813d6f1f4d0d6fbe657" FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V48 = "db4762b09b6bda63da103963e6e081de" FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V49 = "2827219e81f28aba7c6a569f7c437fa7" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V56 = "10c0fda810c63b052409b15a5445671a" FSL_EULA_FILE_MD5SUMS:append = " \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V42} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V45} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V48} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V49} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V56} \ " # STM EULA diff --git a/meta-digi-arm/conf/machine/ccimx91-dvk.conf b/meta-digi-arm/conf/machine/ccimx91-dvk.conf index 9e2376d63..a45a67533 100644 --- a/meta-digi-arm/conf/machine/ccimx91-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx91-dvk.conf @@ -14,6 +14,12 @@ IMXBOOT_TARGETS = "flash_singleboot" UBOOT_CONFIG ??= "ccimx91-dvk" UBOOT_CONFIG[ccimx91-dvk] = "ccimx91-dvk_defconfig" +# imx-boot configurations +ATF_PLATFORM = "imx91" +IMX_BOOT_SOC_TARGET = "iMX91" +IMXBOOT_TARGETS = "flash_singleboot" +SECO_FIRMWARE_NAME = "mx91a0-ahab-container.img" + BOOTLOADER_SEEK_USERDATA = "32" KERNEL_DEVICETREE ?= " \ @@ -39,9 +45,3 @@ BOOTABLE_ARTIFACTS = " \ SOC_TOOLS_TEST:append:mx91-nxp-bsp = " imx-secure-enclave" # Add AFE support NXPAFE_INSTALL:mx91-nxp-bsp = "nxp-afe nxp-afe-voiceseeker" - -IMXBOOT_TARGETS = "flash_singleboot" -IMX_BOOT_SOC_TARGET = "iMX91" - -# Set ATF platform name -ATF_PLATFORM = "imx91" diff --git a/meta-digi-arm/conf/machine/ccimx93-dvk.conf b/meta-digi-arm/conf/machine/ccimx93-dvk.conf index e6e760be4..78cb37e7e 100644 --- a/meta-digi-arm/conf/machine/ccimx93-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx93-dvk.conf @@ -12,10 +12,13 @@ include conf/machine/include/ccimx9.inc UBOOT_CONFIG ??= "ccimx93-dvk" UBOOT_CONFIG[ccimx93-dvk] = "ccimx93-dvk_defconfig" -# Set ATF platform name +# imx-boot configurations ATF_PLATFORM = "imx93" IMX_BOOT_SOC_TARGET = "iMX93" IMXBOOT_TARGETS = "flash_singleboot flash_singleboot_a0" +# Generate images for all SOC revisions (keep the override as otherwise the +# one in "use-imx-security-controller-firmware.bbclass" takes precedence) +SECO_FIRMWARE_NAME:ccimx93 = "mx93??-ahab-container.img" KERNEL_DEVICETREE ?= " \ digi/ccimx93-dvk.dtb \ diff --git a/meta-digi-arm/conf/machine/include/ccimx9.inc b/meta-digi-arm/conf/machine/include/ccimx9.inc index 3f045fbfe..ccd45d4bf 100644 --- a/meta-digi-arm/conf/machine/include/ccimx9.inc +++ b/meta-digi-arm/conf/machine/include/ccimx9.inc @@ -27,10 +27,6 @@ BOOTABLE_FILENAME = "${UBOOT_PREFIX}-${MACHINE}.bin" SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}" BOOTLOADER_SEEK_USERDATA = "32" -# Generate images for all SOC revisions (keep the override as otherwise the -# one in "use-imx-security-controller-firmware.bbclass" takes precedence) -SECO_FIRMWARE_NAME:ccimx9 = "mx93??-ahab-container.img" - DDR_FIRMWARE_NAME = " \ lpddr4_dmem_1d_v202201.bin \ lpddr4_dmem_2d_v202201.bin \ diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.0.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.0.bb index 52beb9e36..ede95b166 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.0.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.0.bb @@ -26,4 +26,4 @@ addtask deploy after do_install before do_build FILES:${PN} += "${nonarch_base_libdir}/firmware/imx/ele/${SECO_FIRMWARE_NAME}" -COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx9-nxp-bsp)" +COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.2.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.2.bb new file mode 100644 index 000000000..323e6b9d5 --- /dev/null +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.2.bb @@ -0,0 +1,32 @@ +# Copyright 2021-2023 NXP +SUMMARY = "NXP i.MX ELE firmware" +DESCRIPTION = "EdgeLock Secure Enclave firmware for i.MX series SoCs" +SECTION = "base" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" + +inherit fsl-eula-unpack use-imx-security-controller-firmware deploy + +SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" +IMX_SRCREV_ABBREV = "4ed450a" +SRC_URI[md5sum] = "1359bc7d378bddfe1d8479eba05b05ec" +SRC_URI[sha256sum] = "d858fcbb47482a898a1af5fe5f3f8be53bb21fac793b33e9bcdfd2b4dda79d3c" + +S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" + +do_compile[noexec] = "1" + +do_install() { + install -d ${D}${nonarch_base_libdir}/firmware/imx/ele + install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele +} + +do_deploy () { + # Deploy the related firmware to be package by imx-boot + install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} +} +addtask deploy after do_install before do_build + +FILES:${PN} += "${nonarch_base_libdir}/firmware/imx/ele/${SECO_FIRMWARE_NAME}" + +COMPATIBLE_MACHINE = "(ccimx91)"