Skip to content

Commit 62db14e

Browse files
committed
Small fixes to build wolfSSL without warnings
1 parent 62a4329 commit 62db14e

2 files changed

Lines changed: 2 additions & 21 deletions

File tree

zephyr/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if(CONFIG_WOLFSSL)
66
WOLFSSL_SETTINGS_FILE="${CONFIG_WOLFSSL_SETTINGS_FILE}"
77
)
88

9-
target_include_directories(wolfSSL INTERFACE
9+
zephyr_include_directories(
1010
${ZEPHYR_CURRENT_MODULE_DIR}
1111
${ZEPHYR_CURRENT_MODULE_DIR}/wolfssl
1212
${ZEPHYR_CURRENT_MODULE_DIR}/zephyr
@@ -116,7 +116,6 @@ if(CONFIG_WOLFSSL)
116116

117117
add_definitions(-DWOLFSSL_USER_SETTINGS)
118118
add_definitions(-DWOLFSSL_ZEPHYR)
119-
include_directories("${ZEPHYR_CURRENT_MODULE_DIR}/wolfssl")
120119
else()
121120
assert(CONFIG_WOLFSSL_LIBRARY "wolfSSL was enabled, but neither BUILTIN or LIBRARY was selected.")
122121

zephyr/zephyr_init.c

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,4 @@
1919
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
2020
*/
2121

22-
/** @file
23-
* @brief wolfSSL initialization
24-
*
25-
* Initialize the wolfSSL library.
26-
*/
27-
28-
#include <zephyr/init.h>
29-
30-
#include "user_settings.h"
31-
#include "wolfssl/ssl.h"
32-
33-
static int _wolfssl_init(const struct device *device)
34-
{
35-
ARG_UNUSED(device);
36-
37-
return 0;
38-
}
39-
40-
SYS_INIT(_wolfssl_init, POST_KERNEL, 0);
22+
/* Not needed. Keeping file for backwards compatibility. */

0 commit comments

Comments
 (0)