[zep fromtree] LIB: Remove log/log_unpriv dependencies

jackson-cooperd · stgloorious · commit 8c5aa2b759a5 · 2025-12-03T10:20:15.000+01:00
Remove these to ensure that these interface targets only provide the tfm_log.c and tfm_log_unpriv.c source files and nothing else. This allows targets to individually link the tfm_vprintf.c source file. Change-Id: I5c00665d361ff9fab5b6316104d5a743336b8917 Signed-off-by: Jackson Cooper-Driver <jackson.cooper-driver@arm.com> (cherry picked from commit e74fa6f)
diff --git a/bl1/bl1_1/shared_lib/CMakeLists.txt b/bl1/bl1_1/shared_lib/CMakeLists.txt
@@ -37,6 +37,7 @@ target_link_libraries(bl1_1_shared_lib
     PUBLIC
         bl1_1_shared_lib_interface
         tfm_log
+        tfm_vprintf
     PRIVATE
         platform_bl1_1
 )
diff --git a/lib/tfm_log/CMakeLists.txt b/lib/tfm_log/CMakeLists.txt
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2024, Arm Limited. All rights reserved.
+# SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -23,6 +23,4 @@ target_include_directories(tfm_log_headers
 target_link_libraries(tfm_log
     INTERFACE
         tfm_log_headers
-        tfm_vprintf
-        platform_common_interface
 )
diff --git a/lib/tfm_log_unpriv/CMakeLists.txt b/lib/tfm_log_unpriv/CMakeLists.txt
@@ -23,5 +23,4 @@ target_include_directories(tfm_log_unpriv_headers
 target_link_libraries(tfm_log_unpriv
     INTERFACE
         tfm_log_unpriv_headers
-        tfm_vprintf
 )
diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt
@@ -218,6 +218,7 @@ if(BL2)
             bl2_crypto
             bl2_hal
             tfm_log
+            tfm_vprintf
             mcuboot_config
             $<$<AND:$<BOOL:${CONFIG_TFM_BOOT_STORE_MEASUREMENTS}>,$<NOT:$<BOOL:${CONFIG_TFM_BOOT_STORE_ENCODED_MEASUREMENTS}>>>:tfm_boot_status>
     )
@@ -319,6 +320,7 @@ if(BL1 AND PLATFORM_DEFAULT_BL1)
         PRIVATE
             tfm_fih
             tfm_log
+            tfm_vprintf
             tfm_fih_headers
             tfm_boot_status
     )
@@ -372,6 +374,7 @@ if(BL1 AND PLATFORM_DEFAULT_BL1)
             tfm_fih
             tfm_fih_headers
             tfm_log
+            tfm_vprintf
             tfm_boot_status
             platform_region_defs
             bl1_1_shared_lib_interface
diff --git a/platform/ext/target/arm/rse/common/provisioning/CMakeLists.txt b/platform/ext/target/arm/rse/common/provisioning/CMakeLists.txt
@@ -31,6 +31,7 @@ target_sources(platform_bl1_1
 target_link_libraries(platform_bl1_1
     PUBLIC
         tfm_log
+        tfm_vprintf
 )
 
 target_include_directories(platform_bl1_1_interface

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ target_link_libraries(bl1_1_shared_lib`
`37`	`37`	`PUBLIC`
`38`	`38`	`bl1_1_shared_lib_interface`
`39`	`39`	`tfm_log`
	`40`	`+ tfm_vprintf`
`40`	`41`	`PRIVATE`
`41`	`42`	`platform_bl1_1`
`42`	`43`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#-------------------------------------------------------------------------------`
`2`		`-# Copyright (c) 2024, Arm Limited. All rights reserved.`
	`2`	`+# SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors`
`3`	`3`	`#`
`4`	`4`	`# SPDX-License-Identifier: BSD-3-Clause`
`5`	`5`	`#`
`@@ -23,6 +23,4 @@ target_include_directories(tfm_log_headers`
`23`	`23`	`target_link_libraries(tfm_log`
`24`	`24`	`INTERFACE`
`25`	`25`	`tfm_log_headers`
`26`		`- tfm_vprintf`
`27`		`- platform_common_interface`
`28`	`26`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,4 @@ target_include_directories(tfm_log_unpriv_headers`
`23`	`23`	`target_link_libraries(tfm_log_unpriv`
`24`	`24`	`INTERFACE`
`25`	`25`	`tfm_log_unpriv_headers`
`26`		`- tfm_vprintf`
`27`	`26`	`)`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ target_sources(platform_bl1_1`
`31`	`31`	`target_link_libraries(platform_bl1_1`
`32`	`32`	`PUBLIC`
`33`	`33`	`tfm_log`
	`34`	`+ tfm_vprintf`
`34`	`35`	`)`
`35`	`36`
`36`	`37`	`target_include_directories(platform_bl1_1_interface`