Skip to content

Commit 1003366

Browse files
authored
v3.4.0 (#5)
* Add configuration file for a bootloader with default RoT and internal flash firmware storage for Nucleo_F429ZI and K64F * Application start address can be configured independently of application jump address to support cases where the vector table is not at the start of the firmware image. * Active Metadata Header is no longer required to be directly in front of the the active application. It's location can be independently configured. * Add configuration for new platforms: NRF52, NUCLEO_F411RE * Upgrade to mbed-os-5.9.4 * Downgrade to sd-driver-0.1.2 to reduce binary size * Use NVSTORE API shipped with Mbed-OS instead of SOTP API to retrieve the Root of Trust. * Clean up configuration * Guard sd block device instantiation so that when internal flash firmware storage is used, all sd-driver code can be linked out. * Clean up coding style to conform to [mbed-os coding style](https://os.mbed.com/docs/latest/reference/style.html). * Wrap ARM_UCP_FLASHIAP_BLOCKDEVICE so that it only contains the necessary read functions. This reduces binary size. * SOTP is being replaced with NVSTORE which is shipped in Mbed-OS. As NVSTORE is binary compatible with SOTP there is no breakage. The configuration of offsets are still be the same. * In order to keep bootloader size to a minimum, please use latest arm-none-eabi-gcc. Current version is tested with version 7.3.1 which produces binary size smaller than 32k for K64F, UBLOX_EVK_ODIN_W2 and NUCLEO_F429ZI.
1 parent d953689 commit 1003366

31 files changed

+595
-578
lines changed

.astyleignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
BUILD
2+
scripts

.astylerc

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Mbed OS code style definition file for astyle
2+
3+
# Don't create backup files, let git handle it
4+
suffix=none
5+
6+
# K&R style
7+
style=kr
8+
9+
# 1 TBS addition to k&r, add braces to one liners
10+
# Use -j as it was changed in astyle from brackets to braces, this way it is compatible with older astyle versions
11+
-j
12+
13+
# 4 spaces, convert tabs to spaces
14+
indent=spaces=4
15+
convert-tabs
16+
17+
# Indent switches and cases
18+
indent-switches
19+
20+
# Remove spaces in and around parentheses
21+
unpad-paren
22+
23+
# Insert a space after if, while, for, and around operators
24+
pad-header
25+
pad-oper
26+
27+
# Pointer/reference operators go next to the name (on the right)
28+
align-pointer=name
29+
align-reference=name
30+
31+
# Attach { for classes and namespaces
32+
attach-namespaces
33+
attach-classes
34+
35+
# Extend longer lines, define maximum 120 value. This results in aligned code,
36+
# otherwise the lines are broken and not consistent
37+
max-continuation-indent=120
38+
39+
40+
# Style formatting options for Update Client codebase.
41+
42+
# Each line no greater than 120 characters.
43+
--max-code-length=120
44+
45+
# Display only files that have been formatted.
46+
-Q
47+
48+
# Keep one-line blocks, especially for union initialization of error structs.
49+
--keep-one-line-blocks
50+
51+
# Indent pre-processor block
52+
# --indent-preproc-block
53+
54+
# Delete empty lines
55+
# --delete-empty-lines
56+
57+
# Attach the return type to a function definition or declaration.
58+
--attach-return-type # Definition
59+
--attach-return-type-decl # Declaration

.mbedignore

100644100755
+16-39
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,24 @@ mbed-os/features/FEATURE_COMMON_PAL/mbed-trace/test/*
1212
mbed-os/features/FEATURE_COMMON_PAL/nanostack-libservice/source/*
1313
mbed-os/features/FEATURE_COMMON_PAL/nanostack-libservice/test/*
1414
mbed-os/features/FEATURE_UVISOR/*
15+
mbed-os/features/unsupported/*
16+
mbed-os/features/cellular/*
17+
mbed-os/features/lorawan/*
1518
mbed-os/features/nanostack/*
1619
mbed-os/features/netsocket/*
1720
mbed-os/features/storage/*
1821
mbed-os/features/filesystem/littlefs/*
1922
mbed-os/features/filesystem/fat/*
20-
mbed-os/features/unsupported/*
23+
mbed-os/features/device_key/*
24+
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/onboard_modem_api.c
25+
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/onboard_modem_api.h
26+
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/min_battery_voltage.c
27+
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/min_battery_voltage.h
28+
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/ublox-odin-w2-drivers/default_wifi_interface.cpp
29+
mbed-os/features/frameworks/mbed-client-randlib/*
30+
mbed-os/features/frameworks/mbed-coap/*
31+
mbed-os/features/frameworks/mbed-trace/*
32+
mbed-os/features/frameworks/nanostack-libservice/*
2133
mbed-cloud-client/update-client-hub/source/*
2234
mbed-cloud-client/update-client-hub/modules/atomic-queue/*
2335
mbed-cloud-client/update-client-hub/modules/control-center/*
@@ -33,52 +45,17 @@ mbed-cloud-client/update-client-hub/modules/pal-filesystem/*
3345
mbed-cloud-client/update-client-hub/modules/pal-target-specific/*
3446
mbed-cloud-client/update-client-hub/modules/source-http/*
3547
mbed-cloud-client/update-client-hub/modules/source-manager/*
48+
mbed-cloud-client/update-client-hub/modules/resume-engine/*
3649
mbed-cloud-client/update-client-hub/modules/common/source/arm_uc_scheduler.c
37-
mbed-cloud-client/mbed-client-pal/Test/*
38-
mbed-cloud-client/mbed-client-pal/Utils/*
39-
mbed-cloud-client/mbed-client-pal/Examples/*
40-
mbed-cloud-client/mbed-client-pal/Source/PAL-Impl/pal_init.c
41-
mbed-cloud-client/mbed-client-pal/Source/PAL-Impl/Modules/Crypto/*
42-
mbed-cloud-client/mbed-client-pal/Source/PAL-Impl/Modules/Networking/*
43-
mbed-cloud-client/mbed-client-pal/Source/PAL-Impl/Modules/RTOS/*
44-
mbed-cloud-client/mbed-client-pal/Source/PAL-Impl/Modules/TLS/*
45-
mbed-cloud-client/mbed-client-pal/Source/PAL-Impl/Modules/Update/*
46-
mbed-cloud-client/mbed-client-pal/Source/PAL-Impl/Modules/Storage/FileSystem/*
47-
mbed-cloud-client/mbed-client-pal/Source/Port/Reference-Impl/Lib_Specific/*
48-
mbed-cloud-client/mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/FreeRTOS/*
49-
mbed-cloud-client/mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/Linux/*
50-
mbed-cloud-client/mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/mbedOS/Networking/*
51-
mbed-cloud-client/mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/mbedOS/RTOS/*
52-
mbed-cloud-client/mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/mbedOS/Update/*
53-
mbed-cloud-client/mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/mbedOS/Storage/FileSystem/*
50+
mbed-cloud-client/mbed-client-pal/*
5451
mbed-cloud-client/CMakeLists.txt
5552
mbed-cloud-client/DOXYGEN_FRONTPAGE.md
5653
mbed-cloud-client/Jenkinsfile
5754
mbed-cloud-client/LICENSE
5855
mbed-cloud-client/README.md
5956
mbed-cloud-client/contributions.md
6057
mbed-cloud-client/doxygen/*
61-
mbed-cloud-client/factory-configurator-client/CMakeLists.txt
62-
mbed-cloud-client/factory-configurator-client/DOXYGEN_FRONTPAGE.md
63-
mbed-cloud-client/factory-configurator-client/common_includes.cmake
64-
mbed-cloud-client/factory-configurator-client/crypto-service/*
65-
mbed-cloud-client/factory-configurator-client/factory-configurator-client/*
66-
mbed-cloud-client/factory-configurator-client/fcc-bundle-handler/*
67-
mbed-cloud-client/factory-configurator-client/fcc-output-info-handler/*
68-
mbed-cloud-client/factory-configurator-client/ftcd-comm-base/*
69-
mbed-cloud-client/factory-configurator-client/ftcd-comm-serial/*
70-
mbed-cloud-client/factory-configurator-client/ftcd-comm-socket/*
71-
mbed-cloud-client/factory-configurator-client/key-config-manager/*
72-
mbed-cloud-client/factory-configurator-client/logger/*
73-
mbed-cloud-client/factory-configurator-client/mbed-trace-helper/*
74-
mbed-cloud-client/factory-configurator-client/secsrv-cbor/*
75-
mbed-cloud-client/factory-configurator-client/storage/*
76-
mbed-cloud-client/factory-configurator-client/utils/*
77-
mbed-cloud-client/factory-configurator-client/mbed-client-esfs/Test/*
78-
mbed-cloud-client/factory-configurator-client/mbed-client-esfs/Tools/*
79-
mbed-cloud-client/factory-configurator-client/mbed-client-esfs/source/esfs.c
80-
mbed-cloud-client/factory-configurator-client/mbed-client-esfs/source/esfs_file_name.c
81-
mbed-cloud-client/factory-configurator-client/mbed-client-esfs/source/esfs_performance.c
58+
mbed-cloud-client/factory-configurator-client/*
8259
mbed-cloud-client/mbed-client/*
8360
mbed-cloud-client/mbed-client-randlib/*
8461
mbed-cloud-client/mbed-cloud-client/*

README.md

+38-14
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,51 @@ Generic bootloader to be used in conjunction with [mbed-cloud-client](https://gi
77
1. Install `mbed-cli` https://github.com/ARMmbed/mbed-cli
88
1. Run `mbed deploy` to pull in dependencies
99
1. Compile by running `mbed compile -t GCC_ARM -m (K64F|NUCLEO_F429ZI|UBLOX_EVK_ODIN_W2) --profile=tiny.json`
10-
1. Use this [script](https://github.com/ARMmbed/mbed-cloud-client-example/blob/master/tools/combine_bootloader_with_app.py) to combine the bootloader with application `python tools/combine_bootloader_with_app.py -a {application.bin} -b {bootloader.bin} --app-offset {firmware_metadata_header_address+firmware_metadata_header_size} --header-offset {firmware_metadata_header_address} -o {combined.bin}`.
10+
1. Use this [script](https://github.com/ARMmbed/mbed-cloud-client-example/blob/master/tools/combine_bootloader_with_app.py) to combine the bootloader with application `python tools/combine_bootloader_with_app.py -a {application.bin} -b {bootloader.bin} --app-offset {application-start-address} --header-offset {firmware_metadata_header_address} -o {combined.bin}`.
1111
1. Flash `{combined.bin}` to device by drag and drop.
1212

1313
## Metadata Header
1414

1515
The metadata header is the bootloader update interface. Each stage of the boot sequence leading up to and including the application (except the root bootloader) is paired with a metadata header (containing version, size, hash etc.). Information contained in the metadata header allows validation and ordering of available firmwares.
1616

17-
The firmware metadata header structure can be found [here](https://github.com/ARMmbed/mbed-cloud-client/blob/master/update-client-hub/modules/common/update-client-common/arm_uc_metadata_header_v2.h). There are two header formats, internal and external. The external header format is meant to be used when storing firmware on external storage which is assumed to be insecure. Hence the external header format contains extra security information prevent external tampering of the header data.
17+
The firmware metadata header structure can be found [here](https://github.com/ARMmbed/mbed-cloud-client/blob/master/update-client-hub/modules/common/update-client-common/arm_uc_metadata_header_v2.h). There are two header formats, internal and external. The external header format is used for storing firmware on external storage which is assumed to be insecure. Hence the external header format contains extra security information to prevent external tampering of the header data.
1818

1919
## Configurations
2020

21-
User **must** set in `mbed_app.json`:
21+
NOTE: All these configurations must be set the same in the mbed cloud client when compiling the corresponding application for successful update operation.
22+
23+
### Active Application and Header
24+
2225
1. `update-client.application-details`, Address at which the metadata header of the active firmware is written. **Must align to flash erase boundary**
23-
1. `application-start-address`, Address at which The application starts **Must align to vector table size boundary and flash write page boundary**. It is assumed the region between `update-client.application-details` and `application-start-address` contains only the header. MUST be the same as "target.mbed_app_start" in the application.
26+
1. `application-start-address`, Address at which the application starts **Must align to vector table size boundary and flash write page boundary**.
27+
1. `application-jump-address`, Optional address for the application's entry point (vector table) if this is different from `application-start-address`.
28+
29+
If the `application-start-address` is set less than one erase sector after the `update-client.application-details`, the two regions will be erased together. Otherwise the two regions will be erased separately in which case `application-start-address` must also align to **flash erase boundary**.
30+
31+
If `application-jump-address` is not set, the `application-start-address` will be used as the application's entry point. The entry point MUST be the same as "target.mbed_app_start" in the application.
32+
33+
### Firmware Candidate Storage
34+
35+
1. `MBED_CLOUD_CLIENT_UPDATE_STORAGE`, This need to be set in the "macros" section of `mbed_app.json`. Choices are ARM_UCP_FLASHIAP_BLOCKDEVICE and ARM_UCP_FLASHIAP. This determines whether the firmware is stored on a blockdevice or internal flash. If blockdevice is used `ARM_UC_USE_PAL_BLOCKDEVICE=1` must also be set.
2436
1. `update-client.storage-address`, The address in sd block device or internal flash where the firmware candidates are stored. **Must align to flash erase boundary**
2537
1. `update-client.storage-size`, total size on the block device or internal flash reserved for firmware storage. It will be rounded up to align with flash erase sector size automatically.
2638
1. `update-client.storage-locations`, The number of slots in the firmware storage.
2739
1. `update-client.storage-page`, The write page size of the underlying storage.
2840

29-
If you are using SOTP to provide the RoT, you must set the following:
30-
- "sotp-section-1-address", "sotp-section-1-size", "sotp-section-2-address", "sotp-section-2-size"
31-
The addresses **Must align to flash erase boundary**. The sizes must be full sector sized and at least 1k large.
41+
NOTE: See the [mbed cloud client documentation](https://cloud.mbed.com/docs/current/porting/update-k64f-port.html) for more information about storage options avaiable and porting to new platforms.
42+
43+
### Device Secret Key
44+
45+
The bootloader uses device secret key to authenticate anything that is stored on external storage. The update client must be able to obtain the same key as the bootlaoder. The key is derived from a device root of trust using the algorithm [here](https://github.com/ARMmbed/mbed-cloud-client/blob/master/update-client-hub/modules/common/source/arm_uc_crypto.c#L401).
3246

33-
All these configurations must be set the same in the mbed cloud client when compiling the corresponding application for successful update operation.
47+
You may choose to use NVSTORE to store the device RoT. During first boot mbed cloud client will generate a random number from an available entropy source and storge it in NVSTORE on internal flash. On subsequent boots, the RoT will be read from NVSTORE. To enable NVSTORE RoT, you must set the following:
48+
1. Macro `ARM_BOOTLOADER_USE_NVSTORE_ROT=1` to enable the RoT implementation [here](https://github.com/ARMmbed/mbed-bootloader/blob/master/source/nvstore_rot.cpp).
49+
1. "nvstore.area_1_address", "nvstore.area_1_size", "nvstore.area_2_address", "nvstore.area_2_size". The addresses **Must align to flash erase boundary**. The sizes must be full sector sized and at least 1k.
50+
1. NVSTORE and SOTP are binary compatible hence the bootloader works with any software that uses SOTP as long as the offsets are set the same.
51+
52+
Alternatively you can choose to use a custom device specific RoT by implementing the function `mbed_cloud_client_get_rot_128bit`. An example can be found [here](https://github.com/ARMmbed/mbed-bootloader-internal/blob/master/source/example_insecure_rot.c#L40).
53+
54+
### MISC
3455

3556
User **may** set in `mbed_app.json`:
3657
1. `MAX_COPY_RETRIES`, The number of retries after a failed copy attempt.
@@ -39,7 +60,9 @@ User **may** set in `mbed_app.json`:
3960
1. `SHOW_PROGRESS_BAR`, Set to 1 to print a progress bar for various processes.
4061

4162
## Flash Layout
63+
4264
### The flash layout for K64F with SOTP and firmware storage on internal flash
65+
4366
```
4467
+--------------------------+
4568
| LittleFS |
@@ -66,24 +89,25 @@ User **may** set in `mbed_app.json`:
6689
|Active App Metadata Header|
6790
| |
6891
+--------------------------+ <-+ update-client.application-details
69-
| SOTP_2 |
70-
+--------------------------+ <-+ sotp-section-2-address
71-
| SOTP_1 |
72-
+--------------------------+ <-+ sotp-section-1-address
92+
| NVSTORE_2 |
93+
+--------------------------+ <-+ nvstore.area_2_address
94+
| NVSTORE_1 |
95+
+--------------------------+ <-+ nvstore.area_1_address
7396
| |
7497
| Bootloader |
7598
| |
76-
| |
7799
+--------------------------+ <-+ 0
78100
```
79101

80102
### Notes on Flash Layout
103+
81104
- Internal Flash Only layout can be enabled by compiling the bootloader with the internal_flash_sotp.json configuration file `--app-config configs/internal_flash_sotp.json`. By default the firmware storage region and filesystem is on [external sd card](#external-storage).
82105
- The default flash layout is tested with GCC_ARM compiler and tiny.json compiler profile only. If a different compiler is used, the bootloader binary size will be larger and the offsets needs to be adjusted.
83-
- The SOTP regions require 1 flash erase sector each with at least 1k of space.
106+
- The NVSTORE regions require 1 flash erase sector each with at least 1k of space.
84107
- The LittleFS requires 2 flash sectors per folder and 1 sector per file as well as 2 sectors for the filesystem itself.
85108

86109
### Alignment
110+
87111
**Flash Erase Boundary**: Flash can usually only be erased in blocks of specific sizes, this is platform specific and hence many regions need to align to this boundary.
88112

89113
**Flash Page Boundary**: Flash can usually only be written in blocks of specific sizes, this is platform specific and hence many regions need to align to this boundary.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
{
22
"macros": [
3-
"MBEDTLS_USER_CONFIG_FILE=\"mbedtls_mbed_client_config.h\"",
3+
"MBEDTLS_USER_CONFIG_FILE=\"bootloader_mbedtls_user_config.h\"",
4+
"PAL_USER_DEFINED_CONFIGURATION=\"bootloader_pal_user_config.h\"",
45
"MAX_COPY_RETRIES=1",
56
"SHOW_PROGRESS_BAR=1",
67
"MAX_BOOT_RETRIES=3",
78
"ARM_UC_USE_PAL_CRYPTO=0",
8-
"Mutex=PlatformMutex",
9-
"PAL_USE_INTERNAL_FLASH=1",
10-
"PAL_THREAD_SAFETY=0",
11-
"ARM_UC_USE_SOTP=1",
12-
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP"
9+
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
10+
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP",
11+
"Mutex=PlatformMutex"
1312
],
1413
"config": {
1514
"application-start-address": {
@@ -19,26 +18,6 @@
1918
"max-application-size": {
2019
"help": "Maximum size of the active application",
2120
"value": null
22-
},
23-
"sotp-section-1-address": {
24-
"help": "Flash sector address for SOTP sector 1",
25-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_ADDRESS",
26-
"value": null
27-
},
28-
"sotp-section-1-size": {
29-
"help": "Flash sector size for SOTP sector 1",
30-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_SIZE",
31-
"value": null
32-
},
33-
"sotp-section-2-address": {
34-
"help": "Flash sector address for SOTP sector 2",
35-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_ADDRESS",
36-
"value": null
37-
},
38-
"sotp-section-2-size": {
39-
"help": "Flash sector size for SOTP sector 2",
40-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_SIZE",
41-
"value": null
4221
}
4322
},
4423
"target_overrides": {
@@ -50,17 +29,22 @@
5029
"update-client.firmware-header-version": "2"
5130
},
5231
"K64F": {
53-
"sotp-section-1-address" : "( 32*1024)",
54-
"sotp-section-1-size" : "( 4*1024)",
55-
"sotp-section-2-address" : "( 36*1024)",
56-
"sotp-section-2-size" : "( 4*1024)",
5732
"update-client.application-details": "( 40*1024)",
5833
"application-start-address" : "( 41*1024)",
5934
"max-application-size" : "(MBED_CONF_UPDATE_CLIENT_STORAGE_ADDRESS-MBED_CONF_APP_APPLICATION_START_ADDRESS)",
6035
"update-client.storage-address" : "(436*1024)",
6136
"update-client.storage-size" : "(388*1024)",
6237
"update-client.storage-locations" : 1,
6338
"update-client.storage-page" : 8
39+
},
40+
"NUCLEO_F429ZI": {
41+
"update-client.application-details": "(0x08000000+64*1024)",
42+
"application-start-address" : "(0x08000000+65*1024)",
43+
"max-application-size" : "(MBED_CONF_UPDATE_CLIENT_STORAGE_ADDRESS-MBED_CONF_APP_APPLICATION_START_ADDRESS)",
44+
"update-client.storage-address" : "(0x08000000+1024*1024)",
45+
"update-client.storage-size" : "(512*1024)",
46+
"update-client.storage-locations" : 1,
47+
"update-client.storage-page" : 1
6448
}
6549
}
6650
}

0 commit comments

Comments
 (0)