From a8eadc51a32a30fceb64f534c378ba66b876e026 Mon Sep 17 00:00:00 2001 From: Govindraj Raja Date: Wed, 11 Jan 2023 18:34:58 +0000 Subject: 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 --- tools/marvell/doimage/doimage.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/marvell/doimage/doimage.c b/tools/marvell/doimage/doimage.c index e08b82072..513f33f32 100644 --- a/tools/marvell/doimage/doimage.c +++ b/tools/marvell/doimage/doimage.c @@ -17,12 +17,6 @@ #ifdef CONFIG_MVEBU_SECURE_BOOT #include /* for parsing config file */ -#if !defined(MBEDTLS_CONFIG_FILE) -#include "mbedtls/config.h" -#else -#include MBEDTLS_CONFIG_FILE -#endif - /* mbedTLS stuff */ #if defined(MBEDTLS_BIGNUM_C) && defined(MBEDTLS_ENTROPY_C) && \ defined(MBEDTLS_SHA256_C) && \ @@ -34,6 +28,7 @@ #include #include #include +#include #include #else #error "Bad mbedTLS configuration!" -- cgit v1.2.1