Merge pull request #524 from LinuxJedi/fix-rp2350

Fix RP2350

Author: dgarske

RPi-Pico/CMakeLists.txt

@@ -101,14 +101,6 @@ endif()
         pico_enable_stdio_uart(testwolfcrypt 0)
     endif()
 
-    if (${PICO_PLATFORM} STREQUAL "rp2350")
-        add_compile_definitions(wolfssl WOLFSSL_SP_ARM_CORTEX_M_ASM)
-    elseif (${PICO_PLATFORM} STREQUAL "rp2350-riscv")
-        add_compile_definitions(wolfSSL WOLFSSL_SP_RISCV32)
-    else()
-        add_compile_definitions(wolfssl WOLFSSL_SP_ARM_THUMB_ASM)
-    endif()
-
     pico_add_extra_outputs(testwolfcrypt)
 ### End of Test wolfCrypt algorithms
 
@@ -134,14 +126,6 @@ endif()
     endif()
 
 
-    if (${PICO_PLATFORM} STREQUAL "rp2350")
-        add_compile_definitions(wolfssl WOLFSSL_SP_ARM_CORTEX_M_ASM)
-    elseif (${PICO_PLATFORM} STREQUAL "rp2350-riscv")
-        add_compile_definitions(wolfSSL WOLFSSL_SP_RISCV32)
-    else()
-        add_compile_definitions(wolfssl WOLFSSL_SP_ARM_THUMB_ASM)
-    endif()
-
     pico_add_extra_outputs(benchmark)
 ### End of Benchmark wolfCrypt algorithms
 
@@ -178,14 +162,6 @@ if (USE_WIFI)
         pico_enable_stdio_uart(Wifi 0)
     endif()
 
-    if (${PICO_PLATFORM} STREQUAL "rp2350")
-        add_compile_definitions(wolfssl WOLFSSL_SP_ARM_CORTEX_M_ASM)
-    elseif (${PICO_PLATFORM} STREQUAL "rp2350-riscv")
-        add_compile_definitions(wolfSSL WOLFSSL_SP_RISCV32)
-    else()
-        add_compile_definitions(wolfssl WOLFSSL_SP_ARM_THUMB_ASM)
-    endif()
-
     pico_add_extra_outputs(Wifi)
 ### End of Wifi connection
 endif()
@@ -224,14 +200,6 @@ if (USE_WIFI)
         pico_enable_stdio_uart(tcp_Client 0)
     endif()
 
-    if (${PICO_PLATFORM} STREQUAL "rp2350")
-        add_compile_definitions(wolfssl WOLFSSL_SP_ARM_CORTEX_M_ASM)
-    elseif (${PICO_PLATFORM} STREQUAL "rp2350-riscv")
-        add_compile_definitions(wolfSSL WOLFSSL_SP_RISCV32)
-    else()
-        add_compile_definitions(wolfssl WOLFSSL_SP_ARM_THUMB_ASM)
-    endif()
-
     pico_add_extra_outputs(tcp_Client)
 ### End of TCP Client
 endif()
@@ -271,14 +239,6 @@ if (USE_WIFI)
         pico_enable_stdio_uart(tls_Client 0)
     endif()
 
-    if (${PICO_PLATFORM} STREQUAL "rp2350")
-        add_compile_definitions(wolfssl WOLFSSL_SP_ARM_CORTEX_M_ASM)
-    elseif (${PICO_PLATFORM} STREQUAL "rp2350-riscv")
-        add_compile_definitions(wolfSSL WOLFSSL_SP_RISCV32)
-    else()
-        add_compile_definitions(wolfssl WOLFSSL_SP_ARM_THUMB_ASM)
-    endif()
-
     pico_add_extra_outputs(tls_Client)
 ### End of TLS Client
 endif()

RPi-Pico/config/user_settings.h

@@ -37,6 +37,7 @@ extern "C"
 #define TARGET_EMBEDDED
 
 #define WOLFSSL_RPIPICO
+#define WOLFSSL_LWIP
 
 extern time_t myTime(time_t *);
 #define XTIME(t) myTime(t)