From 24aef482efe5d0a0c08ec13101a676f84dc02556 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 4 Jun 2025 09:54:56 +0200 Subject: [PATCH] tf-a-stm32mp: remove STM32MP_USB_PROGRAMMER support from NAND images Adding STM32MP_USB_PROGRAMMER=1 to TF-A NAND build allows the images to boot from either NAND or USB (recovery) however, the source code of TF-A disallows correct resuming from suspend when either STM32MP_USB_PROGRAMMER or STM32MP_UART_PROGRAMMER are defined. Remove this support so that the system can correctly resume from suspend. 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 deletions(-) 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 5e1423811..c25980125 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,18 +24,6 @@ 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},\