Initial draft for psoc6 support

Author: danielinux

Makefile

@@ -57,9 +57,8 @@ ifeq ($(SIGN),ED25519)
 	./lib/wolfssl/wolfcrypt/src/wolfmath.o \
     ./lib/wolfssl/wolfcrypt/src/fe_low_mem.o
   PUBLIC_KEY_OBJS=./src/ed25519_pub_key.o
-  CFLAGS+=-DWOLFBOOT_SIGN_ED25519 -nostdlib \
+  CFLAGS+=-DWOLFBOOT_SIGN_ED25519 \
 		  -Wstack-usage=1024
-  LDFLAGS+=-nostdlib
 endif
 
 ifeq ($(SIGN),RSA2048)
@@ -191,10 +190,6 @@ wolfboot.bin: wolfboot.elf
 	@echo "\t[BIN] $@"
 	$(Q)$(OBJCOPY) -O binary $^ $@
 
-wolfboot.hex: wolfboot.elf
-	@echo "\t[HEX] $@"
-	$(Q)$(OBJCOPY) -O ihex $^ $@
-
 align: wolfboot-align.bin
 
 .bootloader-partition-size:
@@ -256,6 +251,12 @@ $(LSCRIPT): hal/$(TARGET).ld .bootloader-partition-size FORCE
 		sed -e "s/##WOLFBOOT_PARTITION_BOOT_ADDRESS##/`cat .bootloader-partition-size`/g" \
 		> $@
 
+hex: wolfboot.hex
+
+%.hex:%.elf
+	@echo "\t[ELF2HEX] $@"
+	@$(OBJCOPY) -O ihex $^ $@
+
 src/ed25519_pub_key.c: ed25519.der
 
 src/ecc256_pub_key.c: ecc256.der

arch.mk

@@ -134,17 +134,6 @@ ifeq ($(TARGET),lpc)
   OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_usart.o $(MCUXPRESSO_DRIVERS)/drivers/fsl_flexcomm.o
 endif
 
-
-CFLAGS+=-DARCH_FLASH_OFFSET=$(ARCH_FLASH_OFFSET)
-
-## Toolchain setup
-CC=$(CROSS_COMPILE)gcc
-LD=$(CROSS_COMPILE)gcc
-AS=$(CROSS_COMPILE)gcc
-OBJCOPY:=$(CROSS_COMPILE)objcopy
-SIZE:=$(CROSS_COMPILE)size
-BOOT_IMG?=test-app/image.bin
-
 ifeq ($(TARGET),stm32f4)
   SPI_TARGET=stm32
 endif
@@ -162,6 +151,37 @@ ifeq ($(TARGET),stm32wb)
   endif
 endif
 
+ifeq ($(TARGET),psoc6)
+    PKA_EXTRA_OBJS+= $(CYPRESS_PDL)/drivers/source/cy_flash.o \
+					 $(CYPRESS_PDL)/drivers/source/cy_ipc_pipe.o \
+					 $(CYPRESS_PDL)/drivers/source/cy_ipc_sema.o \
+					 $(CYPRESS_PDL)/drivers/source/cy_ipc_drv.o \
+					 $(CYPRESS_PDL)/drivers/source/cy_device.o \
+					 $(CYPRESS_PDL)/drivers/source/cy_sysclk.o \
+					 $(CYPRESS_PDL)/drivers/source/cy_ble_clk.o \
+					 $(CYPRESS_PDL)/devices/templates/COMPONENT_MTB/COMPONENT_CM4/system_psoc6_cm4.o \
+					 $(CYPRESS_PDL)/drivers/source/TOOLCHAIN_GCC_ARM/cy_syslib_gcc.o
+    PKA_EXTRA_CFLAGS+=-I$(CYPRESS_PDL)/drivers/include/ \
+		-I$(CYPRESS_PDL)/devices/psoc6/psoc63/include/ \
+		-I$(CYPRESS_PDL)/devices/include \
+		-I$(CYPRESS_PDL)/cmsis/include \
+		-I$(CYPRESS_PDL)/core-lib/include \
+		-I$(CYPRESS_PDL)/devices/templates/COMPONENT_MTB \
+	    -DCY8C6248FNI_S2D43
+    ARCH_FLASH_OFFSET=0x10000000
+endif
+
+CFLAGS+=-DARCH_FLASH_OFFSET=$(ARCH_FLASH_OFFSET)
+
+## Toolchain setup
+CC=$(CROSS_COMPILE)gcc
+LD=$(CROSS_COMPILE)gcc
+AS=$(CROSS_COMPILE)gcc
+OBJCOPY:=$(CROSS_COMPILE)objcopy
+SIZE:=$(CROSS_COMPILE)size
+BOOT_IMG?=test-app/image.bin
+
+
 
 ## Update mechanism
 ifeq ($(ARCH),AARCH64)

hal/psoc6.c

@@ -0,0 +1,79 @@
+/* psoc6.c
+ *
+ * Copyright (C) 2020 wolfSSL Inc.
+ *
+ * This file is part of wolfBoot.
+ *
+ * wolfBoot is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfBoot is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */
+
+#include <stdint.h>
+#include <target.h>
+#include "image.h"
+
+#include "cy_device_headers.h"
+
+#include "cy_flash.h"
+#include "cy_syspm.h"
+#include "cy_ipc_drv.h"
+
+#ifndef NVM_FLASH_WRITEONCE
+#   error "wolfBoot psoc6 HAL: no WRITEONCE support detected. Please define NVM_FLASH_WRITEONCE"
+#endif
+
+
+#ifdef __WOLFBOOT
+void hal_init(void)
+{
+    /* TODO: how to set clock full speed? */
+}
+
+void hal_prepare_boot(void)
+{
+    /* TODO: how to restore boot-default clock speed? */
+}
+
+#endif
+
+int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
+{
+    if (len != WOLFBOOT_SECTOR_SIZE)
+        return -1;
+    Cy_Flash_WriteRow(address,(const uint32_t *) data);
+    return 0;
+}
+
+void RAMFUNCTION hal_flash_unlock(void)
+{
+}
+
+void RAMFUNCTION hal_flash_lock(void)
+{
+}
+
+int RAMFUNCTION hal_flash_erase(uint32_t address, int len)
+{
+    int start = -1, end = -1;
+    uint32_t end_address;
+    uint32_t p;
+    if (len == 0)
+        return -1;
+    end_address = address + len - 1;
+    for (p = address; p < end_address; p += WOLFBOOT_SECTOR_SIZE) {
+        Cy_Flash_EraseRow(p);
+    }
+    return 0;
+}
+

hal/psoc6.ld

@@ -0,0 +1,53 @@
+MEMORY
+{
+    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = ##WOLFBOOT_PARTITION_BOOT_ADDRESS##
+    RAM (rwx)  : ORIGIN = 0x20000000, LENGTH = 64K
+}
+
+SECTIONS
+{
+
+    .text :
+    {
+        _start_text = .;
+        KEEP(*(.isr_vector))
+        . = ALIGN(0x400);
+        *(.text*)
+        *(.rodata*)
+        *(.init*)
+        *(.fini*)
+        . = ALIGN(4);
+        _end_text = .;
+    } > FLASH
+
+    .edidx :
+    {
+        . = ALIGN(4);
+        *(.ARM.exidx*)
+    } > FLASH
+
+    _stored_data = .;
+
+    .data : AT (_stored_data)
+    {
+        _start_data = .;
+        KEEP(*(.data*))
+        . = ALIGN(4);
+        _end_data = .;
+    } > RAM
+
+    .bss (NOLOAD) : 
+    {
+        _start_bss = .;
+        __bss_start__ = .;
+        *(.bss*)
+        *(COMMON)
+        . = ALIGN(4);
+        _end_bss = .;
+        __bss_end__ = .;
+        _end = .;
+    } > RAM
+    . = ALIGN(4);
+}
+
+END_STACK = ORIGIN(RAM) + LENGTH(RAM);

hal/skeleton.c

@@ -0,0 +1,56 @@
+/* skeleton.c
+ *
+ * Stubs for custom HAL implementation. Defines the 
+ * functions used by wolfboot for a specific target.
+ *
+ * Copyright (C) 2020 wolfSSL Inc.
+ *
+ * This file is part of wolfBoot.
+ *
+ * wolfBoot is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfBoot is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */
+
+#include <stdint.h>
+#include <target.h>
+#include "image.h"
+
+
+#ifdef __WOLFBOOT
+void hal_init(void)
+{
+}
+
+void hal_prepare_boot(void)
+{
+}
+
+#endif
+
+int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
+{
+}
+
+void RAMFUNCTION hal_flash_unlock(void)
+{
+}
+
+void RAMFUNCTION hal_flash_lock(void)
+{
+}
+
+int RAMFUNCTION hal_flash_erase(uint32_t address, int len)
+{
+}
+

test-app/app_psoc6.c

@@ -0,0 +1,35 @@
+/* main.c
+ *
+ * Test bare-metal boot-led-on application
+ *
+ * Copyright (C) 2020 wolfSSL Inc.
+ *
+ * This file is part of wolfBoot.
+ *
+ * wolfBoot is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfBoot is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */
+
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include "wolfboot/wolfboot.h"
+
+
+void main(void) {
+    /* Wait for reboot */
+    while(1)
+        ;
+}
+

tools/config.mk

@@ -10,6 +10,7 @@ ifeq ($(ARCH),)
   MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS
   FREEDOM_E_SDK?=$(HOME)/src/freedom-e-sdk
   STM32CUBE?=$(HOME)/STM32Cube/Repository/STM32Cube_FW_WB_V1.3.0
+  CYPRESS_PDL?=$(HOME)/src/Cypress-Peripheral-Driver-Library-v3.0.1
   DEBUG?=0
   VTOR?=1
   CORTEX_M0?=0
@@ -41,7 +42,7 @@ endif
 
 
 CONFIG_VARS:= ARCH TARGET SIGN HASH MCUXPRESSO MCUXPRESSO_CPU MCUXPRESSO_DRIVERS \
-	MCUXPRESSO_CMSIS FREEDOM_E_SDK STM32CUBE DEBUG VTOR CORTEX_M0 NO_ASM EXT_FLASH \
+	MCUXPRESSO_CMSIS FREEDOM_E_SDK STM32CUBE CYPRESS_PDL DEBUG VTOR CORTEX_M0 NO_ASM EXT_FLASH \
 	SPI_FLASH NO_XIP UART_FLASH ALLOW_DOWNGRADE NVM_FLASH_WRITEONCE WOLFBOOT_VERSION V \
 	SPMATH RAM_CODE DUALBANK_SWAP IMAGE_HEADER_SIZE PKA WOLFTPM \
 	WOLFBOOT_PARTITION_SIZE WOLFBOOT_SECTOR_SIZE  \