Merge pull request #31 from danielinux/stm32_spi

Stm32 spi

Author: dgarske

Makefile

@@ -18,6 +18,7 @@ OBJS:= \
 ./src/image.o \
 ./src/libwolfboot.o
 WOLFCRYPT_OBJS:=
+PUBLIC_KEY_OBJS:=
 
 
 ## Architecture/CPU configuration
@@ -29,17 +30,16 @@ ifeq ($(SIGN),ECC256)
   SIGN_OPTIONS=--ecc256
   PRIVATE_KEY=ecc256.der
   WOLFCRYPT_OBJS+= \
-    $(ECC_EXTRA_OBJS) \
     $(MATH_OBJS) \
 	./lib/wolfssl/wolfcrypt/src/ecc.o \
 	./lib/wolfssl/wolfcrypt/src/memory.o \
 	./lib/wolfssl/wolfcrypt/src/wc_port.o \
     ./lib/wolfssl/wolfcrypt/src/sha256.o \
     ./lib/wolfssl/wolfcrypt/src/hash.o \
-    ./src/ecc256_pub_key.o \
     ./src/xmalloc_ecc.o
-  CFLAGS+=-DWOLFBOOT_SIGN_ECC256 -DXMALLOC_USER $(ECC_EXTRA_CFLAGS) \
+  CFLAGS+=-DWOLFBOOT_SIGN_ECC256 -DXMALLOC_USER \
 		  -Wstack-usage=1024
+  PUBLIC_KEY_OBJS=./src/ecc256_pub_key.o
 endif
 
 ifeq ($(SIGN),ED25519)
@@ -52,8 +52,8 @@ ifeq ($(SIGN),ED25519)
     ./lib/wolfssl/wolfcrypt/src/sha256.o \
     ./lib/wolfssl/wolfcrypt/src/hash.o \
 	./lib/wolfssl/wolfcrypt/src/wolfmath.o \
-    ./lib/wolfssl/wolfcrypt/src/fe_low_mem.o \
-    ./src/ed25519_pub_key.o
+    ./lib/wolfssl/wolfcrypt/src/fe_low_mem.o
+  PUBLIC_KEY_OBJS=./src/ed25519_pub_key.o
   CFLAGS+=-DWOLFBOOT_SIGN_ED25519 -nostdlib -DWOLFSSL_STATIC_MEMORY \
 		  -Wstack-usage=1024
   LDFLAGS+=-nostdlib
@@ -71,8 +71,8 @@ ifeq ($(SIGN),RSA2048)
 	./lib/wolfssl/wolfcrypt/src/sha256.o \
 	./lib/wolfssl/wolfcrypt/src/asn.o \
 	./lib/wolfssl/wolfcrypt/src/hash.o \
-    ./src/rsa2048_pub_key.o \
 	./src/xmalloc_rsa.o
+  PUBLIC_KEY_OBJS=./src/rsa2048_pub_key.o
   CFLAGS+=-DWOLFBOOT_SIGN_RSA2048 -DXMALLOC_USER $(RSA_EXTRA_CFLAGS) \
 		  -Wstack-usage=12288 -DIMAGE_HEADER_SIZE=512
 endif
@@ -95,7 +95,7 @@ ifeq ($(SPI_FLASH),1)
    EXT_FLASH=1
    CFLAGS+= -DSPI_FLASH=1
    OBJS+= src/spi_flash.o
-   WOLFCRYPT_OBJS+=hal/spi/spi_drv_$(TARGET).o
+   WOLFCRYPT_OBJS+=hal/spi/spi_drv_$(SPI_TARGET).o
 endif
 
 ifeq ($(EXT_FLASH),1)
@@ -126,13 +126,19 @@ ifeq ($(VTOR),0)
     CFLAGS+=-DNO_VTOR
 endif
 
+ifeq ($(PKA),1)
+  OBJS += $(PKA_EXTRA_OBJS)
+  CFLAGS+=$(PKA_EXTRA_CFLAGS)
+endif
+
+OBJS+=$(PUBLIC_KEY_OBJS)
+
 ifeq ($(WOLFTPM),1)
 OBJS += lib/wolfTPM/src/tpm2.o \
 	lib/wolfTPM/src/tpm2_packet.o \
 	lib/wolfTPM/src/tpm2_tis.o \
 	lib/wolfTPM/src/tpm2_wrap.o \
-    src/ecc256_pub_key.o \
-    hal/spi/spi_drv_$(TARGET).o
+    hal/spi/spi_drv_$(SPI_TARGET).o
     CFLAGS+=-DWOLFTPM_SLB9670 -DWOLFTPM2_NO_WOLFCRYPT -DSIZEOF_LONG=4 -Ilib/wolfTPM \
 			-DMAX_COMMAND_SIZE=1024 -DMAX_RESPONSE_SIZE=1024 -DWOLFTPM2_MAX_BUFFER=1500 -DMAX_SESSION_NUM=1 -DMAX_DIGEST_BUFFER=973 \
 			-DWOLFTPM_SMALL_STACK
@@ -141,6 +147,7 @@ else
     OBJS+=$(WOLFCRYPT_OBJS)
 endif
 
+
 ASFLAGS:=$(CFLAGS)
 
 all: factory.bin

arch.mk

@@ -10,6 +10,9 @@ endif
 # Default flash offset
 ARCH_FLASH_OFFSET=0x0
 
+# Default SPI driver name
+SPI_TARGET=$(TARGET)
+
 ## ARM
 ifeq ($(ARCH),ARM)
   CROSS_COMPILE:=arm-none-eabi-
@@ -21,21 +24,28 @@ ifeq ($(ARCH),ARM)
   ifeq ($(TARGET),samr21)
     CORTEX_M0=1
   endif
-  
+
   ifeq ($(TARGET),stm32l0)
     CORTEX_M0=1
   endif
-  
+
   ifeq ($(TARGET),stm32g0)
     CORTEX_M0=1
   endif
 
   ifeq ($(TARGET),stm32f7)
     ARCH_FLASH_OFFSET=0x08000000
+    SPI_TARGET=stm32
   endif
 
   ifeq ($(TARGET),stm32h7)
     ARCH_FLASH_OFFSET=0x08000000
+    SPI_TARGET=stm32
+  endif
+
+  ifeq ($(TARGET),stm32wb)
+    ARCH_FLASH_OFFSET=0x08000000
+    SPI_TARGET=stm32
   endif
 
   ## Cortex-M CPU
@@ -68,25 +78,25 @@ ifeq ($(ARCH),RISCV)
   CROSS_COMPILE:=riscv32-unknown-elf-
   CFLAGS+=-fno-builtin-printf -DUSE_M_TIME -g -march=rv32imac -mabi=ilp32 -mcmodel=medany -nostartfiles -DARCH_RISCV
   LDFLAGS+=-march=rv32imac -mabi=ilp32 -mcmodel=medany
-  MATH_OBJS += ./lib/wolfssl/wolfcrypt/src/sp_c32.o 
-  
+  MATH_OBJS += ./lib/wolfssl/wolfcrypt/src/sp_c32.o
+
   # Prune unused functions and data
   CFLAGS +=-ffunction-sections -fdata-sections
   LDFLAGS+=-Wl,--gc-sections
 
   OBJS+=src/boot_riscv.o src/vector_riscv.o
   ARCH_FLASH_OFFSET=0x20010000
 endif
-  
-  
+
+
 ifeq ($(TARGET),kinetis)
   CFLAGS+= -I$(KINETIS_DRIVERS)/drivers -I$(KINETIS_DRIVERS) -DCPU_$(KINETIS_CPU) -I$(KINETIS_CMSIS)/Include -DDEBUG_CONSOLE_ASSERT_DISABLE=1
   OBJS+= $(KINETIS_DRIVERS)/drivers/fsl_clock.o $(KINETIS_DRIVERS)/drivers/fsl_ftfx_flash.o $(KINETIS_DRIVERS)/drivers/fsl_ftfx_cache.o $(KINETIS_DRIVERS)/drivers/fsl_ftfx_controller.o
   ## The following lines can be used to enable HW acceleration
   ifeq ($(KINETIS_CPU),MK82FN256VLL15)
     ifeq ($(PKA),1)
-      ECC_EXTRA_CFLAGS+=-DFREESCALE_LTC_ECC -DFREESCALE_USE_LTC -DFREESCALE_LTC_TFM
-      ECC_EXTRA_OBJS+=./lib/wolfssl/wolfcrypt/src/port/nxp/ksdk_port.o $(KINETIS_DRIVERS)/drivers/fsl_ltc.o
+      PKA_EXTRA_CFLAGS+=-DFREESCALE_LTC_ECC -DFREESCALE_USE_LTC -DFREESCALE_LTC_TFM
+      PKA_EXTRA_OBJS+=./lib/wolfssl/wolfcrypt/src/port/nxp/ksdk_port.o $(KINETIS_DRIVERS)/drivers/fsl_ltc.o
     endif
   endif
 endif
@@ -102,11 +112,15 @@ OBJCOPY:=$(CROSS_COMPILE)objcopy
 SIZE:=$(CROSS_COMPILE)size
 BOOT_IMG?=test-app/image.bin
 
+ifeq ($(TARGET),stm32f4)
+  SPI_TARGET=stm32
+endif
 
 ifeq ($(TARGET),stm32wb)
+  SPI_TARGET=stm32
   ifneq ($(PKA),0)
-    ECC_EXTRA_OBJS+= $(STM32CUBE)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pka.o  ./lib/wolfssl/wolfcrypt/src/port/st/stm32.o
-    ECC_EXTRA_CFLAGS+=-DWOLFSSL_STM32_PKA -I$(STM32CUBE)/Drivers/STM32WBxx_HAL_Driver/Inc \
+    PKA_EXTRA_OBJS+= $(STM32CUBE)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pka.o  ./lib/wolfssl/wolfcrypt/src/port/st/stm32.o
+    PKA_EXTRA_CFLAGS+=-DWOLFSSL_STM32_PKA -I$(STM32CUBE)/Drivers/STM32WBxx_HAL_Driver/Inc \
         -Isrc -I$(STM32CUBE)/Drivers/BSP/P-NUCLEO-WB55.Nucleo/ -I$(STM32CUBE)/Drivers/CMSIS/Device/ST/STM32WBxx/Include \
         -I$(STM32CUBE)/Drivers/STM32WBxx_HAL_Driver/Inc/ \
         -I$(STM32CUBE)/Drivers/CMSIS/Include \

config/examples/stm32wb-tpm.config

@@ -0,0 +1,10 @@
+TARGET=stm32wb
+SIGN=ECC256
+WOLFBOOT_SECTOR_SIZE?=0x20000
+WOLFBOOT_PARTITION_SIZE?=0x60000
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x00000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x60000
+NVM_FLASH_WRITEONCE=1
+PKA=0
+WOLFTPM=1

config/examples/stm32wb.config

@@ -0,0 +1,9 @@
+TARGET=stm32wb
+SIGN=ECC256
+WOLFBOOT_SECTOR_SIZE?=0x20000
+WOLFBOOT_PARTITION_SIZE?=0x60000
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x00000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x60000
+NVM_FLASH_WRITEONCE=1
+PKA=1

config/openocd/openocd_stm32f4.cfg

@@ -0,0 +1,8 @@
+source [find interface/stlink.cfg]
+source [find target/stm32f4x.cfg]
+$_TARGETNAME configure -event reset-init {
+    mmw 0xe0042004 0x7 0x0
+}
+init
+reset
+halt

config/openocd/openocd_stm32h7.cfg

@@ -0,0 +1,8 @@
+source [find interface/stlink.cfg]
+source [find target/stm32h7x.cfg]
+$_CHIPNAME.cpu0 configure -event reset-init {
+    mmw 0xe0042004 0x7 0x0
+}
+init
+reset
+halt

config/openocd/openocd_stm32wbx.cfg

@@ -0,0 +1,8 @@
+source [find interface/stlink.cfg]
+source [find target/stm32wbx.cfg]
+$_TARGETNAME configure -event reset-init {
+    mmw 0xe0042004 0x7 0x0
+}
+init
+reset
+halt

docs/Targets.md

@@ -88,6 +88,7 @@ Compile with:
 
 `make TARGET=stm32g0 NVM_FLASH_WRITEONCE=1`
 
+
 ## STM32WB55
 
 Example partitioning on Nucleo-68 board:
@@ -115,6 +116,30 @@ Compile with:
 
 `make TARGET=stm32wb NVM_FLASH_WRITEONCE=1`
 
+### Loading the firmware
+
+`openocd --file ./config/openocd/openocd_stm32wbx.cfg`
+
+```
+telnet localhost 4444
+flash write_image unlock erase wolfboot.bin 0x08000000
+flash verify_bank 0 wolfboot.bin
+flash write_image unlock erase test-app/image_v1_signed.bin 0x080008000
+flash verify_bank 0 test-app/image_v1_signed.bin 0x080008000
+reset
+```
+
+### Debugging
+
+Use `make DEBUG=1` and reload firmware.
+
+```
+arm-none-eabi-gdb wolfboot.elf -ex "set remotetimeout 240" -ex "target extended-remote localhost:3333"
+(gdb) add-symbol-file test-app/image.elf 0x8000
+(gdb) add-symbol-file wolfboot.elf 0x0
+```
+
+
 ## SiFive HiFive1 RISC-V
 
 ### Features
@@ -367,9 +392,8 @@ telnet localhost 4444
 flash write_image unlock erase wolfboot.bin 0x08000000
 flash verify_bank 0 wolfboot.bin
 flash write_image unlock erase test-app/image_v1_signed.bin 0x08020000
-flash verify_bank 0 test-app/image_v1_signed.bin 0x20000
+flash verify_bank 0 test-app/image_v1_signed.bin 0x08020000
 reset
-resume 0x08000000
 ```
 
 To sign the same application image as new version (2), use the python script `sign.py` provided: