From e2f1b3cb645db08deb982d0b658583ef00018c3b Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 14 Apr 2025 13:36:05 +0200 Subject: [PATCH] tf-a-stm32mp: fix TF_A_CONFIG for nand On the new BSP the configuration is called 'optee-nand' and the build parameters have changed. We do this override in meta-digi only to incorporate `STM32MP_USB_PROGRAMMER=1` parameter, which allows to boot the nand image from USB, too. Signed-off-by: Hector Palacios --- .../trusted-firmware-a/tf-a-stm32mp_2.10.bbappend | 7 ++++++- 1 file changed, 6 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 48ddd4170..4e952c2f4 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 @@ -24,7 +24,12 @@ SIGN_TOOL_EXTRA_soc:ccmp13 = " ${@bb.utils.contains('ENCRYPT_ENABLE', '1', '-of # stm32mp2 = header-version 2.2 SIGN_TOOL_EXTRA_soc:stm32mp2common = " --header-version 2.2 ${@bb.utils.contains('ENCRYPT_ENABLE', '1', '-of ${TF_A_ENCRYPT_OF}', '-of ${TF_A_SIGN_OF}', d)}" -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[optee-nand] = "\ + ${STM32MP_DT_FILES_NAND},\ + ${TF_A_CONFIG_OPTS_optee} ${TF_A_CONFIG_OPTS_features} ${TF_A_CONFIG_OPTS_fwupdate} STM32MP_RAW_NAND=1 STM32MP_USB_PROGRAMMER=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''},\ + ${TF_A_CONFIG_BASENAME_BIN},\ + ${TF_A_CONFIG_MAKE_TARGET},\ + ${TF_A_CONFIG_DEPLOY_FTYPE} ${TF_A_CONFIG_DEPLOY_EXTRA}" # TF_A_CONFIG[uart] (same as 'optee-programmer-uart') TF_A_CONFIG[uart] ?= "\ ${STM32MP_DEVICETREE_PROGRAMMER},\