ci: build MCUBoot image for Thingy:91

Signed-off-by: Maximilian Deubel <[email protected]>
mbrossard · Apr 13, 2023 · 3bc0c4b · 3bc0c4b
1 parent 2d6a3d5
commit 3bc0c4b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -53,7 +53,7 @@ jobs:
 
     - name: Install dependencies
       run:  |
-        sudo apt install -y ccache ninja-build
+        sudo apt install -y ccache ninja-build wget
         export PATH=/usr/lib/ccache:${{ runner.temp }}/arm-gcc/bin/:/home/runner/.local/bin:$PATH
         for i in ${{ runner.temp }}/arm-gcc/bin/* ; do sudo ln -s /usr/bin/ccache /usr/lib/ccache/$(basename $i); done
         ccache --set-config=cache_dir="$GITHUB_WORKSPACE"
@@ -79,6 +79,12 @@ jobs:
         mkdir bootloaders
         cp projectfiles/make_gcc_arm/*_bl/build/*_crc.{bin,hex} bootloaders
 
+    - name: Create Thingy:91 MCUBoot image
+      run: |
+        wget https://raw.githubusercontent.com/mcu-tools/mcuboot/v1.9.0/root-rsa-2048.pem
+        export VERSION=$(echo firmware_* | sed 's/firmware_//g' -)
+        imgtool sign --key root-rsa-2048.pem --header-size 0x200 --align 4 --version 0.0.0+0 --pad-header --slot-size 0x76000 projectfiles/make_gcc_arm/nrf52840_thingy91_if/build/nrf52840_thingy91_if.hex firmware_$VERSION/${VERSION}_nrf52840_thingy91_0x12000.hex
+
     - name: Upload test artifacts
       uses: actions/upload-artifact@v2
       with:

diff --git a/records/board/thingy91.yaml b/records/board/thingy91.yaml
@@ -1,6 +1,7 @@
 common:
     macros:
         - NRF_SECURE_BOOTLOADER
+        - NRF_SECURE_BOOTLOADER_OFFSET=0x12200
     sources:
         board:
             - source/board/thingy91.c
diff --git a/requirements.txt b/requirements.txt
@@ -13,3 +13,4 @@ pyelftools
 fuzzywuzzy
 jsonschema
 pyyaml>=6.0,<7.0
+imgtool==1.9.0
diff --git a/source/daplink/drag-n-drop/iap_flash_intf.c b/source/daplink/drag-n-drop/iap_flash_intf.c
@@ -30,6 +30,7 @@
 #include "crc.h"
 #include "info.h"
 
+#if !defined(NRF_SECURE_BOOTLOADER)
 // Application start must be aligned to page write
 COMPILER_ASSERT(DAPLINK_ROM_APP_START % DAPLINK_MIN_WRITE_SIZE == 0);
 // Application size must be a multiple of write size
@@ -42,6 +43,7 @@ COMPILER_ASSERT(DAPLINK_ROM_APP_START % DAPLINK_SECTOR_SIZE == 0);
 COMPILER_ASSERT(DAPLINK_ROM_UPDATE_START % DAPLINK_SECTOR_SIZE == 0);
 // Update size must be a multiple of sector size
 COMPILER_ASSERT(DAPLINK_ROM_UPDATE_SIZE % DAPLINK_SECTOR_SIZE == 0);
+#endif
 
 typedef enum {
     STATE_CLOSED,

diff --git a/source/hic_hal/nordic/nrf52840/daplink_addr.h b/source/hic_hal/nordic/nrf52840/daplink_addr.h
@@ -51,12 +51,12 @@
 
 #else // NRF_SECURE_BOOTLOADER
 
-#define DAPLINK_ROM_BL_SIZE             0x00013000 // 76 KiB MCUBOOT
-#define DAPLINK_ROM_IF_START            0x00013000
-#define DAPLINK_ROM_IF_SIZE             0x0002C000
+#define DAPLINK_ROM_BL_SIZE             NRF_SECURE_BOOTLOADER_OFFSET // MCUBOOT
+#define DAPLINK_ROM_IF_START            NRF_SECURE_BOOTLOADER_OFFSET
+#define DAPLINK_ROM_IF_SIZE             (0x00040000-NRF_SECURE_BOOTLOADER_OFFSET)
 
 #define NON_CONTIGUOUS_USER_CONFIG
-#define DAPLINK_ROM_CONFIG_USER_START   0x000F7000
+#define DAPLINK_ROM_CONFIG_USER_START   0x000FE000
 #define DAPLINK_ROM_CONFIG_USER_SIZE    0x00001000
 
 #endif

diff --git a/source/hic_hal/nordic/nrf52840/gcc/gcc_startup_nrf52840.S b/source/hic_hal/nordic/nrf52840/gcc/gcc_startup_nrf52840.S
@@ -197,6 +197,13 @@ Reset_Handler:
 .L_loop1_done:
 #endif
 
+#ifdef NRF_SECURE_BOOTLOADER
+    movs r3, #0
+    msr	CONTROL, r3
+    msr	PSP, r3
+    msr	PRIMASK, r3
+#endif
+
 /* This part of work usually is done in C library startup code. Otherwise,
  * define __STARTUP_CLEAR_BSS to enable it in this startup. This section
  * clears the RAM where BSS data is located.