Since the A0 firmare is not located in the firmware-ele-imx-0.1.0.bin
anymore it is better to make it optional. We add a reference to where
to find the latest version of the firmware in case someone still
uses it.
Signed-off-by: Michael Grzeschik <m.grzeschik@xxxxxxxxxxxxxx>
---
arch/arm/mach-imx/ele.c | 2 ++
firmware/Kconfig | 11 +++++++++--
firmware/Makefile | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-imx/ele.c b/arch/arm/mach-imx/ele.c
index c209f53de4..ec0fd65216 100644
--- a/arch/arm/mach-imx/ele.c
+++ b/arch/arm/mach-imx/ele.c
@@ -200,9 +200,11 @@ int imx93_ele_load_fw(void *bl33)
rev = FIELD_GET(ELE_INFO_SOC_REV, info.soc);
switch (rev) {
+#ifdef CONFIG_FIRMWARE_IMX93_OPTEE_A0
case 0xa0:
get_builtin_firmware_ext(mx93a0_ahab_container_img, bl33, &firmware, &size);
break;
+#endif
case 0xa1:
get_builtin_firmware_ext(mx93a1_ahab_container_img, bl33, &firmware, &size);
break;
diff --git a/firmware/Kconfig b/firmware/Kconfig
index d068e6d983..00546e8706 100644
--- a/firmware/Kconfig
+++ b/firmware/Kconfig
@@ -81,10 +81,17 @@ config FIRMWARE_IMX93_OPTEE
in CONFIG_EXTRA_FIRMWARE_DIR/imx93-bl32.bin. When this option is enabled then
the TF-A binary will be used from CONFIG_EXTRA_FIRMWARE_DIR/imx93-bl31.bin-optee.
Additionally OP-TEE requires a RAM firmware loaded into the ELE. This is expected
- in CONFIG_EXTRA_FIRMWARE_DIR/mx93a0-ahab-container.img and
- CONFIG_EXTRA_FIRMWARE_DIR/mx93a1-ahab-container.img. You can obtain it from
+ in CONFIG_EXTRA_FIRMWARE_DIR/mx93a1-ahab-container.img. You can obtain it from
https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-ele-imx-0.1.0.bin
+config FIRMWARE_IMX93_OPTEE_A0
+ bool "install OP-TEE on i.MX93 older A0 revision boards"
+ depends on FIRMWARE_IMX93_OPTEE
+ help
+ Additionally OP-TEE requires a RAM firmware loaded into the ELE. This is expected
+ in CONFIG_EXTRA_FIRMWARE_DIR/mx93a0-ahab-container.img. You can obtain it from
+ https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-sentinel-0.11.bin
+
config FIRMWARE_TQMA6UL_OPTEE
bool
depends on MACH_TQMA6UL && PBL_OPTEE
diff --git a/firmware/Makefile b/firmware/Makefile
index 2f47e04bee..4cf61587d6 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -21,8 +21,8 @@ fw-external-$(CONFIG_FIRMWARE_IMX8MM_OPTEE) += imx8mm-bl32.bin
fw-external-$(CONFIG_FIRMWARE_IMX8MN_OPTEE) += imx8mn-bl32.bin
fw-external-$(CONFIG_FIRMWARE_IMX8MP_OPTEE) += imx8mp-bl32.bin
fw-external-$(CONFIG_FIRMWARE_IMX93_OPTEE) += imx93-bl32.bin \
- mx93a0-ahab-container.img \
mx93a1-ahab-container.img
+fw-external-$(CONFIG_FIRMWARE_IMX93_OPTEE_A0) += mx93a0-ahab-container.img
pbl-firmware-$(CONFIG_ARCH_RK3568) += rk3568-bl31.bin
pbl-firmware-$(CONFIG_ARCH_RK3588) += rk3588-bl31.bin
pbl-firmware-$(CONFIG_ARCH_RK3399) += rk3399-bl31.bin
--
2.39.5
