lpc55s69 hw crypto

arch.mk

@@ -1205,9 +1205,11 @@ ifeq ($(TARGET),lpc55s69)
       -I$(MCUXPRESSO_DRIVERS)/drivers \
       -I$(MCUXPRESSO_DRIVERS)/../periph \
       -I$(MCUXPRESSO)/drivers \
+      -I$(MCUXPRESSO)/drivers/casper \
       -I$(MCUXPRESSO)/drivers/common \
       -I$(MCUXPRESSO)/drivers/flexcomm \
       -I$(MCUXPRESSO)/drivers/flexcomm/usart \
+      -I$(MCUXPRESSO)/drivers/hashcrypt \
       -I$(MCUXPRESSO)/drivers/iap1 \
       -I$(MCUXPRESSO)/drivers/lpc_gpio \
       -I$(MCUXPRESSO)/drivers/lpc_iocon \
@@ -1225,16 +1227,24 @@ ifeq ($(TARGET),lpc55s69)
       $(MCUXPRESSO_DRIVERS)/drivers/fsl_power.o \
       $(MCUXPRESSO)/drivers/common/fsl_common_arm.o \
       $(MCUXPRESSO)/drivers/iap1/fsl_iap.o \
-      $(MCUXPRESSO)/drivers/lpc_gpio/fsl_gpio.o
-  ifeq ($(WOLFCRYPT_TZ),1)
-    OBJS+=$(MCUXPRESSO)/drivers/rng_1/fsl_rng.o
-  endif
+      $(MCUXPRESSO)/drivers/lpc_gpio/fsl_gpio.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_WITH_HWACCEL
+    OBJS+=\
+        $(MCUXPRESSO)/drivers/casper/fsl_casper.o \
+        $(MCUXPRESSO)/drivers/hashcrypt/fsl_hashcrypt.o \
+        $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/nxp/casper_port.o \
+        $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/nxp/hashcrypt_port.o
+  else
+    CFLAGS+=-DWOLFSSL_NXP_LPC55S69_NO_HWACCEL
+  endif
 endif
 
 ifeq ($(TARGET),psoc6)

config/examples/lpc55s69-benchmark.config

@@ -0,0 +1,45 @@
+ARCH?=ARM
+TZEN?=0
+TARGET?=lpc55s69
+SIGN?=ECC384
+HASH?=SHA256
+MCUXSDK?=1
+MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
+MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
+MCUXPRESSO_CPU?=LPC55S69JBD100_cm33_core0
+MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/LPC/LPC5500/LPC55S69
+MCUXPRESSO_PROJECT_TEMPLATE?=$(MCUXPRESSO)/examples/_boards/lpcxpresso55s69/project_template
+DEBUG?=0
+DEBUG_UART?=1
+VTOR?=1
+CORTEX_M0?=0
+CORTEX_M33?=1
+NO_ASM?=0
+NO_MPU=1
+EXT_FLASH?=0
+SPI_FLASH?=0
+ALLOW_DOWNGRADE?=0
+NVM_FLASH_WRITEONCE?=1
+NO_ARM_ASM=1
+WOLFBOOT_VERSION?=0
+V?=0
+SPMATH?=1
+RAM_CODE?=1
+DUALBANK_SWAP?=0
+FLASH_MULTI_SECTOR_ERASE?=1
+
+# Turn on or off hw acceleration of crypto algs in the lpc55s69
+PKA?=0
+
+# use 1024-byte sector to accommodate RSA4096 signature
+# WOLFBOOT_SECTOR_SIZE?=0x400
+WOLFBOOT_SECTOR_SIZE?=0x200
+
+# use these for test/benchmark
+WOLFBOOT_PARTITION_SIZE?=0x2b000
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x10000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x3b000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x66000
+
+WOLFCRYPT_TEST?=1
+WOLFCRYPT_BENCHMARK?=1

config/examples/lpc55s69-tz.config

@@ -2,7 +2,7 @@ ARCH?=ARM
 TZEN?=1
 TARGET?=lpc55s69
 SIGN?=ECC384
-HASH?=SHA384
+HASH?=SHA256
 MCUXSDK?=1
 MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
 MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
@@ -26,15 +26,18 @@ V?=0
 SPMATH?=1
 RAM_CODE?=1
 DUALBANK_SWAP?=0
-PKA?=1
 FLASH_MULTI_SECTOR_ERASE?=1
 WOLFCRYPT_TZ?=1
 WOLFCRYPT_TZ_PKCS11?=1
 
-# 512-byte pages erasable/writeable
+# Turn on or off hw acceleration of crypto algs in the lpc55s69
+PKA?=0
+
+# use 1024-byte sector to accommodate RSA4096 signature
+# WOLFBOOT_SECTOR_SIZE?=0x400
 WOLFBOOT_SECTOR_SIZE?=0x200
 
-# 200KB boot, 80KB keyvault, 8KB NSC, 56KB partitions, 512 swap
+# 200KB boot, 80KB keyvault, 8KB NSC, 56KB partitions, 512/1024 swap
 WOLFBOOT_KEYVAULT_ADDRESS?=0x10032000
 WOLFBOOT_KEYVAULT_SIZE?=0x14000
 WOLFBOOT_NSC_ADDRESS?=0x10046000

config/examples/lpc55s69.config

@@ -2,7 +2,7 @@ ARCH?=ARM
 TZEN?=0
 TARGET?=lpc55s69
 SIGN?=ECC384
-HASH?=SHA384
+HASH?=SHA256
 MCUXSDK?=1
 MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
 MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
@@ -26,15 +26,18 @@ V?=0
 SPMATH?=1
 RAM_CODE?=1
 DUALBANK_SWAP?=0
-PKA?=1
 FLASH_MULTI_SECTOR_ERASE?=1
 
-# 512-byte pages erasable/writeable
+# Turn on or off hw acceleration of crypto algs in the lpc55s69
+PKA?=0
+
+# use 1024-byte sector to accommodate RSA4096 signature
+# WOLFBOOT_SECTOR_SIZE?=0x400
 WOLFBOOT_SECTOR_SIZE?=0x200
 
 # Default configuration
-# 40KB boot, 44KB partitions, 512 swap
+# 44KB boot, 52KB partitions, 512/1024 swap
 WOLFBOOT_PARTITION_SIZE?=0xB000
-WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xA000
-WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x15000
-WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x20000
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xD000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x18000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x23000