diff --git a/boards/boards_legacy/arm/b_u585i_iot02a/Kconfig.defconfig b/boards/boards_legacy/arm/b_u585i_iot02a/Kconfig.defconfig index bc10deca7a2..4a02acaf1c0 100644 --- a/boards/boards_legacy/arm/b_u585i_iot02a/Kconfig.defconfig +++ b/boards/boards_legacy/arm/b_u585i_iot02a/Kconfig.defconfig @@ -12,10 +12,6 @@ config SPI_STM32_INTERRUPT default y depends on SPI -# Get flash configuration for NS image from dts flash partition -config USE_DT_CODE_PARTITION - default y if TRUSTED_EXECUTION_NONSECURE - if BUILD_WITH_TFM # Initial Attestation key provisioned by the BL1 bootloader diff --git a/boards/st/nucleo_l552ze_q/Kconfig.defconfig b/boards/st/nucleo_l552ze_q/Kconfig.defconfig deleted file mode 100644 index cca7c6a226c..00000000000 --- a/boards/st/nucleo_l552ze_q/Kconfig.defconfig +++ /dev/null @@ -1,16 +0,0 @@ -# STM32L552ZE Q Nucleo board configuration - -# Copyright (c) 2020 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_L552ZE_Q_STM32L552XX_NS - -if TRUSTED_EXECUTION_NONSECURE - -# Get flash configuration for NS image from dts flash partition -config USE_DT_CODE_PARTITION - default y - -endif # TRUSTED_EXECUTION_NONSECURE - -endif # BOARD_NUCLEO_L552ZE_Q_STM32L552XX_NS diff --git a/boards/st/nucleo_l552ze_q/Kconfig.nucleo_l552ze_q b/boards/st/nucleo_l552ze_q/Kconfig.nucleo_l552ze_q index 37cfb44b270..22104ed027d 100644 --- a/boards/st/nucleo_l552ze_q/Kconfig.nucleo_l552ze_q +++ b/boards/st/nucleo_l552ze_q/Kconfig.nucleo_l552ze_q @@ -3,7 +3,3 @@ config BOARD_NUCLEO_L552ZE_Q select SOC_STM32L552XX - -config BOARD_NUCLEO_L552ZE_Q_STM32L552XX_NS - bool - select SOC_STM32L552XX diff --git a/boards/st/stm32l562e_dk/Kconfig.defconfig b/boards/st/stm32l562e_dk/Kconfig.defconfig index ac74129b6d3..3f15027bb35 100644 --- a/boards/st/stm32l562e_dk/Kconfig.defconfig +++ b/boards/st/stm32l562e_dk/Kconfig.defconfig @@ -27,15 +27,3 @@ config BT_HCI_VS_EXT endif # BT endif # BOARD_STM32L562E_DK - -if BOARD_STM32L562E_DK_STM32L562XX_NS - -if TRUSTED_EXECUTION_NONSECURE - -# Get flash configuration for NS image from dts flash partition -config USE_DT_CODE_PARTITION - default y - -endif # TRUSTED_EXECUTION_NONSECURE - -endif # BOARD_STM32L562E_DK_STM32L562XX_NS diff --git a/boards/st/stm32l562e_dk/Kconfig.stm32l562e_dk b/boards/st/stm32l562e_dk/Kconfig.stm32l562e_dk index 48b426203df..f5b901a2bce 100644 --- a/boards/st/stm32l562e_dk/Kconfig.stm32l562e_dk +++ b/boards/st/stm32l562e_dk/Kconfig.stm32l562e_dk @@ -3,7 +3,3 @@ config BOARD_STM32L562E_DK select SOC_STM32L562XX - -config BOARD_STM32L562E_DK_STM32L562XX_NS - bool - select SOC_STM32L562XX diff --git a/soc/st/stm32/Kconfig.defconfig b/soc/st/stm32/Kconfig.defconfig index 9fa9460a515..b214f103723 100644 --- a/soc/st/stm32/Kconfig.defconfig +++ b/soc/st/stm32/Kconfig.defconfig @@ -56,4 +56,8 @@ config MEMC_STM32 default y depends on MEMC +# Get flash configuration for NS image from dts flash partition +config USE_DT_CODE_PARTITION + default y if TRUSTED_EXECUTION_NONSECURE + endif # SOC_FAMILY_STM32