stompduck: Add support for optee in TF-A

Using sp_min as secure payload is now deprecated.
Add support for optee secure payload in the FIP image by adding the right
OPTEE-OS build option and TFA path to OPTEE BL32 parts.

Signed-off-by: Kory Maincent <[email protected]>

Author: kmaincent

meta-kiss/conf/machine/stompduck.conf

@@ -36,13 +36,24 @@ TFA_BUILD_TARGET = "fip all"
 TFA_INSTALL_TARGET = "fip tf-a-stm32mp157a-dk1.stm32"
 EXTRA_OEMAKE:append:pn-trusted-firmware-a = " \
     ARCH=aarch32 ARM_ARCH_MAJOR=7 \
-    AARCH32_SP=sp_min \
+    AARCH32_SP=optee \
     DTB_FILE_NAME=stm32mp157a-dk1.dtb \
+    STM32MP1_OPTEE_IN_SYSRAM=1 \
+    BL32=${DEPLOY_DIR_IMAGE}/optee/tee-header_v2.bin \
+    BL32_EXTRA1=${DEPLOY_DIR_IMAGE}/optee/tee-pager_v2.bin \
+    BL32_EXTRA2=${DEPLOY_DIR_IMAGE}/optee/tee-pageable_v2.bin \
     BL33_CFG=${DEPLOY_DIR_IMAGE}/u-boot.dtb \
     STM32MP_SDMMC=1 \
     BL33=${DEPLOY_DIR_IMAGE}/u-boot-nodtb.bin \
 "
 
+# Build optee-os for STM32MP1
+OPTEEMACHINE = "stm32mp1"
+EXTRA_OEMAKE:append:pn-optee-os = " \
+    PLATFORM_FLAVOR=157A_DK1 \
+    CFG_STM32MP1_OPTEE_IN_SYSRAM=y \
+"
+
 # This machine has the rootfs on partition 5
 UBOOT_EXTLINUX_ROOT = "root=/dev/mmcblk0p5"
 

meta-kiss/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend

@@ -5,4 +5,4 @@ COMPATIBLE_MACHINE:freiheit93 = "^freiheit93$"
 # Here the dependency is only needed for stompduck. Freiheit93 also use
 # trusted-firmware-a, but its binary is embedded in an image generated by
 # u-boot: the dependency is the other way around.
-DEPENDS:append:stompduck = " virtual/bootloader"
+DEPENDS:append:stompduck = " virtual/bootloader optee-os"