Rework rng a bit

Author: twcook86

arch.mk

@@ -1237,16 +1237,15 @@ ifeq ($(TARGET),lpc55s69)
       $(MCUXPRESSO)/drivers/common/fsl_common_arm.o \
       $(MCUXPRESSO)/drivers/iap1/fsl_iap.o \
       $(MCUXPRESSO)/drivers/lpc_gpio/fsl_gpio.o \
-      $(MCUXPRESSO)/drivers/rng_1/fsl_rng.o \
-      $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/nxp/rng_port.o
+      $(MCUXPRESSO)/drivers/rng_1/fsl_rng.o
   ifeq ($(DEBUG_UART),1)
     OBJS+=\
       $(MCUXPRESSO_DRIVERS)/drivers/fsl_reset.o \
       $(MCUXPRESSO)/drivers/flexcomm/fsl_flexcomm.o \
       $(MCUXPRESSO)/drivers/flexcomm/usart/fsl_usart.o
   endif
   ifeq ($(PKA),1)
-    CFLAGS+=-DWOLFSSL_NXP_LPC55S69
+    CFLAGS+=-DWOLFSSL_NXP_LPC55S69_WITH_HWACCEL
     OBJS+=\
         $(MCUXPRESSO)/drivers/casper/fsl_casper.o \
         $(MCUXPRESSO)/drivers/hashcrypt/fsl_hashcrypt.o \

hal/lpc55s69.c

@@ -71,8 +71,6 @@ static void hal_sau_init(void)
 
 static void periph_unsecure(void)
 {
-    CLOCK_EnableClock(kCLOCK_Rng);
-    RESET_PeripheralReset(kRNG_RST_SHIFT_RSTn);
     CLOCK_EnableClock(kCLOCK_Iocon);
     CLOCK_EnableClock(kCLOCK_Gpio1);
 }
@@ -118,8 +116,13 @@ void hal_init(void)
     wc_casper_init();
 # endif
 
+    CLOCK_EnableClock(kCLOCK_Rng);
+    RESET_PeripheralReset(kRNG_RST_SHIFT_RSTn);
+
 #endif /* __WOLFBOOT */
 
+    RNG_Init(RNG);
+
 #if defined(__WOLFBOOT) || !defined(TZEN)
     memset(&pflash, 0, sizeof(pflash));
     FLASH_Init(&pflash);
@@ -224,11 +227,7 @@ int RAMFUNCTION hal_flash_erase(uint32_t address, int len)
 #ifdef WOLFCRYPT_SECURE_MODE
 void hal_trng_init(void)
 {
-# ifdef __WOLFBOOT
-    CLOCK_EnableClock(kCLOCK_Rng);
-    RESET_PeripheralReset(kRNG_RST_SHIFT_RSTn);
-# endif
-    RNG_Init(RNG);
+    /* handled in hal_init() regardless */
 }
 
 void hal_trng_fini(void)

test-app/Makefile

@@ -729,8 +729,7 @@ ifeq ($(TARGET),lpc55s69)
       $(MCUXPRESSO)/drivers/flexcomm/usart/fsl_usart.o \
       $(MCUXPRESSO)/drivers/iap1/fsl_iap.o \
       $(MCUXPRESSO)/drivers/lpc_gpio/fsl_gpio.o \
-      $(MCUXPRESSO)/drivers/rng_1/fsl_rng.o \
-      $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/nxp/rng_port.o
+      $(MCUXPRESSO)/drivers/rng_1/fsl_rng.o
     ifeq ($(PKA),1)
       CFLAGS+=-DWOLFSSL_NXP_LPC55S69_WITH_HWACCEL
       APP_OBJS+=\

test-app/syscalls.c

@@ -141,7 +141,7 @@ int _getpid(void)
  * other OS facilities that don't exist in bare-metal.
  * wolfCrypt test/benchmark code calls standard printf, not wolfBoot_printf.
  */
-int vsnprintf(char *buf, unsigned int size, const char *fmt, va_list argp);
+static int vsnprintf(char *buf, unsigned int size, const char *fmt, va_list argp);
 
 /* Route all printf-family functions through our vsnprintf (in this file)
  * rather than uart_vprintf (in string.c). This ensures float formatting
@@ -222,7 +222,7 @@ static int buf_num(char *buf, int pos, int size, unsigned int num,
     return pos;
 }
 
-int vsnprintf(char *buf, unsigned int size, const char *fmt, va_list argp)
+static int vsnprintf(char *buf, unsigned int size, const char *fmt, va_list argp)
 {
     int pos = 0;
     const char *fmtp = fmt;