Merge pull request #35 from PelionIoT/release-4.10.0

factory-configurator-client-example 4.10.0
PelionIoT · Jul 8, 2021 · 57bf4f4 · 57bf4f4
2 parents c2213c5 + 18970bb
commit 57bf4f4
Show file tree

Hide file tree

Showing 25 changed files with 257 additions and 177 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,15 @@
 # Changelog for Factory Configurator Client example application
 
-## Release 4.9.0
+## Release 4.10.0 (30.06.2021)
+
+* Updated to Mbed OS 6.12.0.
+
+## Release 4.9.0 (21.05.2021)
 
 * Updated to Mbed OS 6.9.0.
 * [LINUX] Updated Mbed TLS to 2.25.0.
 
-
-## Release 4.8.0 (XX.04.2021)
+## Release 4.8.0 (24.03.2021)
 
 * Updated to Mbed OS 6.8.0.
 * Updated cURL to 7.75.0 in `pal-platform`.

diff --git a/mbed-cloud-client.lib b/mbed-cloud-client.lib
@@ -1 +1 @@
-https://github.com/PelionIoT/mbed-cloud-client/#7e45d92cf759d62c2d881bd7be318c807d8a47c2
+https://github.com/PelionIoT/mbed-cloud-client/#d7edc529ed3722c811ff401440ef58ea980bf543
diff --git a/mbed-os.lib b/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#c73413893fb98aaaeda74513c981ac68adc8645d
+https://github.com/ARMmbed/mbed-os/#cecc47b4a53951527dd3f670465c8566396ad101
diff --git a/pal-platform/Toolchain/GCC/GCC-flags.cmake b/pal-platform/Toolchain/GCC/GCC-flags.cmake
@@ -60,6 +60,8 @@ endif ()
 # Board specific
 
 SET_COMPILER_DBG_RLZ_FLAG (CMAKE_C_FLAGS "-Wall")
+SET_COMPILER_DBG_RLZ_FLAG (CMAKE_CXX_FLAGS "-Wall")
+
 # Board specific
 if (${CPU} MATCHES "x86_64")
     SET_COMPILER_DBG_RLZ_FLAG (CMAKE_C_FLAGS "-m32")
@@ -79,6 +81,7 @@ SET_COMPILER_DBG_RLZ_FLAG (CMAKE_C_FLAGS "-fdata-sections")
 SET_COMPILER_DBG_RLZ_FLAG (CMAKE_C_FLAGS "-ffreestanding")
 SET_COMPILER_DBG_RLZ_FLAG (CMAKE_C_FLAGS "-fno-builtin")
 SET_COMPILER_DBG_RLZ_FLAG (CMAKE_C_FLAGS "-std=gnu99")
+SET_COMPILER_DBG_RLZ_FLAG (CMAKE_CXX_FLAGS "-std=gnu++03")
 
 
 ########### Release specific ###########

diff --git a/...NTERNAL_FLASH/mbed-bootloader-6121dde.bin → ...NTERNAL_FLASH/mbed-bootloader-95fa885.bin b/...NTERNAL_FLASH/mbed-bootloader-6121dde.bin → ...NTERNAL_FLASH/mbed-bootloader-95fa885.bin
diff --git a/prebuilt-bl/TARGET_DISCO_F769NI/TARGET_BL_INTERNAL_FLASH/mbed_lib.json b/prebuilt-bl/TARGET_DISCO_F769NI/TARGET_BL_INTERNAL_FLASH/mbed_lib.json
@@ -12,7 +12,7 @@
                 "MBED_CLOUD_CLIENT_FOTA_STORAGE_SIZE=(MBED_BOOTLOADER_FLASH_BANK_SIZE - MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_SIZE)"
 
             ],
-            "target.bootloader_img": "mbed-bootloader-6121dde.bin",
+            "target.bootloader_img": "mbed-bootloader-95fa885.bin",
             "target.header_offset" : "0x8000",
             "target.app_offset"    : "0x8200",
             "target.restrict_size" : "0xF7E00",

diff --git a/...NTERNAL_FLASH/mbed-bootloader-6121dde.bin → ...NTERNAL_FLASH/mbed-bootloader-95fa885.bin b/...NTERNAL_FLASH/mbed-bootloader-6121dde.bin → ...NTERNAL_FLASH/mbed-bootloader-95fa885.bin
diff --git a/prebuilt-bl/TARGET_DISCO_L475VG_IOT01A/TARGET_BL_INTERNAL_FLASH/mbed_lib.json b/prebuilt-bl/TARGET_DISCO_L475VG_IOT01A/TARGET_BL_INTERNAL_FLASH/mbed_lib.json
@@ -12,7 +12,7 @@
                 "MBED_CLOUD_CLIENT_FOTA_STORAGE_SIZE=(MBED_BOOTLOADER_FLASH_BANK_SIZE - MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_SIZE)"
 
             ],
-            "target.bootloader_img": "mbed-bootloader-6121dde.bin",
+            "target.bootloader_img": "mbed-bootloader-95fa885.bin",
             "target.header_offset" : "0x8000",
             "target.app_offset"    : "0x8200",
             "target.restrict_size" : "0x77E00",

diff --git a/...RGET_BL_QSPIF/mbed-bootloader-6121dde.bin → ...RGET_BL_QSPIF/mbed-bootloader-95fa885.bin b/...RGET_BL_QSPIF/mbed-bootloader-6121dde.bin → ...RGET_BL_QSPIF/mbed-bootloader-95fa885.bin
diff --git a/prebuilt-bl/TARGET_DISCO_L475VG_IOT01A/TARGET_BL_QSPIF/mbed_lib.json b/prebuilt-bl/TARGET_DISCO_L475VG_IOT01A/TARGET_BL_QSPIF/mbed_lib.json
@@ -11,7 +11,7 @@
                 "MBED_CLOUD_CLIENT_FOTA_STORAGE_SIZE=(((MBED_ROM_START + MBED_ROM_SIZE - APPLICATION_ADDR)/0x1000)*0x1000)"
 
             ],
-            "target.bootloader_img": "mbed-bootloader-6121dde.bin",
+            "target.bootloader_img": "mbed-bootloader-95fa885.bin",
             "target.header_offset" : "0x11800",
             "target.app_offset"    : "0x11A00",
             "target.header_format": [

diff --git a/...NTERNAL_FLASH/mbed-bootloader-6121dde.bin → ...NTERNAL_FLASH/mbed-bootloader-95fa885.bin b/...NTERNAL_FLASH/mbed-bootloader-6121dde.bin → ...NTERNAL_FLASH/mbed-bootloader-95fa885.bin
diff --git a/prebuilt-bl/TARGET_K64F/TARGET_BL_INTERNAL_FLASH/mbed_lib.json b/prebuilt-bl/TARGET_K64F/TARGET_BL_INTERNAL_FLASH/mbed_lib.json
@@ -12,7 +12,7 @@
                 "MBED_CLOUD_CLIENT_FOTA_STORAGE_SIZE=(MBED_BOOTLOADER_FLASH_BANK_SIZE - MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_SIZE)"
 
             ],
-            "target.bootloader_img": "mbed-bootloader-6121dde.bin",
+            "target.bootloader_img": "mbed-bootloader-95fa885.bin",
             "target.header_offset" : "0x8000",
             "target.app_offset"    : "0x8200",
             "target.restrict_size" : "0x77E00",

diff --git a/.../TARGET_BL_SD/mbed-bootloader-6121dde.bin → .../TARGET_BL_SD/mbed-bootloader-95fa885.bin b/.../TARGET_BL_SD/mbed-bootloader-6121dde.bin → .../TARGET_BL_SD/mbed-bootloader-95fa885.bin
diff --git a/prebuilt-bl/TARGET_K64F/TARGET_BL_SD/mbed_lib.json b/prebuilt-bl/TARGET_K64F/TARGET_BL_SD/mbed_lib.json
@@ -16,7 +16,7 @@
                 "MBED_CLOUD_CLIENT_FOTA_STORAGE_START_ADDR=(1024*1024*64)",
                 "MBED_CLOUD_CLIENT_FOTA_STORAGE_SIZE= (MBED_ROM_START + MBED_ROM_SIZE - APPLICATION_ADDR)"
             ],
-            "target.bootloader_img": "mbed-bootloader-6121dde.bin",
+            "target.bootloader_img": "mbed-bootloader-95fa885.bin",
             "target.header_offset" : "0xa000",
             "target.app_offset"    : "0xa200",
             "target.header_format": [

diff --git a/...NTERNAL_FLASH/mbed-bootloader-6121dde.bin → ...NTERNAL_FLASH/mbed-bootloader-95fa885.bin b/...NTERNAL_FLASH/mbed-bootloader-6121dde.bin → ...NTERNAL_FLASH/mbed-bootloader-95fa885.bin
diff --git a/prebuilt-bl/TARGET_K66F/TARGET_BL_INTERNAL_FLASH/mbed_lib.json b/prebuilt-bl/TARGET_K66F/TARGET_BL_INTERNAL_FLASH/mbed_lib.json
@@ -12,7 +12,7 @@
                 "MBED_CLOUD_CLIENT_FOTA_STORAGE_SIZE=(MBED_BOOTLOADER_FLASH_BANK_SIZE - MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_SIZE)"
 
             ],
-            "target.bootloader_img": "mbed-bootloader-6121dde.bin",
+            "target.bootloader_img": "mbed-bootloader-95fa885.bin",
             "target.header_offset" : "0x8000",
             "target.app_offset"    : "0x8200",
             "target.restrict_size" : "0xF7C00",

diff --git a/prebuilt-bl/TARGET_MIMXRT1050_EVK/TARGET_BL_INTERNAL_FLASH/mbed-bootloader-95fa885.bin b/prebuilt-bl/TARGET_MIMXRT1050_EVK/TARGET_BL_INTERNAL_FLASH/mbed-bootloader-95fa885.bin
diff --git a/prebuilt-bl/TARGET_MIMXRT1050_EVK/TARGET_BL_INTERNAL_FLASH/mbed_lib.json b/prebuilt-bl/TARGET_MIMXRT1050_EVK/TARGET_BL_INTERNAL_FLASH/mbed_lib.json
@@ -0,0 +1,28 @@
+{
+    "name": "mbed-bootloader-MIMXRT1050_EVK-TARGET_BL_INTERNAL_FLASH",
+    "target_overrides": {
+        "*": {
+            "target.macros_add": [
+                "MBED_CONF_STORAGE_STORAGE_TYPE=TDB_INTERNAL",
+                "MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_BASE_ADDRESS=(MBED_ROM_START + 64*1024 + 1984*2*1024 + 64*1024)",
+                "MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_SIZE=(2*128*1024)",
+                "MBED_CLOUD_CLIENT_FOTA_BLOCK_DEVICE_TYPE=FOTA_INTERNAL_FLASH_MBED_OS_BD",
+                "MBED_CLOUD_CLIENT_FOTA_STORAGE_START_ADDR=(MBED_ROM_START + 64*1024 + 1984*1024)",
+                "MBED_CLOUD_CLIENT_FOTA_STORAGE_SIZE=(1984*1024)"
+
+            ],
+            "target.bootloader_img": "mbed-bootloader-95fa885.bin",
+            "target.header_offset" : "64*1024",
+            "target.app_offset"    : "64*1024+512",
+            "target.restrict_size" : "0x1EFC00",
+            "target.header_format": [
+                ["magic", "const", "32le", "0x5c0253a3"],
+                ["firmwareSize", "size", "32le", ["application"]],
+                ["firmwareVersion", "const", "64le", "0x0"],
+                ["firmwareDigest", "digest", "SHA256", "application"],
+                ["precursorDigest", "digest", "SHA256", "application"]
+            ]
+        }
+    }
+}
+