Support for PSOC6 crypto support: added compile option

Author: danielinux

arch.mk

@@ -164,8 +164,9 @@ ifeq ($(TARGET),psoc6)
 					 $(CYPRESS_PDL)/drivers/source/cy_ble_clk.o \
 					 $(CYPRESS_PDL)/drivers/source/cy_wdt.o \
 					 $(CYPRESS_PDL)/drivers/source/TOOLCHAIN_GCC_ARM/cy_syslib_gcc.o \
-					 $(CYPRESS_PDL)/devices/templates/COMPONENT_MTB/COMPONENT_CM0P/system_psoc6_cm0plus.o \
-					 ./lib/wolfssl/wolfcrypt/src/port/cypress/psoc6_crypto.o \
+					 $(CYPRESS_PDL)/devices/templates/COMPONENT_MTB/COMPONENT_CM0P/system_psoc6_cm0plus.o
+
+    PSOC6_CRYPTO_OBJS=./lib/wolfssl/wolfcrypt/src/port/cypress/psoc6_crypto.o \
 					 $(CYPRESS_PDL)/drivers/source/cy_crypto_core_vu.o \
 					 $(CYPRESS_PDL)/drivers/source/cy_crypto_core_ecc_domain_params.o \
 					 $(CYPRESS_PDL)/drivers/source/cy_crypto_core_ecc_nist_p.o \
@@ -185,11 +186,17 @@ ifeq ($(TARGET),psoc6)
 		-I$(CYPRESS_CORE_LIB)/include \
 		-I$(CYPRESS_PDL)/devices/include/ip \
 		-I$(CYPRESS_PDL)/devices/templates/COMPONENT_MTB \
-		-DCY8C624ABZI_D44 \
-		-DWOLFSSL_PSOC6_CRYPTO
+		-DCY8C624ABZI_D44
+
     ARCH_FLASH_OFFSET=0x10000000
+    ifneq ($(PSOC6_CRYPTO),0)
+        CFLAGS+=-DWOLFSSL_PSOC6_CRYPTO
+        OBJS+=$(PSOC6_CRYPTO_OBJS)
+    endif
 endif
 
+
+
 CFLAGS+=-DARCH_FLASH_OFFSET=$(ARCH_FLASH_OFFSET)
 
 ## Toolchain setup

hal/psoc6.c

@@ -31,7 +31,9 @@
 #include "cy_sysclk.h"
 #include "cy_syslib.h"
 #include "cy_ipc_drv.h"
+#ifdef WOLFSSL_PSOC6_CRYPTO
 #include "wolfssl/wolfcrypt/port/cypress/psoc6_crypto.h"
+#endif
 
 #include "psoc6_02_config.h"
 
@@ -101,7 +103,9 @@ void hal_init(void)
     Cy_PDL_Init(CY_DEVICE_CFG);
     Cy_Flash_Init();
     hal_set_pll();
+#ifdef WOLFSSL_PSOC6_CRYPTO
     psoc6_crypto_port_init();
+#endif
 }
 
 void hal_prepare_boot(void)

lib/wolfssl

@@ -31,6 +31,7 @@ ifeq ($(ARCH),)
   DUALBANK_SWAP?=0
   IMAGE_HEADER_SIZE?=256
   PKA?=1
+  PSOC6_CRYPTO?=1
   WOLFTPM?=0
   WOLFBOOT_PARTITION_SIZE?=0x20000
   WOLFBOOT_SECTOR_SIZE?=0x20000
@@ -48,7 +49,7 @@ CONFIG_VARS:= ARCH TARGET SIGN HASH MCUXPRESSO MCUXPRESSO_CPU MCUXPRESSO_DRIVERS
 	MCUXPRESSO_CMSIS FREEDOM_E_SDK STM32CUBE CYPRESS_PDL CYPRESS_CORE_LIB CYPRESS_TARGET_LIB DEBUG VTOR \
 	CORTEX_M0 NO_ASM EXT_FLASH SPI_FLASH NO_XIP UART_FLASH ALLOW_DOWNGRADE NVM_FLASH_WRITEONCE \
 	WOLFBOOT_VERSION V NO_MPU \
-	SPMATH RAM_CODE DUALBANK_SWAP IMAGE_HEADER_SIZE PKA WOLFTPM \
+	SPMATH RAM_CODE DUALBANK_SWAP IMAGE_HEADER_SIZE PKA PSOC6_CRYPTO WOLFTPM \
 	WOLFBOOT_PARTITION_SIZE WOLFBOOT_SECTOR_SIZE  \
 	WOLFBOOT_PARTITION_BOOT_ADDRESS WOLFBOOT_PARTITION_UPDATE_ADDRESS \
 	WOLFBOOT_PARTITION_SWAP_ADDRESS WOLFBOOT_LOAD_ADDRESS \