commit 290b88f90c0d2a5dc275a1748690047f374ef6f1
author Jackson Cooper-Driver <jackson.cooper-driver@arm.com> Wed Jul 09 09:18:13 2025 +0100
committer Jackson Cooper-Driver <jackson.cooper-driver@arm.com> Wed Jul 09 15:46:34 2025 +0100
tree ccc9a209ec02d734b2822767aa6ca295d8c07d7b
parent 3e440b6694a96abddc87cffa6494a92afcfb1964

LIB: Move tfm_log.h to tfm_tests_log_msg.h

Rename this header to avoid name clashes with the tfm_log.h in the main
trusted-firmware-m repo.

Change-Id: I3823142c92426bbc01b1f46829dee0a3f462c095
Signed-off-by: Jackson Cooper-Driver <jackson.cooper-driver@arm.com>

app_broker/main_ns.c

diff --git a/app_broker/main_ns.c b/app_broker/main_ns.c
index a387803..fc9c3b8 100644
--- a/app_broker/main_ns.c
+++ b/app_broker/main_ns.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2022, Arm Limited. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
  * Copyright (c) 2022 Cypress Semiconductor Corporation (an Infineon company)
  * or an affiliate of Cypress Semiconductor Corporation. All rights reserved.
  *
@@ -19,7 +19,7 @@
 #include "tfm_multi_core_api.h"
 #include "tfm_ns_mailbox.h"
 #endif
-#include "tfm_log.h"
+#include "tfm_tests_log_msg.h"
 #include "uart_stdout.h"
 #if (CONFIG_TFM_FLOAT_ABI >= 1)
 #include "cmsis.h"

erpc/server/app/erpc_app.c

diff --git a/erpc/server/app/erpc_app.c b/erpc/server/app/erpc_app.c
index 341a0f0..264b873 100644
--- a/erpc/server/app/erpc_app.c
+++ b/erpc/server/app/erpc_app.c
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2017-2023, Arm Limited. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
  */
 
-#include "tfm_log.h"
+#include "tfm_tests_log_msg.h"
 #include "erpc_server_start.h"
 #include "config_erpc_target.h"
 

lib/log/tfm_tests_log_msg.h

diff --git a/lib/log/tfm_log.h b/lib/log/tfm_tests_log_msg.h
similarity index 81%
rename from lib/log/tfm_log.h
rename to lib/log/tfm_tests_log_msg.h
index 5d5e649..fbbe7bc 100644
--- a/lib/log/tfm_log.h
+++ b/lib/log/tfm_tests_log_msg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2024, Arm Limited. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *

tests_psa_arch/test_app.c

diff --git a/tests_psa_arch/test_app.c b/tests_psa_arch/test_app.c
index 74f98ec..db40bdf 100644
--- a/tests_psa_arch/test_app.c
+++ b/tests_psa_arch/test_app.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017-2023, Arm Limited. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
  */
 
 #include "test_app.h"
-#include "tfm_log.h"
+#include "tfm_tests_log_msg.h"
 #include "os_wrapper/thread.h"
 
 /**

tests_reg/test_app.c

diff --git a/tests_reg/test_app.c b/tests_reg/test_app.c
index 2d2df21..7ab6017 100644
--- a/tests_reg/test_app.c
+++ b/tests_reg/test_app.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017-2023, Arm Limited. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
  */
 
 #include "test_app.h"
-#include "tfm_log.h"
+#include "tfm_tests_log_msg.h"
 #ifdef TFM_NS_REG_TEST
 #include "non_secure_suites.h"
 #endif