build: Add BL1 compile and linker flags to BL1

Signed-off-by: Dávid Házi <david.hazi@arm.com>
Change-Id: I07644042885b973b4190b0b1035ca43e20d5fd4d

Author: david-hazi-arm

bl1/bl1_1/CMakeLists.txt

@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2021-2023, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2024, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -26,6 +26,16 @@ target_link_options(bl1_1
         $<$<C_COMPILER_ID:IAR>:--map\;${CMAKE_BINARY_DIR}/bin/bl1_1.map>
 )
 
+target_compile_options(bl1_1
+    PUBLIC
+        ${BL1_COMPILER_CP_FLAG}
+)
+
+target_link_options(bl1_1
+    PUBLIC
+        ${BL1_LINKER_CP_OPTION}
+)
+
 target_sources(bl1_1
     PRIVATE
         main.c

bl1/bl1_1/shared_lib/CMakeLists.txt

@@ -105,4 +105,34 @@ if(TFM_BL1_SOFTWARE_CRYPTO)
             $<$<C_COMPILER_ID:GNU>:-Wno-unused-parameter>
             $<$<C_COMPILER_ID:ARMClang>:-Wno-unused-parameter>
     )
+
+    target_compile_options(bl1_1_crypto_mbedcrypto
+        PRIVATE
+            ${BL1_COMPILER_CP_FLAG}
+    )
+
+    target_link_options(bl1_1_crypto_mbedcrypto
+        PUBLIC
+            ${BL1_LINKER_CP_OPTION}
+    )
+
+    target_compile_options(bl1_1_crypto_mbedtls
+        PRIVATE
+            ${BL1_COMPILER_CP_FLAG}
+    )
+
+    target_link_options(bl1_1_crypto_mbedtls
+        PUBLIC
+            ${BL1_LINKER_CP_OPTION}
+    )
+
+    target_compile_options(bl1_1_crypto_mbedx509
+        PRIVATE
+            ${BL1_COMPILER_CP_FLAG}
+    )
+
+    target_link_options(bl1_1_crypto_mbedx509
+        PUBLIC
+            ${BL1_LINKER_CP_OPTION}
+    )
 endif()

bl1/bl1_2/CMakeLists.txt

@@ -28,6 +28,16 @@ target_link_options(bl1_2
         $<$<C_COMPILER_ID:IAR>:--map\;${CMAKE_BINARY_DIR}/bin/bl1_2.map>
 )
 
+target_compile_options(bl1_2
+    PUBLIC
+        ${BL1_COMPILER_CP_FLAG}
+)
+
+target_link_options(bl1_2
+    PUBLIC
+        ${BL1_LINKER_CP_OPTION}
+)
+
 target_sources(bl1_2
     PRIVATE
         main.c

bl2/CMakeLists.txt

@@ -48,8 +48,9 @@ target_compile_options(bl2
 target_link_options(bl2
     PRIVATE
         $<$<C_COMPILER_ID:GNU>:-Wl,-Map=${CMAKE_BINARY_DIR}/bin/bl2.map>
-        $<$<C_COMPILER_ID:ARMClang>:--map;${BL2_LINKER_CP_OPTION}>
+        $<$<C_COMPILER_ID:ARMClang>:--map>
         $<$<C_COMPILER_ID:IAR>:--map\;${CMAKE_BINARY_DIR}/bin/bl2.map>
+        ${BL2_LINKER_CP_OPTION}
 )
 
 target_compile_definitions(bl2

platform/CMakeLists.txt

@@ -273,6 +273,12 @@ if(BL1 AND PLATFORM_DEFAULT_BL1)
     target_compile_options(platform_bl1_1
         PUBLIC
             $<$<BOOL:${BL1_1_SANITIZE}>:-fsanitize=${BL1_1_SANITIZE}>
+            ${BL1_COMPILER_CP_FLAG}
+    )
+
+    target_link_options(platform_bl1_1
+        PUBLIC
+            ${BL1_LINKER_CP_OPTION}
     )
 
     target_sources(platform_bl1_1
@@ -352,6 +358,12 @@ if(BL1 AND PLATFORM_DEFAULT_BL1)
     target_compile_options(platform_bl1_2
         PUBLIC
             $<$<BOOL:${BL1_2_SANITIZE}>:-fsanitize=${BL1_2_SANITIZE}>
+            ${BL1_COMPILER_CP_FLAG}
+    )
+
+    target_link_options(platform_bl1_2
+        PUBLIC
+            ${BL1_LINKER_CP_OPTION}
     )
 endif()
 

toolchain_ARMCLANG.cmake

@@ -233,6 +233,12 @@ macro(tfm_toolchain_reload_compiler)
     # is not actually enabled in BL2, it will cause BL2 runtime fault.
     set(BL2_LINKER_CP_OPTION --fpu=SoftVFP)
 
+    set(BL1_COMPILER_CP_FLAG
+        $<$<COMPILE_LANGUAGE:C>:-mfpu=softvfp>
+        $<$<COMPILE_LANGUAGE:ASM>:--fpu=softvfp>
+    )
+    set(BL1_LINKER_CP_OPTION --fpu=SoftVFP)
+
     if (CONFIG_TFM_FLOAT_ABI STREQUAL "hard")
         set(COMPILER_CP_FLAG
             $<$<COMPILE_LANGUAGE:C>:-mfloat-abi=hard>

toolchain_GNUARM.cmake

@@ -180,6 +180,10 @@ set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_INIT})
 set(CMAKE_ASM_FLAGS ${CMAKE_ASM_FLAGS_INIT})
 
 set(BL2_COMPILER_CP_FLAG -mfloat-abi=soft)
+set(BL2_LINKER_CP_OPTION -mfloat-abi=soft)
+
+set(BL1_COMPILER_CP_FLAG -mfloat-abi=soft)
+set(BL1_LINKER_CP_OPTION -mfloat-abi=soft)
 
 if (CONFIG_TFM_FLOAT_ABI STREQUAL "hard")
     set(COMPILER_CP_FLAG -mfloat-abi=hard)