Skip to content

Commit e2f4e60

Browse files
LiyouZhouLiyouZhou
authored
Feature/nvstore (ARMmbed#121)
FEATURE IOTUC-460: Use NVSTORE instead of SOTP for RoT * Use nvstore to retrive rot * Remove config for SOTP And add config for NVSTORE * Removing sotp from filenames * Update to new hub Which removes the sotp dependency ~600 bytes binary size reduction
1 parent ef0e37b commit e2f4e60

19 files changed

+66
-284
lines changed

‎.mbedignore

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,18 @@ 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/*
1516
mbed-os/features/cellular/*
1617
mbed-os/features/lorawan/*
1718
mbed-os/features/nanostack/*
1819
mbed-os/features/netsocket/*
1920
mbed-os/features/storage/*
20-
mbed-os/features/nvstore/*
2121
mbed-os/features/filesystem/littlefs/*
2222
mbed-os/features/filesystem/fat/*
2323
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/onboard_modem_api.c
2424
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/onboard_modem_api.h
2525
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/min_battery_voltage.c
2626
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/min_battery_voltage.h
27-
mbed-os/features/unsupported/*
28-
mbed-os/features/cellular/*
29-
mbed-os/features/lorawan/*
30-
mbed-os/features/nvstore/*
3127
mbed-os/features/frameworks/mbed-client-randlib/*
3228
mbed-os/features/frameworks/mbed-coap/*
3329
mbed-os/features/frameworks/mbed-trace/*
@@ -47,26 +43,5 @@ update-client-hub/modules/pal-filesystem/*
4743
update-client-hub/modules/pal-target-specific/*
4844
update-client-hub/modules/source-http/*
4945
update-client-hub/modules/source-manager/*
46+
update-client-hub/modules/resume-engine/*
5047
update-client-hub/modules/common/source/arm_uc_scheduler.c
51-
mbed-client-pal/Test/*
52-
mbed-client-pal/Utils/*
53-
mbed-client-pal/Examples/*
54-
mbed-client-pal/Source/PAL-Impl/pal_init.c
55-
mbed-client-pal/Source/PAL-Impl/Modules/Crypto/*
56-
mbed-client-pal/Source/PAL-Impl/Modules/Networking/*
57-
mbed-client-pal/Source/PAL-Impl/Modules/RTOS/*
58-
mbed-client-pal/Source/PAL-Impl/Modules/TLS/*
59-
mbed-client-pal/Source/PAL-Impl/Modules/Update/*
60-
mbed-client-pal/Source/PAL-Impl/Modules/Storage/FileSystem/*
61-
mbed-client-pal/Source/Port/Reference-Impl/Lib_Specific/*
62-
mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/FreeRTOS/*
63-
mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/Linux/*
64-
mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/mbedOS/Networking/*
65-
mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/mbedOS/RTOS/*
66-
mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/mbedOS/Update/*
67-
mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/mbedOS/Storage/FileSystem/*
68-
mbed-client-esfs/Test/*
69-
mbed-client-esfs/Tools/*
70-
mbed-client-esfs/source/esfs.c
71-
mbed-client-esfs/source/esfs_file_name.c
72-
mbed-client-esfs/source/esfs_performance.c

‎Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ def bootloaderBuildStep(stepName,
176176
def build_test_config = [
177177
"K64F": [
178178
"mbed_app.json",
179-
"configs/internal_flash_sotp.json",
179+
"configs/internal_flash_nvstore.json",
180180
"configs/internal_flash_fake_rot.json"],
181181
"NUCLEO_F429ZI": ["mbed_app.json"],
182182
"UBLOX_EVK_ODIN_W2": ["mbed_app.json"],

‎bootloader_pal_user_config.h

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎configs/internal_flash_fake_rot.json

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"SHOW_PROGRESS_BAR=1",
77
"MAX_BOOT_RETRIES=3",
88
"ARM_UC_USE_PAL_CRYPTO=0",
9-
"ARM_UC_USE_SOTP=0",
9+
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1010
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP"
1111
],
1212
"config": {
@@ -17,26 +17,6 @@
1717
"max-application-size": {
1818
"help": "Maximum size of the active application",
1919
"value": null
20-
},
21-
"sotp-section-1-address": {
22-
"help": "Flash sector address for SOTP sector 1",
23-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_ADDRESS",
24-
"value": null
25-
},
26-
"sotp-section-1-size": {
27-
"help": "Flash sector size for SOTP sector 1",
28-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_SIZE",
29-
"value": null
30-
},
31-
"sotp-section-2-address": {
32-
"help": "Flash sector address for SOTP sector 2",
33-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_ADDRESS",
34-
"value": null
35-
},
36-
"sotp-section-2-size": {
37-
"help": "Flash sector size for SOTP sector 2",
38-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_SIZE",
39-
"value": null
4020
}
4121
},
4222
"target_overrides": {
@@ -48,10 +28,6 @@
4828
"update-client.firmware-header-version": "2"
4929
},
5030
"K64F": {
51-
"sotp-section-1-address" : "( 32*1024)",
52-
"sotp-section-1-size" : "( 4*1024)",
53-
"sotp-section-2-address" : "( 36*1024)",
54-
"sotp-section-2-size" : "( 4*1024)",
5531
"update-client.application-details": "( 40*1024)",
5632
"application-start-address" : "( 41*1024)",
5733
"max-application-size" : "(MBED_CONF_UPDATE_CLIENT_STORAGE_ADDRESS-MBED_CONF_APP_APPLICATION_START_ADDRESS)",

‎configs/internal_flash_sotp.json renamed to ‎configs/internal_flash_nvstore.json

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"SHOW_PROGRESS_BAR=1",
77
"MAX_BOOT_RETRIES=3",
88
"ARM_UC_USE_PAL_CRYPTO=0",
9-
"ARM_UC_USE_SOTP=1",
9+
"ARM_BOOTLOADER_USE_NVSTORE_ROT=1",
1010
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP"
1111
],
1212
"config": {
@@ -17,26 +17,6 @@
1717
"max-application-size": {
1818
"help": "Maximum size of the active application",
1919
"value": null
20-
},
21-
"sotp-section-1-address": {
22-
"help": "Flash sector address for SOTP sector 1",
23-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_ADDRESS",
24-
"value": null
25-
},
26-
"sotp-section-1-size": {
27-
"help": "Flash sector size for SOTP sector 1",
28-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_SIZE",
29-
"value": null
30-
},
31-
"sotp-section-2-address": {
32-
"help": "Flash sector address for SOTP sector 2",
33-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_ADDRESS",
34-
"value": null
35-
},
36-
"sotp-section-2-size": {
37-
"help": "Flash sector size for SOTP sector 2",
38-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_SIZE",
39-
"value": null
4020
}
4121
},
4222
"target_overrides": {
@@ -48,10 +28,10 @@
4828
"update-client.firmware-header-version": "2"
4929
},
5030
"K64F": {
51-
"sotp-section-1-address" : "( 32*1024)",
52-
"sotp-section-1-size" : "( 4*1024)",
53-
"sotp-section-2-address" : "( 36*1024)",
54-
"sotp-section-2-size" : "( 4*1024)",
31+
"nvstore.area_1_address" : "( 32*1024)",
32+
"nvstore.area_1_size" : "( 4*1024)",
33+
"nvstore.area_2_address" : "( 36*1024)",
34+
"nvstore.area_2_size" : "( 4*1024)",
5535
"update-client.application-details": "( 40*1024)",
5636
"application-start-address" : "( 41*1024)",
5737
"max-application-size" : "(MBED_CONF_UPDATE_CLIENT_STORAGE_ADDRESS-MBED_CONF_APP_APPLICATION_START_ADDRESS)",

‎configs/nrf52_block_device_fake_rot.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"SHOW_PROGRESS_BAR=1",
77
"MAX_BOOT_RETRIES=3",
88
"ARM_UC_USE_PAL_CRYPTO=0",
9-
"ARM_UC_USE_SOTP=0",
9+
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1010
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1111
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE"
1212
],

‎configs/nrf52_internal_flash_fake_rot.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"SHOW_PROGRESS_BAR=1",
77
"MAX_BOOT_RETRIES=3",
88
"ARM_UC_USE_PAL_CRYPTO=0",
9-
"ARM_UC_USE_SOTP=0",
9+
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1010
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP"
1111
],
1212
"config": {

‎configs/test_configs/fake_rot_sd_card.json

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"SHOW_PROGRESS_BAR=1",
77
"MAX_BOOT_RETRIES=3",
88
"ARM_UC_USE_PAL_CRYPTO=0",
9-
"ARM_UC_USE_SOTP=0",
9+
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1010
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1111
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
1212
"DEFAULT_MAX_APPLICATION_SIZE=(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - MBED_CONF_APP_APPLICATION_START_ADDRESS)"
@@ -24,26 +24,6 @@
2424
"help": "Maximum size of the active application",
2525
"value": null
2626
},
27-
"sotp-section-1-address": {
28-
"help": "Flash sector address for SOTP sector 1",
29-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_ADDRESS",
30-
"value": null
31-
},
32-
"sotp-section-1-size": {
33-
"help": "Flash sector size for SOTP sector 1",
34-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_SIZE",
35-
"value": null
36-
},
37-
"sotp-section-2-address": {
38-
"help": "Flash sector address for SOTP sector 2",
39-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_ADDRESS",
40-
"value": null
41-
},
42-
"sotp-section-2-size": {
43-
"help": "Flash sector size for SOTP sector 2",
44-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_SIZE",
45-
"value": null
46-
},
4727
"flash-start-address": {
4828
"help": "Start address of internal flash. Only used in this config to help the definition of other macros.",
4929
"value": null
@@ -67,65 +47,41 @@
6747
"K64F": {
6848
"flash-start-address" : "0x0",
6949
"flash-size" : "(1024*1024)",
70-
"sotp-section-1-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
71-
"sotp-section-1-size" : "(4*1024)",
72-
"sotp-section-2-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+36*1024)",
73-
"sotp-section-2-size" : "(4*1024)",
7450
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+40*1024)",
7551
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+41*1024)",
7652
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
7753
},
7854
"K66F": {
7955
"flash-start-address" : "0x0",
8056
"flash-size" : "(2048*1024)",
81-
"sotp-section-1-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
82-
"sotp-section-1-size" : "(4*1024)",
83-
"sotp-section-2-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+36*1024)",
84-
"sotp-section-2-size" : "(4*1024)",
8557
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+40*1024)",
8658
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+41*1024)",
8759
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
8860
},
8961
"KW24D": {
9062
"flash-start-address" : "0x0",
9163
"flash-size" : "(512*1024)",
92-
"sotp-section-1-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
93-
"sotp-section-1-size" : "(2*1024)",
94-
"sotp-section-2-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+34*1024)",
95-
"sotp-section-2-size" : "(2*1024)",
9664
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+36*1024)",
9765
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+37*1024)",
9866
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
9967
},
10068
"NUCLEO_L476RG": {
10169
"flash-start-address" : "0x08000000",
10270
"flash-size" : "(1024*1024)",
103-
"sotp-section-1-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
104-
"sotp-section-1-size" : "(2*1024)",
105-
"sotp-section-2-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+34*1024)",
106-
"sotp-section-2-size" : "(2*1024)",
10771
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+36*1024)",
10872
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+38*1024)",
10973
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
11074
},
11175
"DISCO_L476VG": {
11276
"flash-start-address" : "0x08000000",
11377
"flash-size" : "(1024*1024)",
114-
"sotp-section-1-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
115-
"sotp-section-1-size" : "(2*1024)",
116-
"sotp-section-2-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+34*1024)",
117-
"sotp-section-2-size" : "(2*1024)",
11878
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+36*1024)",
11979
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+38*1024)",
12080
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
12181
},
12282
"NUCLEO_F429ZI": {
12383
"flash-start-address" : "0x08000000",
12484
"flash-size" : "(2048*1024)",
125-
"sotp-section-1-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
126-
"sotp-section-1-size" : "(16*1024)",
127-
"sotp-section-2-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+48*1024)",
128-
"sotp-section-2-size" : "(16*1024)",
12985
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+64*1024)",
13086
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+65*1024)",
13187
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
@@ -134,21 +90,13 @@
13490
"target.device_has_remove": ["EMAC"],
13591
"flash-start-address" : "0x08000000",
13692
"flash-size" : "(2048*1024)",
137-
"sotp-section-1-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
138-
"sotp-section-1-size" : "(16*1024)",
139-
"sotp-section-2-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+48*1024)",
140-
"sotp-section-2-size" : "(16*1024)",
14193
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+64*1024)",
14294
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+65*1024)",
14395
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
14496
},
14597
"UBLOX_C030_U201": {
14698
"flash-start-address" : "0x08000000",
14799
"flash-size" : "(1024*1024)",
148-
"sotp-section-1-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
149-
"sotp-section-1-size" : "(16*1024)",
150-
"sotp-section-2-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+48*1024)",
151-
"sotp-section-2-size" : "(16*1024)",
152100
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+64*1024)",
153101
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+65*1024)",
154102
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"

‎configs/test_configs/header_separate_after_app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"SHOW_PROGRESS_BAR=1",
77
"MAX_BOOT_RETRIES=3",
88
"ARM_UC_USE_PAL_CRYPTO=0",
9-
"ARM_UC_USE_SOTP=0",
9+
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1010
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1111
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
1212
"DEFAULT_MAX_APPLICATION_SIZE=(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - MBED_CONF_APP_APPLICATION_START_ADDRESS)"

‎configs/test_configs/header_separate_before_app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"SHOW_PROGRESS_BAR=1",
77
"MAX_BOOT_RETRIES=3",
88
"ARM_UC_USE_PAL_CRYPTO=0",
9-
"ARM_UC_USE_SOTP=0",
9+
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1010
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1111
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
1212
"DEFAULT_MAX_APPLICATION_SIZE=(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - MBED_CONF_APP_APPLICATION_START_ADDRESS)"

0 commit comments

Comments
 (0)