Use MCUboot with changes from Mbed OS team (AGlass0fMilk#5)

* Update Mbed OS to mbed-os-6.4.0 release

* Clean up unused files

* Remove SerialOTA which should be in the user app

* Temporary: use LDong-Arm's fork of MCUboot

* Use MCUBOOT_SLOT_SIZE as secondary block device size

* Update configurations

* Reduce read/write granularity for ST DISCO target

Co-authored-by: Lingkai Dong <[email protected]>

Co-authored-by: George Beckstein <[email protected]>

Author: LDong-Arm

SerialOTA.cpp

@@ -76,10 +76,9 @@ BlockDevice *BlockDevice::get_default_instance()
  */
 mbed::BlockDevice* get_secondary_bd(void) {
     // In this case, our flash is much larger than a single image so
-    // slice it into a smaller size, 1MB at the beginning
-
+    // slice it into the size of an image slot
     mbed::BlockDevice* default_bd = mbed::BlockDevice::get_default_instance();
-    static mbed::SlicingBlockDevice sliced_bd(default_bd, 0x0, 0xDD000);
+    static mbed::SlicingBlockDevice sliced_bd(default_bd, 0x0, MCUBOOT_SLOT_SIZE);
     return &sliced_bd;
 }
 

SerialOTA.h

@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#7482462434d5cf718177653ef797547a976a7c5e
+https://github.com/ARMmbed/mbed-os/#8ef0a435b2356f8159dea8e427b2935d177309f8

convert_keys.py

@@ -1,5 +1,5 @@
 {
-    "requires": ["bare-metal", "mbedtls", "mcuboot", "flashiap-block-device", "spif-driver", "qspif", "mbed-trace", "serialcobs"],
+    "requires": ["bare-metal", "mbedtls", "mcuboot", "flashiap-block-device", "spif-driver", "qspif", "mbed-trace"],
     "config": {
         "serial-bootloader-enable": {
             "help": "Build bootloader with serial update support",
@@ -9,25 +9,41 @@
     "target_overrides": {
         "*": {
             "target.restrict_size": "0x20000",
-            "target.c_lib": "small"
+            "target.c_lib": "small",
+            "mcuboot.log-level": "MCUBOOT_LOG_LEVEL_DEBUG",
+            "mbed-trace.enable": true,
+            "mbed-trace.fea-ipv6": false
         },
-	"NRF52840_DK": {
-            "target.device_has_remove": ["ITM"],
-            "target.features_add": ["STORAGE"],
-	    "target.features_remove": ["CRYPTOCELL310"],
-	    "target.macros_remove": ["MBEDTLS_CONFIG_HW_SUPPORT"],
-            "target.components_add": ["QSPIF", "FLASHIAP"],
-            "mcuboot.max-img-sectors": 256,
+        "NRF52840_DK": {
+            "target.features_remove": ["CRYPTOCELL310"],
+            "target.macros_remove": ["MBEDTLS_CONFIG_HW_SUPPORT"],
+            "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": {
-            "target.device_has_remove": ["ITM"],
-            "target.features_add": ["STORAGE"],
             "target.features_remove": ["CRYPTOCELL310"],
             "target.macros_remove": ["MBEDTLS_CONFIG_HW_SUPPORT"],
-            "target.components_remove": ["QSPIF"],
-            "target.components_add": ["SPIF", "FLASHIAP"],
-            "mcuboot.max-img-sectors": 256
+            "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
+        },
+        "DISCO_L475VG_IOT01A": {
+            "mcuboot.primary-slot-address": "0x8020000",
+            "mcuboot.slot-size": "0xC0000",
+            "mcuboot.scratch-address": "0x80E0000",
+            "mcuboot.scratch-size": "0x20000",
+            "mcuboot.max-img-sectors": "0x180",
+            "mcuboot.read-granularity": 1,
+            "qspif.QSPI_MIN_PROG_SIZE": 1
         }
     }
 }

default_bd.cpp

@@ -1 +1 @@
-https://github.com/AGlass0fMilk/mcuboot/#aff9bd34ceb8e4fb1f0697045e2f09764e738844
+https://github.com/LDong-Arm/mcuboot.git/#03b472cb1800196a69e4878b5cdd7b529320d7d6