summaryrefslogtreecommitdiff
path: root/lib/fconf
diff options
context:
space:
mode:
authorGovindraj Raja <govindraj.raja@arm.com>2023-01-11 18:34:58 +0000
committerGovindraj Raja <govindraj.raja@arm.com>2023-02-21 11:09:47 +0000
commita8eadc51a32a30fceb64f534c378ba66b876e026 (patch)
tree523760f277311628680bc0360146c2a790030561 /lib/fconf
parent5a65fcd5f9c67baa681f664e4596760ca1f2606a (diff)
downloadarm-trusted-firmware-a8eadc51a32a30fceb64f534c378ba66b876e026.tar.gz
refactor(mbedtls): avoid including MBEDTLS_CONFIG_FILE
Currently we include MBEDTLS_CONFIG_FILE directly and if a custom config file is used it will included. However from mbedtls-3.x onwards it discourages usage of MBEDTLS_CONFIG_FILE include directly, so to resolve this and keep 2.28 compatibility include version.h which would include the custom config file if present and also would expose us with mbedtls-major-version number which could be used for selecting features and functions for mbedtls 2.28 or 3.3 Change-Id: I029992311be2a38b588ebbb350875b03ea29acdb Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
Diffstat (limited to 'lib/fconf')
-rw-r--r--lib/fconf/fconf_cot_getter.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/fconf/fconf_cot_getter.c b/lib/fconf/fconf_cot_getter.c
index ae59d8c96..1033018d3 100644
--- a/lib/fconf/fconf_cot_getter.c
+++ b/lib/fconf/fconf_cot_getter.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2023, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -7,8 +7,10 @@
#include <assert.h>
#include <stddef.h>
+#include <mbedtls/version.h>
+
#include <common/fdt_wrappers.h>
-#include MBEDTLS_CONFIG_FILE
+#include <common/tbbr/cot_def.h>
#include <drivers/auth/auth_mod.h>
#include <lib/fconf/fconf.h>
#include <lib/object_pool.h>