From 62db14e676703dba13ec48943793bcee9c7ecdd4 Mon Sep 17 00:00:00 2001 From: Juliusz Sosinowicz Date: Fri, 12 May 2023 13:24:21 +0200 Subject: [PATCH] Small fixes to build wolfSSL without warnings --- zephyr/CMakeLists.txt | 3 +-- zephyr/zephyr_init.c | 20 +------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index cb9bb5c64..36b19b953 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -6,7 +6,7 @@ if(CONFIG_WOLFSSL) WOLFSSL_SETTINGS_FILE="${CONFIG_WOLFSSL_SETTINGS_FILE}" ) - target_include_directories(wolfSSL INTERFACE + zephyr_include_directories( ${ZEPHYR_CURRENT_MODULE_DIR} ${ZEPHYR_CURRENT_MODULE_DIR}/wolfssl ${ZEPHYR_CURRENT_MODULE_DIR}/zephyr @@ -116,7 +116,6 @@ if(CONFIG_WOLFSSL) add_definitions(-DWOLFSSL_USER_SETTINGS) add_definitions(-DWOLFSSL_ZEPHYR) - include_directories("${ZEPHYR_CURRENT_MODULE_DIR}/wolfssl") else() assert(CONFIG_WOLFSSL_LIBRARY "wolfSSL was enabled, but neither BUILTIN or LIBRARY was selected.") diff --git a/zephyr/zephyr_init.c b/zephyr/zephyr_init.c index 9ec82e2d4..cd8ae98e6 100644 --- a/zephyr/zephyr_init.c +++ b/zephyr/zephyr_init.c @@ -19,22 +19,4 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ -/** @file - * @brief wolfSSL initialization - * - * Initialize the wolfSSL library. - */ - -#include - -#include "user_settings.h" -#include "wolfssl/ssl.h" - -static int _wolfssl_init(const struct device *device) -{ - ARG_UNUSED(device); - - return 0; -} - -SYS_INIT(_wolfssl_init, POST_KERNEL, 0); +/* Not needed. Keeping file for backwards compatibility. */