stm-st-stm32mp: fip-stm32mp: add OP-TEE USB FIP configuration

The FIP flavor for OP-TEE + USB is managed in the meta-st-stm32mp layer through
the "optee-programmer-usb". However, since we do not require the additional
overhead introduced by the STM32CubeProgrammer tool, this commit introduces a
new FIP configuration based on OP-TEE for booting from USB.

https://onedigi.atlassian.net/browse/DEL-9442

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2025-03-13 13:58:59 +01:00
parent 16618e5789
commit 76a4f781e3
3 changed files with 8 additions and 2 deletions

View File

@ -40,6 +40,7 @@ UBOOT_DEVICETREE = "${STM32MP_DEVICETREE}"
# Define list of devicetree per supported storage # Define list of devicetree per supported storage
STM32MP_DT_FILES_EMMC = "ccmp25-dvk" STM32MP_DT_FILES_EMMC = "ccmp25-dvk"
STM32MP_DT_FILES_SDCARD = "${STM32MP_DT_FILES_EMMC}" STM32MP_DT_FILES_SDCARD = "${STM32MP_DT_FILES_EMMC}"
STM32MP_DT_FILES_USB = "${STM32MP_DT_FILES_EMMC}"
# Extra DTB for board - need to specify it with .dtb ... # Extra DTB for board - need to specify it with .dtb ...
STM32MP_KERNEL_DEVICETREE:ccmp25-dvk += " \ STM32MP_KERNEL_DEVICETREE:ccmp25-dvk += " \

View File

@ -63,7 +63,7 @@ ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS'
STM32MP_DEVICETREE_PROGRAMMER_ENABLE ?= "0" STM32MP_DEVICETREE_PROGRAMMER_ENABLE ?= "0"
# List of supported boot devices # List of supported boot devices
BOOTDEVICE_LABELS ?= "emmc" BOOTDEVICE_LABELS ?= "emmc usb"
# Supported boot schemes # Supported boot schemes
BOOTSCHEME_LABELS ?= "optee" BOOTSCHEME_LABELS ?= "optee"

View File

@ -1,7 +1,12 @@
# #
# Copyright (C) 2024, Digi International Inc. # Copyright (C) 2024,2025, Digi International Inc.
# #
# Add optee-usb FIP configuration
STM32MP_DEVICETREE_USB = " ${@' '.join('%s' % dt_file for dt_file in list(dict.fromkeys((d.getVar('STM32MP_DT_FILES_USB') or '').split())))} "
FIP_CONFIG[optee-usb] ?= "optee,${STM32MP_DEVICETREE_USB},default:optee,usb"
FIP_CONFIG += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', bb.utils.contains('BOOTDEVICE_LABELS', 'usb', 'optee-usb', '', d), '', d)}"
# Addons parameters for FIP_WRAPPER # Addons parameters for FIP_WRAPPER
FIP_SOC_SEARCH ?= "" FIP_SOC_SEARCH ?= ""
FIP_SOC_SEARCH:ccmp2 ?= " stm32mp25 " FIP_SOC_SEARCH:ccmp2 ?= " stm32mp25 "