Merge pull request #11650 from OpenNuvoton/nuvoton_trng-hal-with-trng-hw

Nuvoton: Re-implement TRNG HAL with TRNG H/W

Author: 0xc0170

targets/TARGET_NUVOTON/TARGET_M2351/PeripheralNames.h

@@ -328,6 +328,15 @@ typedef enum {
 
 } CANName;
 
+typedef enum {
+#if defined(SCU_INIT_PNSSET5_VAL) && (SCU_INIT_PNSSET5_VAL & (1 << 25))
+    TRNG_0 = (int) NU_MODNAME(TRNG_BASE + NS_OFFSET, 0, 0)
+#else
+    TRNG_0 = (int) NU_MODNAME(TRNG_BASE, 0, 0)
+#endif
+
+} TRNGName;
+
 #ifdef __cplusplus
 }
 #endif

targets/TARGET_NUVOTON/TARGET_M2351/TARGET_M23_NS/TARGET_NU_PFM_M2351_NPSA_NS/TARGET_NU_PREBUILD_SECURE/NuMaker-mbed-TZ-secure-example.hex

@@ -18,6 +18,7 @@ The pre-built secure code has the following hardware partition:
     - **TMR2/3** configured to nonsecure. TMR2 implements nonsecure `us_ticker`, and TMR3 implements nonsecure `lp_ticker`.
     - **PDMA0** hardwired to secure. Implements secure asynchronous transfer.
     - **PDMA1** configured to nonsecure. Implements nonsecure asynchronous transfer.
+    - **TRNG** configured to secure. Accessible to nonsecure through a secure gateway.
 
 ## Pre-built secure code files
 

targets/TARGET_NUVOTON/TARGET_M2351/TARGET_M23_NS/TARGET_NU_PFM_M2351_NPSA_NS/TARGET_NU_PREBUILD_SECURE/README.md

@@ -27,7 +27,7 @@
 #include "platform/SingletonPtr.h"
 #include "platform/PlatformMutex.h"
 
-#if DEVICE_TRNG || defined(MBEDTLS_CONFIG_HW_SUPPORT)
+#if defined(MBEDTLS_CONFIG_HW_SUPPORT)
 
 /* Consideration for choosing proper synchronization mechanism
  *
@@ -345,4 +345,4 @@ extern "C" void CRPT_IRQHandler()
     }
 }
 
-#endif /* #if DEVICE_TRNG || defined(MBEDTLS_CONFIG_HW_SUPPORT) */
+#endif /* #if defined(MBEDTLS_CONFIG_HW_SUPPORT) */

targets/TARGET_NUVOTON/TARGET_M2351/TARGET_M23_NS/TARGET_NU_PFM_M2351_NPSA_NS/TARGET_NU_PREBUILD_SECURE/cmse_lib.o

@@ -24,24 +24,23 @@
  *
  * There's only one CRYPTO/CRPT module and we have the following policy for configuring its secure attribute:
  *
- * 1. TRNG or mbedtls H/W support can be enabled on either secure target or non-secure target, but not both.
- * 2. TRNG and mbedtls H/W supports cannot be enabled on different targets.
- * 3. On secure target, if TRNG or mbedtls H/W support is enabled, CRYPTO/CRPT must configure to secure.
- * 4. On non-secure target, if TRNG or mbedtls H/W support is enabled, CRYPTO/CRPT must configure to non-secure.
+ * 1. mbedtls H/W support can be enabled on either secure target or non-secure target, but not both.
+ * 2. On secure target, if mbedtls H/W support is enabled, CRYPTO/CRPT must configure to secure.
+ * 3. On non-secure target, if mbedtls H/W support is enabled, CRYPTO/CRPT must configure to non-secure.
  */
-#if DEVICE_TRNG || defined(MBEDTLS_CONFIG_HW_SUPPORT)
+#if defined(MBEDTLS_CONFIG_HW_SUPPORT)
     #if defined(__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
         #if defined(SCU_INIT_PNSSET1_VAL) && (SCU_INIT_PNSSET1_VAL & (1 << 18))
-            #error("CRYPTO/CRPT must configure to secure for secure target which supports TRNG or mbedtls H/W")
+            #error("CRYPTO/CRPT must configure to secure for secure target which supports mbedtls H/W")
         #endif
     #else
         #if (! defined(SCU_INIT_PNSSET1_VAL)) || (! (SCU_INIT_PNSSET1_VAL & (1 << 18)))
-            #error("CRYPTO/CRPT must configure to non-secure for non-secure target which supports TRNG or mbedtls H/W")
+            #error("CRYPTO/CRPT must configure to non-secure for non-secure target which supports mbedtls H/W")
         #endif
     #endif
 #endif
 
-#if DEVICE_TRNG || defined(MBEDTLS_CONFIG_HW_SUPPORT)
+#if defined(MBEDTLS_CONFIG_HW_SUPPORT)
 
 #ifdef __cplusplus
 extern "C" {
@@ -132,6 +131,6 @@ bool crypto_dma_buffs_overlap(const void *in_buff, size_t in_buff_size, const vo
 }
 #endif
 
-#endif  /* #if DEVICE_TRNG || defined(MBEDTLS_CONFIG_HW_SUPPORT) */
+#endif  /* defined(MBEDTLS_CONFIG_HW_SUPPORT) */
 
 #endif

targets/TARGET_NUVOTON/TARGET_M2351/crypto/crypto-misc.cpp

@@ -686,7 +686,7 @@ typedef volatile unsigned short vu16;
 #include "m2351_qei.h"
 #include "m2351_can.h"
 #include "m2351_scu.h"
-#include "m2351_bootloader.h"
+#include "m2351_mkromlib.h"
 
 #endif  /* __M2351_H__ */