NRF52840_DK support, update for latest Mbed and mcuboot

Author: multiplemonomials

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/mbed-ce/mbed-os.git
 [submodule "mcuboot"]
 	path = mcuboot
-	url = https://github.com/multiplemonomials/mcuboot.git
+	url = https://github.com/zhiyong-ft/mcuboot.git

CMakeLists.txt

@@ -3,16 +3,18 @@ cmake_policy(VERSION 3.19)
 
 set(MBED_APP_JSON_PATH mbed_app.json5)
 
-include(mbed-os/tools/cmake/app.cmake)
+include(mbed-os/tools/cmake/mbed_toolchain_setup.cmake)
+
+project(mbed-mcuboot-demo-app VERSION 1.0.0)
+
+include(mbed_project_setup)
 
 # Make sure that the build system generates both bin and hex files, regardless of
 # target settings.
 set(MBED_OUTPUT_EXT "" CACHE STRING "" FORCE)
 
 add_subdirectory(mbed-os)
 
-project(mbed-mcuboot-demo-app VERSION 1.0.0)
-
 # Compile mcuboot sources
 add_subdirectory(mcuboot/boot/bootutil)
 add_subdirectory(mcuboot/boot/mbed)
@@ -27,7 +29,7 @@ mcuboot_generate_update_image(SimpleApp)
 
 add_executable(UpdaterApp UpdaterApp.cpp secondary_bd.cpp)
 target_link_libraries(UpdaterApp
-	mbed-os
+	mbed-baremetal
 	mbed-storage
 	mbed-mcuboot)
 mbed_set_post_build(UpdaterApp)
@@ -39,6 +41,4 @@ mcuboot_generate_update_image(UpdaterApp)
 # here to the linker.
 # See here for more details on this: https://gareus.org/wiki/embedding_resources_in_executables
 target_link_options(UpdaterApp PRIVATE -Wl,-b,binary,SimpleApp-update-image.bin -Wl,-b,elf32-littlearm)
-add_dependencies(UpdaterApp SimpleApp) # Ensure SimpleApp gets built before UpdaterApp
-
-mbed_finalize_build()
+add_dependencies(UpdaterApp SimpleApp) # Ensure SimpleApp gets built before UpdaterApp

UpdaterApp.cpp

@@ -52,7 +52,7 @@ int main()
     tr_info("  - Max flash sectors per slot: %u", MCUBOOT_MAX_IMG_SECTORS);
     tr_info("- Scratch area: start address 0x%x, size %ukiB", MCUBOOT_SCRATCH_START_ADDR, MCUBOOT_SCRATCH_SIZE/1024);
     tr_info("- Secondary BD: size %" PRIu64 "kiB", secondary_bd->size()/1024);
-    tr_info("  - Program (block) size %" PRIu64 " bytes", secondary_bd->get_program_size());
+    tr_info("  - Program (page) size %" PRIu64 " bytes", secondary_bd->get_program_size());
     tr_info("  - Erase (sector) size %" PRIu64 " bytes", secondary_bd->get_erase_size());
     tr_info(" ");
 

mbed-os

@@ -26,22 +26,11 @@
             "target.c_lib": "small",
             "mcuboot.log-level": "MCUBOOT_LOG_LEVEL_DEBUG",
             "mbed-trace.enable": true,
+            "target.application-profile": "bare-metal"
 
             // Uncomment to enable encryption of the image
             // "mcuboot.encrypt-rsa": true
         },
-//         "NRF52840_DK": {
-//             "demo-button-active-low": true,
-//             "mbed_app_start": "0x21000",
-//             "target.mbed_app_size": "0xBE000",
-//             "mcuboot.primary-slot-address": "0x20000",
-//             "mcuboot.slot-size": "0xC0000",
-//             "mcuboot.scratch-address": "0xE0000",
-//             "mcuboot.scratch-size": "0x20000",
-//             "mcuboot.max-img-sectors": "0x180",
-//             "mcuboot.read-granularity": 4,
-//             "qspif.QSPI_MIN_PROG_SIZE": 4
-//         },
 //         "EP_AGORA": {
 //             "demo-button-active-low": true,
 //             "mbed_app_start": "0x21000",
@@ -120,26 +109,55 @@
         "MCU_STM32H743xI": {
             "target.memory_bank_config": {
                 "IROM1": {
-                    "start": 0x08021000, // mcuboot.primary-slot-address + mcuboot.header-size
-                    "size": 0xDF000 // mcuboot.slot-size - mcuboot.header-size
+                    "start": 0x08021000,
+                    // mcuboot.primary-slot-address + mcuboot.header-size
+                    "size": 0xDF000
+                    // mcuboot.slot-size - mcuboot.header-size
                 }
             },
-
             // Since STM32H743 boards have no external block device, keep everything in the MCU flash.
             "app.secondary-slot-in-flash": true,
             "app.secondary-slot-flash-start-addr": "0x08100000",
-
             // Slot size can be as big as 896k, since we need to reserve the first flash sector for the bootloader
             // and the last flash sector for scratch space
             "mcuboot.primary-slot-address": "0x08020000",
-            "mcuboot.max-img-sectors": "7", // 7 flash sectors per slot
+            "mcuboot.max-img-sectors": "7",
+            // 7 flash sectors per slot
             "mcuboot.slot-size": "0xE0000",
-            "mcuboot.flash-block-size": 32, // Flash program size is 32
+            "mcuboot.flash-block-size": 32,
+            // Flash program size is 32
 
             // STM32H7 flash sector size is 128k, so we need to make the scratch region at least that big
             "mcuboot.scratch-address": "0x081E0000",
-            "mcuboot.scratch-size": "0x20000"
+            "mcuboot.scratch-size": "0x20000",
+        },
+        
+        "NRF52840_DK": {
+            "target.features_remove": ["CRYPTOCELL310"],
+            "target.macros_remove": ["MBEDTLS_CONFIG_HW_SUPPORT"],
+
+            "target.memory_bank_config": {
+                "IROM1": {
+                    "start": 0x21000, // mcuboot.primary-slot-address + mcuboot.header-size
+                    "size": 0xBF000 // mcuboot.slot-size - mcuboot.header-size
+                }
+            },
+
+            // Primary slot starts right after the bootloader and takes up 768k of flash
+            "mcuboot.primary-slot-address": 0x20000,
+            "mcuboot.slot-size": 0xC0000,
+
+            // Scratch sector uses the last 128k of flash
+            "mcuboot.scratch-address": 0xE0000,
+            "mcuboot.scratch-size": 0x20000,
 
+            // Max flash sectors per slot. 768k/4k = 192
+            "mcuboot.max-img-sectors": 192,
+
+            // Flash is word addressable
+            "mcuboot.read-granularity": 4,
+
+            "demo-button-active-low": true
         }
     },
 }