From 5271924af70f8be6a90e7b15d460c58627ed7a83 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 10 Jun 2025 16:09:25 +0200 Subject: [PATCH] Revert "tf-a-stm32mp: remove STM32MP_USB_PROGRAMMER support from NAND images" We reverted the stub that didn't allow PM when serial boot was enabled on TF-A. Restore the part of the recipe that includes USB boot support on NAND boot images. This reverts commit 24aef482efe5d0a0c08ec13101a676f84dc02556. Signed-off-by: Hector Palacios https://onedigi.atlassian.net/browse/DEL-9629 --- .../trusted-firmware-a/tf-a-stm32mp_2.10.bbappend | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 c25980125..5e1423811 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,6 +24,18 @@ 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[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[opteemin-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},\