trusted-firmware-m: upstream fixes for the STM platforms

This commit contains some required upstream fixes
for the STM platforms to work with the new TF-M
build system. This commit shall be reverted, once
review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/5910
is merged.

Signed-off-by: Ioannis Glaropoulos <[email protected]>

Author: ioannisg

trusted-firmware-m/platform/ext/target/stm/common/stm32l5xx/CMakeLists.txt

@@ -78,6 +78,7 @@ target_sources(platform_s
         ${CMAKE_CURRENT_SOURCE_DIR}/stm32l5xx_hal/Src/stm32l5xx_hal_pwr_ex.c
         ${CMAKE_CURRENT_SOURCE_DIR}/stm32l5xx_hal/Src/stm32l5xx_hal_gpio.c
         ${CMAKE_CURRENT_SOURCE_DIR}/stm32l5xx_hal/Src/stm32l5xx_hal_uart.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/stm32l5xx_hal/Src/stm32l5xx_hal_uart_ex.c
         ${CMAKE_CURRENT_SOURCE_DIR}/stm32l5xx_hal/Src/stm32l5xx_hal_rcc.c
         ${CMAKE_CURRENT_SOURCE_DIR}/stm32l5xx_hal/Src/stm32l5xx_hal_gtzc.c
         $<$<BOOL:${TFM_PARTITION_PLATFORM}>:${CMAKE_CURRENT_SOURCE_DIR}/secure/tfm_platform_system>
@@ -151,7 +152,6 @@ if(BL2)
             ${CMAKE_CURRENT_SOURCE_DIR}/bl2/low_level_device.c
             ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_Driver/low_level_flash.c
             ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_Driver/low_level_com.c
-            ${CMAKE_CURRENT_SOURCE_DIR}/Native_Driver/tick.c
             ${CMAKE_CURRENT_SOURCE_DIR}/stm32l5xx_hal/Src/stm32l5xx_hal.c
             ${CMAKE_CURRENT_SOURCE_DIR}/stm32l5xx_hal/Src/stm32l5xx_hal_flash.c
             ${CMAKE_CURRENT_SOURCE_DIR}/stm32l5xx_hal/Src/stm32l5xx_hal_flash_ex.c
@@ -176,7 +176,7 @@ if(BL2)
     # object files. For this reason, the file mailbox_ipc_intr is linked directly to
     # the ns binary as an object file. This issue does not affect armclang, but the
     # fix is compatible.
-    target_sources(tfm_s
+    target_sources(bl2
         PRIVATE
             ${CMAKE_CURRENT_SOURCE_DIR}/Native_Driver/tick.c
     )
@@ -185,20 +185,25 @@ endif()
 install(FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/boards/scripts/stm_tool.py
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../bl2/ext/mcuboot/scripts/macro_parser.py
-        DESTINATION ./scripts/ )
+        DESTINATION ${CMAKE_BINARY_DIR}/scripts/ )
+
+if (${CMAKE_C_COMPILER_ID} STREQUAL GNU)
+    set(PREPROCESSOR_FILE ${CMAKE_CURRENT_SOURCE_DIR}/boards/scripts/gcc/preprocess.sh)
+endif()
 
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/boards/scripts/regression.sh
+         ${PREPROCESSOR_FILE}
          ${CMAKE_CURRENT_SOURCE_DIR}/boards/scripts/TFM_UPDATE.sh
          ${CMAKE_CURRENT_SOURCE_DIR}/boards/scripts/postbuild.sh
          PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
-         DESTINATION ./ )
+         DESTINATION ${CMAKE_BINARY_DIR}/ )
 
-if (TEST_S)
+if (TEST_S OR TEST_NS)
     #the define FLASH_LAYOUT_FOR_TEST
     #increase SECURE and NON SECURE IMAGE and modify the  content of  low_level_device.c from BL2 (low_level_flash.c)
     set(FLAGS_FOR_BL2_PREPROCESSING
         "#define FLASH_LAYOUT_FOR_TEST\n"
-            "#define BL2\n"
+        "#define BL2\n"
          )
     add_definitions("-DFLASH_LAYOUT_FOR_TEST")
 else()

trusted-firmware-m/platform/ext/target/stm/nucleo_l552ze_q/CMakeLists.txt

@@ -36,8 +36,8 @@ endif()
 
 install(FILES ${NUCLEO_L552ZE_Q_DIR}/include/flash_layout.h
               ${NUCLEO_L552ZE_Q_DIR}/include/region_defs.h
-        DESTINATION ./ )
+        DESTINATION ${CMAKE_BINARY_DIR}/ )
 set (BL2_FILE_TO_PREPROCESS ${CMAKE_CURRENT_BINARY_DIR}/image_macros_to_preprocess_bl2.c)
 file(WRITE ${BL2_FILE_TO_PREPROCESS} ${BL2_PREPROCESSING})
 install(FILES ${BL2_FILE_TO_PREPROCESS}
-        DESTINATION ./ )
+        DESTINATION ${CMAKE_BINARY_DIR}/ )

trusted-firmware-m/platform/ext/target/stm/nucleo_l552ze_q/include/flash_layout.h

@@ -65,7 +65,7 @@
 
 /* area for BL2 code protected by hdp */
 #define FLASH_AREA_BL2_OFFSET           (0x0)
-#define FLASH_AREA_BL2_SIZE             (0x11000)
+#define FLASH_AREA_BL2_SIZE             (0xd800)
 /* HDP area end at this address */
 #define FLASH_BL2_HDP_END               (FLASH_AREA_BL2_OFFSET+FLASH_AREA_BL2_SIZE-1)
 /* area for BL2 code not protected by hdp */
@@ -113,7 +113,7 @@
 #define FLASH_ITS_AREA_OFFSET           (FLASH_PS_AREA_OFFSET+FLASH_PS_AREA_SIZE)
 #define FLASH_ITS_AREA_SIZE             (0x2000)   /* 8 KB */
 
-#define FLASH_S_PARTITION_SIZE          (0x2B000) /* S partition */
+#define FLASH_S_PARTITION_SIZE          (0x2D000) /* S partition */
 #define FLASH_NS_PARTITION_SIZE         (0x9000) /* NS partition */
 #define FLASH_PARTITION_SIZE (FLASH_S_PARTITION_SIZE+FLASH_NS_PARTITION_SIZE)
 /* Secure image primary slot */