Enable backup for network core, so the last known image will still be in shared ram. Fixed bug with swap offset on network core external memory map and "erase" init.

Author: dgarske

config/examples/nrf5340_net.config

@@ -18,7 +18,7 @@ RAM_CODE?=1
 
 DUALBANK_SWAP?=0
 FLAGS_HOME=0
-DISABLE_BACKUP=1
+DISABLE_BACKUP=0
 # Implementation maps to shared application core memory
 EXT_FLASH?=1
 SPI_FLASH?=0
@@ -42,6 +42,9 @@ WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x100000
 # Flash offset for swap (uses shared memory)
 WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x12E000
 
+# Network core uses partition ID 2
+CFLAGS_EXTRA+=-DHDR_IMG_TYPE_APP=0x2
+
 V?=0
 DEBUG?=0
 DEBUG_UART?=1

hal/nrf5340.c

@@ -40,9 +40,17 @@
 
 /* Network updates can be signed with "--id 2" and placed into the normal update partition,
  * or they can be placed into the external flash at offset 0x100000 */
+/* Partition ID should be set HDR_IMG_TYPE_APP=2 */
 #ifndef PART_NET_ID
-#define PART_NET_ID 2
+#ifdef HDR_IMG_TYPE_APP
+    #define PART_NET_ID HDR_IMG_TYPE_APP
+#else
+    #define PART_NET_ID 2 /* default */
+#endif
 #endif
+
+/* Offset in external QSPI flash for network update
+ * Comes from nrf5340_net.config WOLFBOOT_PARTITION_UPDATE_ADDRESS) */
 #ifndef PART_NET_ADDR
 #define PART_NET_ADDR 0x100000UL
 #endif
@@ -244,14 +252,8 @@ void RAMFUNCTION hal_flash_lock(void)
 /* calculates location in shared memory */
 static uintptr_t ext_flash_addr_calc(uintptr_t address)
 {
-    if (address >= WOLFBOOT_PARTITION_UPDATE_ADDRESS) {
-        if (address >= WOLFBOOT_PARTITION_SWAP_ADDRESS) {
-            address -= WOLFBOOT_PARTITION_SWAP_ADDRESS;
-        }
-        else { /* update */
-            address -= WOLFBOOT_PARTITION_UPDATE_ADDRESS;
-        }
-    }
+    /* offset external flash addresses by the update partition address */
+    address -= WOLFBOOT_PARTITION_UPDATE_ADDRESS;
     /* check address */
     if (address >= (FLASH_SIZE_NET + FLASH_PAGESZ_NET)) {
         address = 0;
@@ -456,6 +458,9 @@ static void hal_net_check_version(void)
             wolfBoot_verify_authenticity(&img) == 0)
         {
             wolfBoot_printf("Network image valid, loading into shared mem\n");
+            /* initialize remainder of shared memory with 0xFF (erased) */
+            memset(shm->data + shm->app.size, FLASH_BYTE_ERASED,
+                sizeof(shm->data) - shm->app.size);
             /* relocate image to shared ram */
         #ifdef EXT_FLASH
             ret = ext_flash_read(PART_NET_ADDR, shm->data, shm->app.size);

include/wolfboot/wolfboot.h

@@ -112,7 +112,9 @@ extern "C" {
 
 #define HDR_IMG_TYPE_PART_MASK    0x000F
 #define HDR_IMG_TYPE_WOLFBOOT     0x0000
+#ifndef HDR_IMG_TYPE_APP
 #define HDR_IMG_TYPE_APP          0x0001
+#endif
 
  #define KEYSTORE_PUBKEY_SIZE_NONE    0
  #define KEYSTORE_PUBKEY_SIZE_ED25519 32

src/update_flash.c

@@ -486,7 +486,7 @@ static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
     const uint32_t sector_size = WOLFBOOT_SECTOR_SIZE;
     uint32_t sector = 0;
     /* we need to pre-set flag to SECT_FLAG_NEW in case magic hasn't been set
-     * on the update partion as part of the delta update direction check. if
+     * on the update partition as part of the delta update direction check. if
      * magic has not been set flag will have an un-determined value when we go
      * to check it */
     uint8_t flag = SECT_FLAG_NEW;
@@ -663,9 +663,10 @@ static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
         }
     }
 
+    /* Erase remainder of partitions */
+#if defined(WOLFBOOT_FLASH_MULTI_SECTOR_ERASE) || defined(PRINTF_ENABLED)
     /* calculate number of remaining bytes */
     /* reserve 1 sector for status (2 sectors for NV write once) */
-#if defined(WOLFBOOT_FLASH_MULTI_SECTOR_ERASE) || defined(PRINTF_ENABLED)
 #ifdef NVM_FLASH_WRITEONCE
     size = WOLFBOOT_PARTITION_SIZE - (sector * sector_size) - (2 * sector_size);
 #else
@@ -677,8 +678,9 @@ static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
 #endif
 
 #ifdef WOLFBOOT_FLASH_MULTI_SECTOR_ERASE
-    /* Performant option: Erase remainder of flash sectors in one HAL command */
-    /* If the HAL supports erase of multiple sectors this could improve performance */
+    /* Erase remainder of flash sectors in one HAL command. */
+    /* This can improve performance if the HAL supports erase of
+     * multiple sectors */
     wb_flash_erase(&boot, sector * sector_size, size);
     wb_flash_erase(&update, sector * sector_size, size);
 #else