From 96b8d72c4f315c9150e6ab32b5fa6ed3053e5834 Mon Sep 17 00:00:00 2001
From: Lealem Amedie <lealemta47@gmail.com>
Date: Tue, 11 Mar 2025 15:07:19 -0600
Subject: [PATCH] Add support for STM32WBA

---
 IDE/STM32Cube/default_conf.ftl    |  6 ++++++
 wolfcrypt/src/port/st/stm32.c     |  3 +++
 wolfssl/wolfcrypt/port/st/stm32.h |  3 ++-
 wolfssl/wolfcrypt/settings.h      | 18 ++++++++++--------
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/IDE/STM32Cube/default_conf.ftl b/IDE/STM32Cube/default_conf.ftl
index c5215604f..095ccb8e6 100644
--- a/IDE/STM32Cube/default_conf.ftl
+++ b/IDE/STM32Cube/default_conf.ftl
@@ -179,6 +179,12 @@ extern ${variable.value} ${variable.name};
     #undef NO_STM32_CRYPTO
     #define WOLFSSL_STM32_PKA
     #define WOLFSSL_STM32_PKA_V2
+#elif defined(STM32WBA52xx)
+    #define WOLFSSL_STM32WBA
+    #define WOLFSSL_STM32_PKA
+    #undef  NO_STM32_HASH
+    #undef  NO_STM32_CRYPTO
+    #define HAL_CONSOLE_UART huart4
 #else
     #warning Please define a hardware platform!
     /* This means there is not a pre-defined platform for your board/CPU */
diff --git a/wolfcrypt/src/port/st/stm32.c b/wolfcrypt/src/port/st/stm32.c
index 58b612590..87da8984b 100644
--- a/wolfcrypt/src/port/st/stm32.c
+++ b/wolfcrypt/src/port/st/stm32.c
@@ -64,6 +64,9 @@
 #elif defined(WOLFSSL_STM32H7S)
 #include <stm32h7rsxx_hal_conf.h>
 #include <stm32h7rsxx_hal_pka.h>
+#elif defined(WOLFSSL_STM32WBA)
+#include <stm32wbaxx_hal_conf.h>
+#include <stm32wbaxx_hal_pka.h>
 #else
 #error Please add the hal_pk.h include
 #endif
diff --git a/wolfssl/wolfcrypt/port/st/stm32.h b/wolfssl/wolfcrypt/port/st/stm32.h
index 48c4e3e78..f61fa8579 100644
--- a/wolfssl/wolfcrypt/port/st/stm32.h
+++ b/wolfssl/wolfcrypt/port/st/stm32.h
@@ -145,7 +145,8 @@ int  wc_Stm32_Hash_Final(STM32_HASH_Context* stmCtx, word32 algo,
         #define STM32_CRYPTO_AES_GCM
     #endif
 
-    #if defined(WOLFSSL_STM32WB) || defined(WOLFSSL_STM32WL)
+    #if defined(WOLFSSL_STM32WB) || defined(WOLFSSL_STM32WL) || \
+        defined(WOLFSSL_STM32WBA)
         #define STM32_CRYPTO_AES_ONLY /* crypto engine only supports AES */
         #ifdef WOLFSSL_STM32WB
             #define CRYP AES1
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index 2688960d1..4086f020f 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -2090,14 +2090,14 @@ extern void uITRON4_free(void *p) ;
 
 #endif /* WOLFSSL_MAXQ1065 || WOLFSSL_MAXQ108X */
 
-#if defined(WOLFSSL_STM32F2) || defined(WOLFSSL_STM32F4) || \
-    defined(WOLFSSL_STM32F7) || defined(WOLFSSL_STM32F1) || \
-    defined(WOLFSSL_STM32L4) || defined(WOLFSSL_STM32L5) || \
-    defined(WOLFSSL_STM32WB) || defined(WOLFSSL_STM32H7) || \
-    defined(WOLFSSL_STM32G0) || defined(WOLFSSL_STM32U5) || \
-    defined(WOLFSSL_STM32H5) || defined(WOLFSSL_STM32WL) || \
-    defined(WOLFSSL_STM32G4) || defined(WOLFSSL_STM32MP13) || \
-    defined(WOLFSSL_STM32H7S)
+#if defined(WOLFSSL_STM32F2)  || defined(WOLFSSL_STM32F4)   || \
+    defined(WOLFSSL_STM32F7)  || defined(WOLFSSL_STM32F1)   || \
+    defined(WOLFSSL_STM32L4)  || defined(WOLFSSL_STM32L5)   || \
+    defined(WOLFSSL_STM32WB)  || defined(WOLFSSL_STM32H7)   || \
+    defined(WOLFSSL_STM32G0)  || defined(WOLFSSL_STM32U5)   || \
+    defined(WOLFSSL_STM32H5)  || defined(WOLFSSL_STM32WL)   || \
+    defined(WOLFSSL_STM32G4)  || defined(WOLFSSL_STM32MP13) || \
+    defined(WOLFSSL_STM32H7S) || defined(WOLFSSL_STM32WBA)
 
     #define SIZEOF_LONG_LONG 8
     #ifndef CHAR_BIT
@@ -2167,6 +2167,8 @@ extern void uITRON4_free(void *p) ;
                 #include "stm32mp13xx_hal.h"
                 #include "stm32mp13xx_hal_conf.h"
             #endif
+        #elif defined(WOLFSSL_STM32WBA)
+            #include "stm32wbaxx_hal.h"
         #endif
         #if defined(WOLFSSL_CUBEMX_USE_LL) && defined(WOLFSSL_STM32L4)
             #include "stm32l4xx_ll_rng.h"