Browse Source

Small fixes to build wolfSSL without warnings

Juliusz Sosinowicz 10 months ago
parent
commit
62db14e676
2 changed files with 2 additions and 21 deletions
  1. 1 2
      zephyr/CMakeLists.txt
  2. 1 19
      zephyr/zephyr_init.c

+ 1 - 2
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.")
   

+ 1 - 19
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 <zephyr/init.h>
-
-#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. */