Support for the Nordic nRF5340

.gdbinit

@@ -1,6 +1,7 @@
 file wolfboot.elf
 tar rem:3333
 add-symbol-file test-app/image.elf
+set pagination off
 foc c
 
 

.github/workflows/test-configs.yml

@@ -123,6 +123,18 @@ jobs:
       arch: arm
       config-file: ./config/examples/nrf52840.config
 
+  nrf5340_app_test:
+    uses: ./.github/workflows/test-build.yml
+    with:
+      arch: arm
+      config-file: ./config/examples/nrf5340.config
+
+  nrf5340_net_test:
+    uses: ./.github/workflows/test-build.yml
+    with:
+      arch: arm
+      config-file: ./config/examples/nrf5340_net.config
+
   nxp_p1021_test:
     uses: ./.github/workflows/test-build.yml
     with:
@@ -196,6 +208,14 @@ jobs:
       config-file: ./config/examples/sim.config
       make-args: SPMATH=1 WOLFBOOT_SMALL_STACK=0 WOLFBOOT_HUGE_STACK=1
 
+  sim_multi_sector_erase:
+    uses: ./.github/workflows/test-build.yml
+    with:
+      arch: host
+      config-file: ./config/examples/sim.config
+      make-args: CFLAGS_EXTRA=-DWOLFBOOT_FLASH_MULTI_SECTOR_ERASE
+
+
   # TODO: SP math with small stack has issues
 
   stm32c0:

Makefile

@@ -28,11 +28,13 @@ BIG_ENDIAN?=0
 USE_GCC?=1
 USE_GCC_HEADLESS?=1
 FLASH_OTP_KEYSTORE?=0
+BOOTLOADER_PARTITION_SIZE?=$$(( $(WOLFBOOT_PARTITION_BOOT_ADDRESS) - $(ARCH_FLASH_OFFSET)))
 
 OBJS:= \
 	./src/string.o \
 	./src/image.o \
 	./src/libwolfboot.o \
+	./hal/hal.o \
 	./hal/$(TARGET).o
 
 ifeq ($(SIGN),NONE)
@@ -140,7 +142,6 @@ ifeq ($(FLASH_OTP_KEYSTORE),1)
 endif
 
 ASFLAGS:=$(CFLAGS)
-BOOTLOADER_PARTITION_SIZE?=$$(( $(WOLFBOOT_PARTITION_BOOT_ADDRESS) - $(ARCH_FLASH_OFFSET)))
 
 all: $(MAIN_TARGET)
 

arch.mk

@@ -203,7 +203,9 @@ else
     CFLAGS+=-mcpu=cortex-m33 -DCORTEX_M33
     LDFLAGS+=-mcpu=cortex-m33
     ifeq ($(TZEN),1)
-      OBJS+=hal/stm32_tz.o
+      ifneq (,$(findstring stm32,$(TARGET)))
+        OBJS+=hal/stm32_tz.o
+      endif
       CFLAGS+=-mcmse
       ifeq ($(WOLFCRYPT_TZ),1)
         SECURE_OBJS+=./src/wc_callable.o

config/examples/nrf52840.config

@@ -3,6 +3,7 @@ TARGET?=nrf52
 SIGN?=ECC256
 HASH?=SHA256
 DEBUG?=0
+DEBUG_UART?=1
 VTOR?=1
 CORTEX_M0?=0
 NO_ASM?=0

config/examples/nrf5340.config

@@ -0,0 +1,65 @@
+ARCH?=ARM
+TZEN?=0
+TARGET?=nrf5340
+SIGN?=ECC384
+HASH?=SHA384
+WOLFBOOT_VERSION?=1
+VTOR?=1
+CORTEX_M0?=0
+CORTEX_M33?=1
+NO_ASM?=0
+NO_MPU=1
+ALLOW_DOWNGRADE?=0
+NVM_FLASH_WRITEONCE?=0
+DELTA_UPDATES?=1
+
+SPMATH?=1
+RAM_CODE?=1
+
+DUALBANK_SWAP?=0
+FLAGS_HOME=0
+DISABLE_BACKUP=0
+EXT_FLASH?=1
+SPI_FLASH?=0
+QSPI_FLASH?=1
+
+# Flash is 4KB pages (app)
+WOLFBOOT_SECTOR_SIZE?=0x1000
+
+# Application offset (reserve 48KB for wolfBoot)
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xC000
+
+# Application Partition Size (952KB)
+WOLFBOOT_PARTITION_SIZE?=0xEE000
+
+# External Flash offset for application update (1MB)
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x0
+
+# External Flash offset for network update at 0x100000 (size=256KB)
+
+# External Flash offset for swap (4KB)
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x140000
+
+V?=0
+DEBUG?=0
+DEBUG_UART?=1
+USE_GCC=1
+OPTIMIZATION_LEVEL=2
+
+# Optionally wait for network core to boot before starting application core
+CFLAGS_EXTRA+=-DNRF_SYNC_CORES
+
+# Use larger block size for swapping sectors (performance improvement)
+CFLAGS_EXTRA+=-DFLASHBUFFER_SIZE=0x1000
+
+# Enable optional power control pin (active low) P1.00
+#CFLAGS_EXTRA+=-DQSPI_PWR_CTRL_PORT=1 -DQSPI_PWR_CTRL_PIN=0
+
+# Use UART0 on P0.22
+#CFLAGS_EXTRA+=-DUART_PORT=0 -DUART_PIN=22
+
+#CFLAGS_EXTRA+=-DDEBUG_FLASH
+#CFLAGS_EXTRA+=-DDEBUG_QSPI=1
+
+# Hard fault debugging
+#CFLAGS_EXTRA+=-DDEBUG_HARDFAULT

config/examples/nrf5340_net.config

@@ -0,0 +1,57 @@
+ARCH?=ARM
+TZEN?=0
+TARGET?=nrf5340_net
+SIGN?=ECC384
+HASH?=SHA384
+WOLFBOOT_VERSION?=1
+VTOR?=1
+CORTEX_M0?=0
+CORTEX_M33?=1
+NO_ASM?=1
+NO_MPU=1
+ALLOW_DOWNGRADE?=0
+NVM_FLASH_WRITEONCE?=0
+DELTA_UPDATES?=1
+
+SPMATH?=1
+RAM_CODE?=1
+
+DUALBANK_SWAP?=0
+FLAGS_HOME=0
+DISABLE_BACKUP=0
+# Implementation maps to shared application core memory
+EXT_FLASH?=1
+SPI_FLASH?=0
+QSPI_FLASH?=0
+
+# Flash base for network core
+ARCH_FLASH_OFFSET=0x01000000
+
+# Flash is 2KB pages
+WOLFBOOT_SECTOR_SIZE?=0x800
+
+# Application offset (reserve 48KB for wolfBoot)
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x0100C000
+
+# Application Partition Size (184KB)
+WOLFBOOT_PARTITION_SIZE?=0x2E000
+
+# Flash offset for update (provided by application core to shared memory)
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x100000
+
+# Flash offset for swap (uses shared memory)
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x12E000
+
+# Network core uses partition ID 2
+WOLFBOOT_PART_ID=2
+
+V?=0
+DEBUG?=0
+DEBUG_UART?=1
+USE_GCC=1
+OPTIMIZATION_LEVEL=2
+
+#CFLAGS_EXTRA+=-DDEBUG_FLASH
+
+# Hard fault debugging
+#CFLAGS_EXTRA+=-DDEBUG_HARDFAULT