From a60135d20d268a467bef8a2c15e52560a7825a9e Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Tue, 7 Mar 2023 10:34:23 +0100 Subject: ARM: i.MX8M: add option to install OP-TEE While infrastructure for installing OP-TEE was already there, no upstream boards made use of it. Let's have OP-TEE installation happen in generic code, so it may be enabled for any upstream board. Signed-off-by: Ahmad Fatoum Link: https://lore.barebox.org/20230307093426.1551193-1-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer --- firmware/.gitignore | 1 + firmware/Kconfig | 12 ++++++++++++ firmware/Makefile | 9 ++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) (limited to 'firmware') diff --git a/firmware/.gitignore b/firmware/.gitignore index 4f3e56d8b7..8f9a956eb6 100644 --- a/firmware/.gitignore +++ b/firmware/.gitignore @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only *.bin +*.bin-optee diff --git a/firmware/Kconfig b/firmware/Kconfig index 1a5e1bf514..a12a8f3044 100644 --- a/firmware/Kconfig +++ b/firmware/Kconfig @@ -24,6 +24,18 @@ config FIRMWARE_IMX8MP_ATF config FIRMWARE_IMX8MQ_ATF bool +config FIRMWARE_IMX8MM_OPTEE + bool "install OP-TEE on i.MX8MM boards" + depends on FIRMWARE_IMX8MM_ATF && PBL_OPTEE + +config FIRMWARE_IMX8MN_OPTEE + bool "install OP-TEE on i.MX8MN boards" + depends on FIRMWARE_IMX8MN_ATF && PBL_OPTEE + +config FIRMWARE_IMX8MP_OPTEE + bool "install OP-TEE on i.MX8MP boards" + depends on FIRMWARE_IMX8MP_ATF && PBL_OPTEE + config FIRMWARE_CCBV2_OPTEE bool depends on MACH_WEBASTO_CCBV2 && PBL_OPTEE diff --git a/firmware/Makefile b/firmware/Makefile index da341871d6..984192f030 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -12,10 +12,13 @@ firmware-$(CONFIG_FIRMWARE_IMX_DDR4_PMU_TRAIN) += \ ddr4_imem_1d.bin \ ddr4_imem_2d.bin -firmware-$(CONFIG_FIRMWARE_IMX8MM_ATF) += imx8mm-bl31.bin -firmware-$(CONFIG_FIRMWARE_IMX8MN_ATF) += imx8mn-bl31.bin -firmware-$(CONFIG_FIRMWARE_IMX8MP_ATF) += imx8mp-bl31.bin +firmware-$(CONFIG_FIRMWARE_IMX8MM_ATF) += imx8mm-bl31.bin$(if $(CONFIG_FIRMWARE_IMX8MM_OPTEE),-optee,) +firmware-$(CONFIG_FIRMWARE_IMX8MN_ATF) += imx8mn-bl31.bin$(if $(CONFIG_FIRMWARE_IMX8MN_OPTEE),-optee,) +firmware-$(CONFIG_FIRMWARE_IMX8MP_ATF) += imx8mp-bl31.bin$(if $(CONFIG_FIRMWARE_IMX8MP_OPTEE),-optee,) firmware-$(CONFIG_FIRMWARE_IMX8MQ_ATF) += imx8mq-bl31.bin +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 firmware-$(CONFIG_ARCH_RK3568) += rk3568-bl31.bin firmware-$(CONFIG_ARCH_RK3568_OPTEE) += rk3568-op-tee.bin firmware-$(CONFIG_ARCH_RK3399) += rk3399-bl31.bin -- cgit v1.2.1