From d8599ea1ff5e2665a1f256ef4ccec58fa13c4867 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 31 Jan 2025 11:49:39 +0100 Subject: [PATCH] tf-a-stm32mp: add 'uart' and 'usb' TF-A configs without programmer These are clones of 'optee-programmer-uart' and 'optee-programmer-usb' defined in tf-a-stm32mp-config.inc but do not require to have the STM32MP_DEVICETREE_PROGRAMMER_ENABLE=1 which causes build problems in U-Boot. Signed-off-by: Hector Palacios https://onedigi.atlassian.net/browse/DEL-9483 --- .../tf-a-stm32mp_2.10.bbappend | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend index c3db5ee37..b2774d761 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend @@ -1,5 +1,5 @@ # -# Copyright (C) 2022-2024, Digi International Inc. +# Copyright (C) 2022-2025, Digi International Inc. # # Select internal or Github TF-A repo @@ -15,6 +15,20 @@ SRC_URI = " \ " TF_A_CONFIG[nand] = "${DEVICE_BOARD_ENABLE:NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''} STM32MP_USB_PROGRAMMER=1" +# TF_A_CONFIG[uart] (same as 'optee-programmer-uart') +TF_A_CONFIG[uart] ?= "\ + ${STM32MP_DEVICETREE_PROGRAMMER},\ + ${TF_A_CONFIG_OPTS_optee} STM32MP_UART_PROGRAMMER=1,\ + ${TF_A_CONFIG_BASENAME_BIN},\ + ${TF_A_CONFIG_MAKE_TARGET} ${TF_A_CONFIG_MAKE_EXTRAS},\ + ${TF_A_CONFIG_DEPLOY_FTYPE} ${TF_A_CONFIG_DEPLOY_EXTRA}" +# TF_A_CONFIG[usb] (same as 'optee-programmer-uart') +TF_A_CONFIG[usb] ?= "\ + ${STM32MP_DEVICETREE_PROGRAMMER},\ + ${TF_A_CONFIG_OPTS_optee} STM32MP_USB_PROGRAMMER=1,\ + ${TF_A_CONFIG_BASENAME_BIN},\ + ${TF_A_CONFIG_MAKE_TARGET} ${TF_A_CONFIG_MAKE_EXTRAS},\ + ${TF_A_CONFIG_DEPLOY_FTYPE} ${TF_A_CONFIG_DEPLOY_EXTRA}" DEPENDS += " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)} \