Fix details

Author: yota22721

RPi-Pico/benchmark/CMakeLists.txt

@@ -21,12 +21,4 @@ pico_enable_stdio_usb(benchmark 1)
 pico_enable_stdio_uart(benchmark 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(benchmark)

RPi-Pico/config/lwipopts.h

@@ -28,6 +28,6 @@
 #define DEFAULT_TCP_RECVMBOX_SIZE 10
 
 #undef MEM_SIZE
-#define MEM_SIZE 4000 * 10
+#define MEM_SIZE 4000 * 4
 
 #endif

RPi-Pico/config/user_settings.h

@@ -45,8 +45,6 @@ extern time_t myTime(time_t *);
 /* ------------------------------------------------------------------------- */
 /* Platform */
 /* ------------------------------------------------------------------------- */
-#define WOLFSSL_GENERAL_ALIGNMENT 4
-#define SIZEOF_LONG_LONG 8
 #if 0
 #define NO_64BIT /* disable use of 64-bit variables */
 #endif

RPi-Pico/tcp_client/CMakeLists.txt

@@ -31,12 +31,4 @@ pico_enable_stdio_usb(tcp_Client 1)
 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)

RPi-Pico/tcp_server/CMakeLists.txt

@@ -30,12 +30,4 @@ pico_enable_stdio_usb(tcp_Server 1)
 pico_enable_stdio_uart(tcp_Server 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_Server)

RPi-Pico/testwolfcrypt/CMakeLists.txt

@@ -3,6 +3,10 @@ add_executable(testwolfcrypt
     ${WOLFSSL_ROOT}/wolfcrypt/test/test.c
 )
 
+target_compile_definitions(testwolfcrypt PRIVATE
+    WOLFSSL_USER_SETTINGS
+)
+
 target_link_libraries(testwolfcrypt
     wolfssl
     pico_stdlib
@@ -17,12 +21,4 @@ pico_enable_stdio_usb(testwolfcrypt 1)
 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)

RPi-Pico/tls_client/CMakeLists.txt

@@ -36,12 +36,4 @@ pico_enable_stdio_usb(tls_Client 1)
 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)

RPi-Pico/tls_server/CMakeLists.txt

@@ -35,12 +35,4 @@ pico_enable_stdio_usb(tls_Server 1)
 pico_enable_stdio_uart(tls_Server 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_Server)

RPi-Pico/wifi/CMakeLists.txt

@@ -28,12 +28,4 @@ else()
     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)