Build: Fix stm32wba65i_dk platform build issues

- Use `tfm_s_bin` target, aligning with changes in the GNUARM toolchain. - Updated logic for emulating `mcuboot_config.h` used by FWU partition. - Move `BL2` before `secure_fw` because FWU partition depends on MCUBoot. Signed-off-by: Anton Komlev <anton.komlev@arm.com> Change-Id: I4a2935d68df52e9194c21ab7cf20aeecc63c5bb2

Author: Anton-TF

CMakeLists.txt

@@ -37,6 +37,10 @@ include(${TFM_TOOLCHAIN_FILE})
 
 project("Trusted Firmware M" VERSION ${TFM_VERSION} LANGUAGES C CXX ASM)
 
+if(BL2)
+ add_subdirectory(bl2)
+endif()
+
 add_subdirectory(lib/backtrace)
 add_subdirectory(lib/ext)
 add_subdirectory(lib/fih)
@@ -45,11 +49,7 @@ add_subdirectory(lib/tfm_log_unpriv)
 add_subdirectory(lib/tfm_vprintf)
 add_subdirectory(tools)
 add_subdirectory(secure_fw)
-
 add_subdirectory(interface)
-if(BL2)
- add_subdirectory(bl2)
-endif()
 
 if(BL1 AND PLATFORM_DEFAULT_BL1)
  add_subdirectory(bl1/bl1_2)

platform/ext/target/stm/common/stm32wbaxx/CMakeLists.txt

@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
+# SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
 # Copyright (c) 2021-2024 STMicroelectronics. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
@@ -95,12 +95,6 @@ target_sources(platform_s
  ${STM_COMMON_DIR}/hal/Native_Driver/low_level_rng.c
 )
 
-# To compile FWU support and test, should add mcuboot_config.h file in mcuboot_config folder
-file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/../build-spe/bl2/ext/mcuboot/mcuboot_config)
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/boards/mcuboot_config.h
- ${CMAKE_INSTALL_PREFIX}/../build-spe/bl2/ext/mcuboot/mcuboot_config
- @ONLY)
-
 target_compile_options(platform_s
  PUBLIC
  ${COMPILER_CMSE_FLAG}

…ommon/stm32wbaxx/boards/mcuboot_config.h …x/boards/mcuboot_config/mcuboot_config.hplatform/ext/target/stm/common/stm32wbaxx/boards/mcuboot_config.h renamed to platform/ext/target/stm/common/stm32wbaxx/boards/mcuboot_config/mcuboot_config.h platform/ext/target/stm/common/stm32wbaxx/boards/mcuboot_config.h renamed to platform/ext/target/stm/common/stm32wbaxx/boards/mcuboot_config/mcuboot_config.h

@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -89,14 +89,14 @@ add_custom_target(tfm_s_fmw ALL SOURCES ${tfm_s_split_out})
 if(CMAKE_C_COMPILER STREQUAL "iccarm")
 add_custom_command(
  OUTPUT ${tfm_s_split_out}
-# DEPENDS tfm_s_binaries
+ DEPENDS tfm_s_bin
  COMMAND ielftool --silent --exclude=.BL2_OTP --bin $<TARGET_FILE:tfm_s> ${tfm_s_bin_dir}/tfm_s_fmw.bin
  COMMAND ielftool --silent --only=.BL2_OTP --bin $<TARGET_FILE:tfm_s> ${tfm_s_bin_dir}/tfm_s_otp.bin
 )
 else()
 add_custom_command(
  OUTPUT ${tfm_s_split_out}
-# DEPENDS tfm_s_binaries
+ DEPENDS tfm_s_bin
  COMMAND ${CMAKE_OBJCOPY} --remove-section .BL2_OTP -O binary $<TARGET_FILE:tfm_s> ${tfm_s_bin_dir}/tfm_s_fmw.bin
  COMMAND ${CMAKE_OBJCOPY} --only-section .BL2_OTP -O binary $<TARGET_FILE:tfm_s> ${tfm_s_bin_dir}/tfm_s_otp.bin
 )