LIB: Replace SPM log with tfm_log
Replace the existing SPM log library with the new tfm_log library. This
patch aims to maintain existing behaviour by using a format specifier
which matches the existing implementation.
Change-Id: I5871b5429e4f051fdede87063bfe3ebbe49847f9
Signed-off-by: Jackson Cooper-Driver <jackson.cooper-driver@arm.com>
diff --git a/secure_fw/spm/include/private/assert.h b/secure_fw/spm/include/private/assert.h
index 5f5174c..2a82da6 100644
--- a/secure_fw/spm/include/private/assert.h
+++ b/secure_fw/spm/include/private/assert.h
@@ -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
*
@@ -8,19 +8,17 @@
#define __TFM_PRIV_ASSERT_H__
#include <string.h>
-#include "tfm_spm_log.h"
+#include "tfm_log.h"
#ifndef NDEBUG
-#define SPM_ASSERT(cond) \
- do { \
- if (!(cond)) { \
- SPMLOG_INFMSG("Assert:"); \
- SPMLOG_INFMSG(__func__); \
- SPMLOG_INFMSGVAL(",", __LINE__); \
- while (1) { \
- ; \
- } \
- } \
+#define SPM_ASSERT(cond) \
+ do { \
+ if (!(cond)) { \
+ INFO_RAW("Assert: %s, %d\n", __func__, __LINE__); \
+ while (1) { \
+ ; \
+ } \
+ } \
} while (0)
#else
#define SPM_ASSERT(cond)