Skip to content

Commit 4ce340c

Browse files
jackson-cooperdstgloorious
authored andcommitted
LIB: Link tfm_vprintf_headers to logging headers
Link this target which provides the tfm_vprintf headers to each of the logging library header targets. This prevents users of the logging libraries from having to explicitly link both of the header targets. Change-Id: I043e51cdb1567fcb971e480474dfebf46c7688a8 Signed-off-by: Jackson Cooper-Driver <jackson.cooper-driver@arm.com> (cherry picked from commit 79aa055) Signed-off-by: Stefan Gloor <stefan.gloor@siemens.com>
1 parent 43744b4 commit 4ce340c

File tree

7 files changed

+10
-6
lines changed

7 files changed

+10
-6
lines changed

bl1/bl1_1/shared_lib/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ target_link_libraries(bl1_1_shared_lib_interface
2020
INTERFACE
2121
psa_interface
2222
tfm_fih_headers
23-
tfm_vprintf_headers
2423
tfm_log_headers
2524
bl1_1_crypto_mbedcrypto
2625
)

lib/tfm_log/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ target_include_directories(tfm_log_headers
2020
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
2121
)
2222

23+
target_link_libraries(tfm_log_headers
24+
INTERFACE
25+
tfm_vprintf_headers
26+
)
27+
2328
target_link_libraries(tfm_log
2429
INTERFACE
2530
tfm_log_headers

lib/tfm_log_unpriv/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ target_include_directories(tfm_log_unpriv_headers
2020
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
2121
)
2222

23+
target_link_libraries(tfm_log_unpriv_headers
24+
INTERFACE
25+
tfm_vprintf_headers
26+
)
27+
2328
target_link_libraries(tfm_log_unpriv
2429
INTERFACE
2530
tfm_log_unpriv_headers

platform/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ target_link_libraries(platform_s
100100
cmsis_stack_override
101101
cmsis
102102
tfm_log_headers
103-
tfm_vprintf_headers
104103
$<$<BOOL:${CONFIG_TFM_BACKTRACE_ON_CORE_PANIC}>:tfm_log_unpriv>
105104
$<$<BOOL:${CONFIG_TFM_BACKTRACE_ON_CORE_PANIC}>:tfm_log>
106105
$<$<BOOL:${CONFIG_TFM_BACKTRACE_ON_CORE_PANIC}>:tfm_backtrace>
@@ -216,7 +215,6 @@ if(BL2)
216215
cmsis_stack_override
217216
cmsis
218217
tfm_log_headers
219-
tfm_vprintf_headers
220218
PRIVATE
221219
bl2_crypto
222220
bl2_hal

secure_fw/partitions/crypto/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ target_link_libraries(tfm_psa_rot_partition_crypto
9090
crypto_service_mbedcrypto
9191
tfm_config
9292
tfm_log_unpriv_headers
93-
tfm_vprintf_headers
9493
)
9594
target_compile_definitions(tfm_psa_rot_partition_crypto
9695
PRIVATE

secure_fw/partitions/firmware_update/bootloader/mcuboot/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ target_link_libraries(tfm_fwu_mcuboot_util
3232
INTERFACE
3333
platform_region_defs
3434
tfm_log_headers
35-
tfm_vprintf_headers
3635
)
3736

3837
target_link_libraries(tfm_psa_rot_partition_fwu

secure_fw/partitions/lib/runtime/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ target_link_libraries(tfm_sprt
4242
tfm_spm_defs
4343
tfm_config
4444
platform_s
45-
tfm_vprintf_headers
4645
tfm_log_unpriv_headers
4746
PRIVATE
4847
tfm_spm

0 commit comments

Comments
 (0)