From 45c356555ef8535f99dc76a368f8d22e7087461e Mon Sep 17 00:00:00 2001
From: Daiane Angolini <daiane.angolini@foundries.io>
Date: Fri, 26 Jan 2024 13:56:04 -0300
Subject: firmware-sentinel: Rename firmware-sentinel to firmware-ele-imx

Since [1] the firmware-sentinel is renamed to firmware-ele-imx.

It also align the recipe to be aligned with the NXP BSP LF6.1.55_2.2.0.

[1] https://github.com/nxp-imx/meta-imx/commit/6412faf7e4b85f6d94342a19a79fd391888b1ec6

Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
---
 conf/machine/include/imx-base.inc                  |  4 +--
 recipes-bsp/firmware-imx/firmware-ele-imx_0.1.0.bb | 32 ++++++++++++++++++++++
 .../firmware-sentinel/firmware-sentinel_0.11.bb    | 27 ------------------
 3 files changed, 34 insertions(+), 29 deletions(-)
 create mode 100644 recipes-bsp/firmware-imx/firmware-ele-imx_0.1.0.bb
 delete mode 100644 recipes-bsp/firmware-sentinel/firmware-sentinel_0.11.bb

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index e17a1c649..ff0796bf0 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -398,8 +398,8 @@ IMX_EXTRA_FIRMWARE                   ?= ""
 IMX_EXTRA_FIRMWARE:mx8-generic-bsp    = "imx-boot-firmware-files imx-sc-firmware imx-seco"
 IMX_EXTRA_FIRMWARE:mx8m-generic-bsp   = "imx-boot-firmware-files"
 IMX_EXTRA_FIRMWARE:mx8x-generic-bsp   = "imx-sc-firmware imx-seco"
-IMX_EXTRA_FIRMWARE:mx8ulp-generic-bsp = "firmware-upower firmware-sentinel"
-IMX_EXTRA_FIRMWARE:mx93-generic-bsp   = "imx-boot-firmware-files firmware-sentinel"
+IMX_EXTRA_FIRMWARE:mx8ulp-generic-bsp = "firmware-upower firmware-ele-imx"
+IMX_EXTRA_FIRMWARE:mx93-generic-bsp   = "imx-boot-firmware-files firmware-ele-imx"
 
 # Firmware
 MACHINE_FIRMWARE ?= ""
diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.0.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.0.bb
new file mode 100644
index 000000000..83c865c25
--- /dev/null
+++ b/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.0.bb
@@ -0,0 +1,32 @@
+# Copyright 2021-2023 NXP
+SUMMARY = "NXP i.MX ELE firmware"
+DESCRIPTION = "EdgeLock Enclave firmware for i.MX series SoCs"
+SECTION = "base"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
+
+inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
+
+SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+SRC_URI[md5sum] = "7532c2e356574c1c9255c01169d38427"
+SRC_URI[sha256sum] = "4a0440168d8dfb95989a17be8fafb149589e110e7d4518e5e8a33463dfb5e5ca"
+
+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}"
+
+RREPLACES:${PN} = "firmware-sentinel"
+RPROVIDES:${PN} = "firmware-sentinel"
+
+COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx9-nxp-bsp)"
diff --git a/recipes-bsp/firmware-sentinel/firmware-sentinel_0.11.bb b/recipes-bsp/firmware-sentinel/firmware-sentinel_0.11.bb
deleted file mode 100644
index 1c5163e1a..000000000
--- a/recipes-bsp/firmware-sentinel/firmware-sentinel_0.11.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021-2023 NXP
-SUMMARY = "NXP i.MX Sentinel firmware"
-DESCRIPTION = "Firmware for i.MX Sentinel Security Controller"
-SECTION = "base"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
-
-inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
-
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "339011b6b199151d835c03089a3c2221"
-SRC_URI[sha256sum] = "269480417a8ae9aa4cc4101ab947287fc33455a931021dbdc4d9badb5212bceb"
-
-do_compile[noexec] = "1"
-
-do_install() {
-    install -Dm 0644 ${S}/${SECO_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele/${SECO_FIRMWARE_NAME}
-}
-
-do_deploy() {
-    install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
-}
-addtask deploy after do_compile before do_build
-
-FILES:${PN} += "${nonarch_base_libdir}/firmware/imx/ele/${SECO_FIRMWARE_NAME}"
-
-COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx9-nxp-bsp)"
-- 
cgit v1.2.3-54-g00ecf