Update mbed-os and mcuboot, add NUCLEO_L452RE_P support

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,23 +3,27 @@ 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)
 
 # 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
+		LANGUAGES C CXX ASM
+		VERSION 1.0.0)
+
+include(mbed_project_setup)
 
-project(mbed-mcuboot-demo-app VERSION 1.0.0)
+add_subdirectory(mbed-os)
 
 # Compile mcuboot sources
 add_subdirectory(mcuboot/boot/bootutil)
 add_subdirectory(mcuboot/boot/mbed)
 
 add_executable(SimpleApp SimpleApp.cpp secondary_bd.cpp)
 target_link_libraries(SimpleApp
-	mbed-baremetal
+	mbed-os
 	mbed-storage
 	mbed-mcuboot)
 mbed_set_post_build(SimpleApp)
@@ -40,5 +44,3 @@ mcuboot_generate_update_image(UpdaterApp)
 # 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()

mbed-os

@@ -24,6 +24,7 @@
         "*": {
             "mcuboot.bootloader-build": 0,
             "target.c_lib": "small",
+            "target.application-profile": "full",
             "mcuboot.log-level": "MCUBOOT_LOG_LEVEL_DEBUG",
             "mbed-trace.enable": true,
 
@@ -140,6 +141,33 @@
             "mcuboot.scratch-address": "0x081E0000",
             "mcuboot.scratch-size": "0x20000"
 
+        },
+
+        "NUCLEO_L452RE_P": {
+            // Configure bootloader to live in the first 128k of flash
+            "target.memory_bank_config": {
+                "IROM1": {
+                    "start": 0x08021000, // mcuboot.primary-slot-address + mcuboot.header-size
+                    "size": 0x2E000 // mcuboot.slot-size - mcuboot.header-size
+                }
+            },
+
+            // Sector size is 2k, make the scratch region use the last 8k of flash so it uses 4 sectors
+            "mcuboot.scratch-address": 0x0807E000,
+            "mcuboot.scratch-size": 0x2000,
+
+            // Primary and secondary slot need to fit in the remaining 376k of flash (512k total - 128k - 8k)
+            "mcuboot.slot-size": 0x2F000, // 188kiB
+
+            // Primary slot starts right after the bootloader
+            "mcuboot.primary-slot-address": 0x08020000,
+
+            "mcuboot.max-img-sectors": 94, // 94 flash sectors per slot
+            "mcuboot.flash-block-size": 8, // Flash program size is 8
+
+            // Since STM32 nucleo boards have no external block device, keep everything in the MCU flash.
+            "app.secondary-slot-in-flash": true,
+            "app.secondary-slot-flash-start-addr": 0x0804F000 // primary-slot-address + slot-size
         }
     },
 }