Skip to content

Commit 1f99a35

Browse files
twcook86danielinux
authored andcommitted
Add hw support for SHA1 and SHA256
1 parent 284a1d5 commit 1f99a35

4 files changed

Lines changed: 28 additions & 8 deletions

File tree

arch.mk

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,9 +1214,11 @@ ifeq ($(TARGET),lpc55s69)
12141214
-I$(MCUXPRESSO_DRIVERS)/drivers \
12151215
-I$(MCUXPRESSO_DRIVERS)/../periph \
12161216
-I$(MCUXPRESSO)/drivers \
1217+
-I$(MCUXPRESSO)/drivers/casper \
12171218
-I$(MCUXPRESSO)/drivers/common \
12181219
-I$(MCUXPRESSO)/drivers/flexcomm \
12191220
-I$(MCUXPRESSO)/drivers/flexcomm/usart \
1221+
-I$(MCUXPRESSO)/drivers/hashcrypt \
12201222
-I$(MCUXPRESSO)/drivers/iap1 \
12211223
-I$(MCUXPRESSO)/drivers/lpc_gpio \
12221224
-I$(MCUXPRESSO)/drivers/lpc_iocon \
@@ -1235,15 +1237,23 @@ ifeq ($(TARGET),lpc55s69)
12351237
$(MCUXPRESSO)/drivers/common/fsl_common_arm.o \
12361238
$(MCUXPRESSO)/drivers/iap1/fsl_iap.o \
12371239
$(MCUXPRESSO)/drivers/lpc_gpio/fsl_gpio.o
1238-
ifeq ($(WOLFCRYPT_TZ),1)
1239-
OBJS+=$(MCUXPRESSO)/drivers/rng_1/fsl_rng.o
1240-
endif
12411240
ifeq ($(DEBUG_UART),1)
12421241
OBJS+=\
12431242
$(MCUXPRESSO_DRIVERS)/drivers/fsl_reset.o \
12441243
$(MCUXPRESSO)/drivers/flexcomm/fsl_flexcomm.o \
12451244
$(MCUXPRESSO)/drivers/flexcomm/usart/fsl_usart.o
12461245
endif
1246+
ifeq ($(PKA),1)
1247+
CFLAGS+=-DWOLFSSL_NXP_CASPER -DWOLFSSL_NXP_HASHCRYPT
1248+
OBJS+=\
1249+
$(MCUXPRESSO)/drivers/casper/fsl_casper.o \
1250+
$(MCUXPRESSO)/drivers/hashcrypt/fsl_hashcrypt.o \
1251+
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/nxp/casper_port.o \
1252+
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/nxp/hashcrypt_port.o
1253+
endif
1254+
ifeq ($(WOLFCRYPT_TZ),1)
1255+
OBJS+=$(MCUXPRESSO)/drivers/rng_1/fsl_rng.o
1256+
endif
12471257
endif
12481258

12491259
ifeq ($(TARGET),psoc6)

config/examples/lpc55s69-tz.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARCH?=ARM
22
TZEN?=1
33
TARGET?=lpc55s69
44
SIGN?=ECC384
5-
HASH?=SHA384
5+
HASH?=SHA256
66
MCUXSDK?=1
77
MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
88
MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS

config/examples/lpc55s69.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARCH?=ARM
22
TZEN?=0
33
TARGET?=lpc55s69
44
SIGN?=ECC384
5-
HASH?=SHA384
5+
HASH?=SHA256
66
MCUXSDK?=1
77
MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
88
MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS

hal/lpc55s69.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,27 @@ static void hal_flash_fix_ecc(void)
9393
}
9494
}
9595

96+
97+
extern int wc_hashcrypt_init(void);
98+
9699
void hal_init(void)
97100
{
98101
#ifdef __WOLFBOOT
99102
/* lpc55s69 must run < 100 MHz for flash write/erase to work */
100103
BOARD_BootClockFROHF96M();
101104
// BOARD_BootClockPLL150M();
102-
#ifdef DEBUG_UART
105+
106+
# ifdef WOLFSSL_NXP_HASHCRYPT
107+
CLOCK_EnableClock(kCLOCK_HashCrypt);
108+
wc_hashcrypt_init();
109+
# endif
110+
111+
# ifdef DEBUG_UART
103112
uart_init();
104113
uart_write("lpc55s69 init\n", 14);
105-
#endif
106-
#endif
114+
# endif
115+
116+
#endif /* __WOLFBOOT */
107117

108118
#if defined(__WOLFBOOT) || !defined(TZEN)
109119
memset(&pflash, 0, sizeof(pflash));

0 commit comments

Comments
 (0)