Skip to content

Commit e18ae77

Browse files
author
Seppo Takalo
committed
v4.0.3
1 parent 055c912 commit e18ae77

21 files changed

+381
-43
lines changed

‎.astyleignore

+5
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
.astyleignore
2+
.astylerc
3+
.git
14
BUILD
25
scripts
6+
mbed-os
7+

‎configs/block_device_fake_rot.json

-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
"mbed-bootloader.application-start-address": "(MBED_ROM_START+65*1024)"
9696
},
9797
"UBLOX_EVK_ODIN_W2": {
98-
"target.device_has_remove": ["EMAC"],
9998
"update-client.application-details" : "(MBED_ROM_START+64*1024)",
10099
"mbed-bootloader.application-start-address": "(MBED_ROM_START+65*1024)"
101100
},

‎configs/internal_flash_no_rot.json

100755100644
+2-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@
6868
"update-client.storage-address" : "(MBED_ROM_START + MBED_BOOTLOADER_FLASH_BANK_SIZE + KVSTORE_SIZE)",
6969
"update-client.storage-size" : "(MBED_BOOTLOADER_FLASH_BANK_SIZE - KVSTORE_SIZE)",
7070
"update-client.storage-locations" : 1,
71-
"target.extra_labels_remove" : [ "WICED", "CORDIO", "PSA", "MBED_SPM" ]
71+
"target.extra_labels_remove" : [ "WICED", "CORDIO", "PSA", "MBED_SPM" ],
72+
"target.device_has_remove" : [ "LPTICKER" ]
7273
},
7374
"K64F": {
7475
"kvstore-size": "2*24*1024",

‎configs/internal_kvstore_with_qspif.json

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{
2+
"config": {
3+
"documentation": {
4+
"options": [
5+
"The configuration for boards is:",
6+
"- Firmware storage is on an external QSPI Flash(QSPIF) block device",
7+
"- Internal KVStore only",
8+
"The flash regions are as follows:",
9+
"1. Bootloader - 32KiB from the beginning of flash",
10+
"2. KVSTORE - 2 flash sectors immediately following the bootloader",
11+
"3. Active App Metadata Header - (1KiB/2KiB) from the end of KVSTORE",
12+
"4. Active App - From end of header to the end of flash",
13+
"+--------------------------+",
14+
"| |",
15+
"| |",
16+
"| |",
17+
"| Active App |",
18+
"| |",
19+
"| |",
20+
"| |",
21+
"+--------------------------+ <-+ mbed-bootloader.application-start-address",
22+
"|Active App Metadata Header|",
23+
"+--------------------------+ <-+ update-client.application-details",
24+
"| |",
25+
"| KVSTORE |",
26+
"| |",
27+
"+--------------------------+ <-+ storage_tdb_internal.internal_base_address",
28+
"| |",
29+
"| Bootloader |",
30+
"| |",
31+
"+--------------------------+ <-+ 0",
32+
"Firmware Candidate Storage is on external QSPIF device at an offset of 0 MiB.",
33+
"The storage size is the size of the maximum application size (i.e. Active",
34+
"Application region size) multiplied by the number of storage-locations.",
35+
"(storage-locations is set to 1 in this configuration)",
36+
"+--------------------------+<-+ End of QSPIF block device",
37+
"| |",
38+
"+--------------------------+<-+ update-client.storage-size + update-client.storage-address",
39+
"| |",
40+
"+--------------------------+",
41+
"| |",
42+
"| Firmware Candidate 0 |",
43+
"| |",
44+
"+--------------------------+",
45+
"| Firmware Candidate 0 |",
46+
"| Metadata Header |",
47+
"+--------------------------+ <-+ Start of QSPIF block device (i.e. 0x0); update-client.storage-address"
48+
]
49+
}
50+
},
51+
"macros": [
52+
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
53+
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
54+
"MBED_BOOTLOADER_ACTIVE_HEADER_REGION_SIZE=1024"
55+
],
56+
"target_overrides": {
57+
"*": {
58+
"platform.use-mpu" : false,
59+
"platform.stdio-baud-rate" : 115200,
60+
"platform.stdio-flush-at-exit" : false,
61+
"update-client.firmware-header-version" : "2",
62+
"target.restrict_size" : "0x8000",
63+
"storage.storage_type" : "TDB_INTERNAL",
64+
"storage_tdb_internal.internal_base_address": "(MBED_ROM_START+MBED_BOOTLOADER_SIZE)",
65+
"storage_tdb_internal.internal_size" : "(2*8*1024)",
66+
"update-client.application-details" : "(MBED_ROM_START + MBED_BOOTLOADER_SIZE+MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_SIZE)",
67+
"mbed-bootloader.application-start-address" : "(MBED_CONF_UPDATE_CLIENT_APPLICATION_DETAILS + MBED_BOOTLOADER_ACTIVE_HEADER_REGION_SIZE)",
68+
"target.components_add" : ["QSPIF"],
69+
"update-client.storage-address" : "0",
70+
"update-client.storage-size" : "((MBED_ROM_START + MBED_ROM_SIZE - MBED_CONF_MBED_BOOTLOADER_APPLICATION_START_ADDRESS) * MBED_CONF_UPDATE_CLIENT_STORAGE_LOCATIONS)",
71+
"update-client.storage-locations" : 1,
72+
"target.device_has_remove" : [ "LPTICKER" ]
73+
},
74+
"DISCO_L475VG_IOT01A": {
75+
"target.restrict_size" : "0x9800",
76+
"mbed-bootloader.bootloader-size": "(38*1024)"
77+
}
78+
}
79+
}

‎configs/internal_kvstore_with_spif.json

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
{
2+
"config": {
3+
"documentation": {
4+
"options": [
5+
"The configuration for boards is:",
6+
"- Firmware storage is on an external SPI Flash(SPIF) block device",
7+
"- Internal KVStore only",
8+
"The flash regions are as follows:",
9+
"1. Bootloader - 32KiB from the beginning of flash",
10+
"2. KVSTORE - 2 flash sectors immediately following the bootloader",
11+
"3. Active App Metadata Header - (1KiB/2KiB) from the end of KVSTORE",
12+
"4. Active App - From end of header to the end of flash",
13+
"+--------------------------+",
14+
"| |",
15+
"| |",
16+
"| |",
17+
"| Active App |",
18+
"| |",
19+
"| |",
20+
"| |",
21+
"+--------------------------+ <-+ mbed-bootloader.application-start-address",
22+
"|Active App Metadata Header|",
23+
"+--------------------------+ <-+ update-client.application-details",
24+
"| |",
25+
"| KVSTORE |",
26+
"| |",
27+
"+--------------------------+ <-+ storage_tdb_internal.internal_base_address",
28+
"| |",
29+
"| Bootloader |",
30+
"| |",
31+
"+--------------------------+ <-+ 0",
32+
"Firmware Candidate Storage is on external SPIF device at an offset of 0 MiB.",
33+
"The storage size is the size of the maximum application size (i.e. Active",
34+
"Application region size) multiplied by the number of storage-locations.",
35+
"(storage-locations is set to 1 in this configuration)",
36+
"+--------------------------+<-+ End of SPIF block device",
37+
"| |",
38+
"+--------------------------+<-+ update-client.storage-size + update-client.storage-address",
39+
"| |",
40+
"+--------------------------+",
41+
"| |",
42+
"| Firmware Candidate 0 |",
43+
"| |",
44+
"+--------------------------+",
45+
"| Firmware Candidate 0 |",
46+
"| Metadata Header |",
47+
"+--------------------------+ <-+ Start of SPIF block device (i.e. 0x0); update-client.storage-address"
48+
]
49+
}
50+
},
51+
"macros": [
52+
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
53+
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
54+
"MBED_BOOTLOADER_ACTIVE_HEADER_REGION_SIZE=1024"
55+
],
56+
"target_overrides": {
57+
"*": {
58+
"platform.use-mpu" : false,
59+
"platform.stdio-baud-rate" : 115200,
60+
"platform.stdio-flush-at-exit" : false,
61+
"update-client.firmware-header-version" : "2",
62+
"target.restrict_size" : "0x8000",
63+
"storage.storage_type" : "TDB_INTERNAL",
64+
"storage_tdb_internal.internal_base_address": "(MBED_ROM_START+MBED_BOOTLOADER_SIZE)",
65+
"storage_tdb_internal.internal_size" : "(16*1024)",
66+
"update-client.application-details" : "(MBED_ROM_START + MBED_BOOTLOADER_SIZE+MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_SIZE)",
67+
"mbed-bootloader.application-start-address" : "(MBED_CONF_UPDATE_CLIENT_APPLICATION_DETAILS + MBED_BOOTLOADER_ACTIVE_HEADER_REGION_SIZE)",
68+
"target.components_add" : ["SPIF"],
69+
"update-client.storage-address" : "0",
70+
"update-client.storage-size" : "((MBED_ROM_START + MBED_ROM_SIZE - MBED_CONF_MBED_BOOTLOADER_APPLICATION_START_ADDRESS) * MBED_CONF_UPDATE_CLIENT_STORAGE_LOCATIONS)",
71+
"update-client.storage-locations" : 1,
72+
"target.device_has_remove" : [ "LPTICKER" ]
73+
},
74+
"NUCLEO_F303RE": {
75+
"target.restrict_size" : "0x9000",
76+
"mbed-bootloader.bootloader-size": "(36*1024)",
77+
"spif-driver.SPI_MOSI" : "PC_12",
78+
"spif-driver.SPI_MISO" : "PC_11",
79+
"spif-driver.SPI_CLK" : "PC_10",
80+
"spif-driver.SPI_CS" : "PA_15",
81+
"update-client.storage-page" : 2
82+
}
83+
}
84+
}

‎configs/spif_kvstore.json

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
{
2+
"config": {
3+
"documentation": {
4+
"options": [
5+
"Usage:",
6+
"- mbed compile -t <TOOLCHAIN> -m <TARGET> --profile=tiny.json --app-config configs/spif_kvstore.json",
7+
"In this configuration:",
8+
"- Firmware storage is on a SPIF block device",
9+
"- Root of Trust is obtain from internal flash in kvstore",
10+
"The flash regions are as follows:",
11+
"1. Bootloader - from the beginning of flash",
12+
"2. KVSTORE - immediately following the bootloader",
13+
"3. Active App Metadata Header - from the end of KVSTORE",
14+
"4. Active App - from end of Header to the end of internal flash",
15+
"+--------------------------+",
16+
"| |",
17+
"| |",
18+
"| |",
19+
"| Active App |",
20+
"| |",
21+
"| |",
22+
"| |",
23+
"+--------------------------+ <-+ mbed-bootloader.application-start-address",
24+
"|Active App Metadata Header|",
25+
"+--------------------------+ <-+ update-client.application-details",
26+
"| |",
27+
"| KVSTORE INTERNAL |",
28+
"| |",
29+
"+--------------------------+ <-+ storage_tdb_internal.internal_base_address",
30+
"| |",
31+
"| Bootloader |",
32+
"| |",
33+
"+--------------------------+ <-+ 0",
34+
35+
"4. KVStore external part is on SPIF at an offset of 0 MiB.",
36+
"5. Firmware Candidate Storage is on SPIF at an offset of 1 MiB.",
37+
"+--------------------------+ <-+ update-client.storage-size * update-client.storage-locations",
38+
"| |",
39+
"| UPDATE STORAGE |",
40+
"| |",
41+
"+--------------------------+ <-+ update-client.storage-address",
42+
"| |",
43+
"| KVSTORE EXTERNAL |",
44+
"| |",
45+
"+--------------------------+ <-+ 0",
46+
"The storage size is the size of the maximum application size (i.e. Active",
47+
"Application region size) multiplied by the number of storage-locations.",
48+
"(storage-locations is set to 1 in this configuration)"
49+
]
50+
}
51+
},
52+
"macros": [
53+
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
54+
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
55+
"MBED_BOOTLOADER_ACTIVE_HEADER_REGION_SIZE=1024"
56+
],
57+
"target_overrides": {
58+
"*": {
59+
"platform.use-mpu" : false,
60+
"platform.stdio-baud-rate" : 115200,
61+
"platform.stdio-flush-at-exit" : false,
62+
63+
"target.components_add" : ["SPIF"],
64+
"storage.storage_type" : "FILESYSTEM",
65+
"storage_filesystem.filesystem" : "LITTLE",
66+
"storage_filesystem.blockdevice" : "SPIF",
67+
68+
"storage_filesystem.internal_base_address" : "(MBED_ROM_START + 0xa000)",
69+
"storage_filesystem.rbp_internal_size" : "(2*4*1024)",
70+
"update-client.application-details" : "(MBED_CONF_STORAGE_FILESYSTEM_INTERNAL_BASE_ADDRESS + MBED_CONF_STORAGE_FILESYSTEM_RBP_INTERNAL_SIZE)",
71+
"mbed-bootloader.application-start-address": "(MBED_CONF_UPDATE_CLIENT_APPLICATION_DETAILS + MBED_BOOTLOADER_ACTIVE_HEADER_REGION_SIZE)",
72+
73+
"storage_filesystem.external_base_address" : "(0*1024*1024)",
74+
"storage_filesystem.external_size" : "(1*1024*1024)",
75+
"update-client.storage-address" : "(MBED_CONF_STORAGE_FILESYSTEM_EXTERNAL_BASE_ADDRESS + MBED_CONF_STORAGE_FILESYSTEM_EXTERNAL_SIZE)",
76+
"update-client.storage-locations" : 1,
77+
"update-client.storage-size" : "((MBED_ROM_START + MBED_ROM_SIZE - MBED_CONF_MBED_BOOTLOADER_APPLICATION_START_ADDRESS) * MBED_CONF_UPDATE_CLIENT_STORAGE_LOCATIONS)",
78+
"update-client.firmware-header-version" : "2"
79+
}
80+
}
81+
}

‎configs/test_configs/header_separate_after_app.json

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"macros": [
3+
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
4+
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE"
5+
],
6+
"target_overrides": {
7+
"*": {
8+
"platform.stdio-baud-rate" : 115200,
9+
"platform.stdio-flush-at-exit": false,
10+
"update-client.storage-address" : "(1024*1024*64)",
11+
"update-client.storage-size" : "((MBED_ROM_START + MBED_ROM_SIZE - MBED_CONF_MBED_BOOTLOADER_APPLICATION_START_ADDRESS) * MBED_CONF_UPDATE_CLIENT_STORAGE_LOCATIONS)",
12+
"update-client.storage-locations": 1,
13+
"update-client.firmware-header-version": "2",
14+
"sd.CRC_ENABLED": 0,
15+
"mbed-bootloader.use-kvstore-rot": 0,
16+
"target.extra_labels_remove": [ "WICED", "CORDIO", "PSA", "MBED_SPM" ]
17+
},
18+
"K64F": {
19+
"update-client.application-details" : "(MBED_ROM_START+1020*1024)",
20+
"mbed-bootloader.application-start-address": "(MBED_ROM_START+40*1024)"
21+
}
22+
}
23+
}

‎configs/test_configs/header_separate_before_app.json

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"macros": [
3+
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
4+
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE"
5+
],
6+
"target_overrides": {
7+
"*": {
8+
"platform.stdio-baud-rate" : 115200,
9+
"platform.stdio-flush-at-exit": false,
10+
"update-client.storage-address" : "(1024*1024*64)",
11+
"update-client.storage-size" : "((MBED_ROM_START + MBED_ROM_SIZE - MBED_CONF_MBED_BOOTLOADER_APPLICATION_START_ADDRESS) * MBED_CONF_UPDATE_CLIENT_STORAGE_LOCATIONS)",
12+
"update-client.storage-locations": 1,
13+
"update-client.firmware-header-version": "2",
14+
"sd.CRC_ENABLED": 0,
15+
"mbed-bootloader.use-kvstore-rot": 0,
16+
"target.extra_labels_remove": [ "WICED", "CORDIO", "PSA", "MBED_SPM" ]
17+
},
18+
"K64F": {
19+
"update-client.application-details" : "(MBED_ROM_START+32*1024)",
20+
"mbed-bootloader.application-start-address": "(MBED_ROM_START+40*1024)"
21+
}
22+
}
23+
}

‎configs/test_configs/power_cut_test.json

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"macros": [
3+
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
4+
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
5+
"BOOTLOADER_POWER_CUT_TEST=1"
6+
],
7+
"target_overrides": {
8+
"*": {
9+
"platform.stdio-baud-rate": 9600,
10+
"platform.stdio-flush-at-exit": false,
11+
"update-client.storage-address": "1024*1024*64",
12+
"update-client.storage-size": "1024*1024",
13+
"update-client.storage-locations": 1,
14+
"update-client.firmware-header-version": "2",
15+
"sd.CRC_ENABLED": 0,
16+
"mbed-bootloader.use-kvstore-rot": 0,
17+
"target.extra_labels_remove": [ "WICED", "CORDIO", "PSA", "MBED_SPM" ]
18+
},
19+
"K64F": {
20+
"update-client.application-details" : "128*1024",
21+
"mbed-bootloader.application-start-address": "129*1024"
22+
}
23+
}
24+
}

‎mbed-os.lib

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-os/#0f959dbe4749c20416236e4fe1dac5692cbe18ab
1+
https://github.com/ARMmbed/mbed-os/#7482462434d5cf718177653ef797547a976a7c5e

0 commit comments

Comments
 (0)