Skip to content

Commit dea7954

Browse files
teetak01teetak01
authored
Merge pull request #152 from ARMmbed/update-to-4.7.0
Update to Device Management Client 4.7.0 and Mbed OS 6.5.0
2 parents c4e2e10 + f72e47f commit dea7954

9 files changed

+10
-86
lines changed

‎README.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ ST `NUCLEO_F767ZI` | Ethernet | Internal Flash
3737
ST `NUCLEO_H743ZI2` | Ethernet | Internal Flash | Build-only
3838
ST `NUCLEO_L4R5ZI` | Wi-Fi ESP8266 | Internal Flash | Build-only
3939
ST `DISCO_F746NG ` | Ethernet | QSPIF | Build-only
40-
Ublox `UBLOX_C030_R412M` | Cellular | SD card | Build-only
41-
Ublox `UBLOX_C030_U201` | Cellular | SD card | Build-only
42-
Ublox `UBLOX_EVK_ODIN_W2` | Wi-Fi | SD card | Build-only
4340
Uhuru `UHURU_RAVEN` | Wi-Fi ESP32 | Internal Flash | Build-only
4441

4542
Build-only = This target is currently verified only via compilation, and is not verified at runtime.

‎bootloader/mbed-bootloader-ublox_c030_r412m-block_device-kvstore-v4.0.3.bin‎

-29.1 KB
Binary file not shown.

‎bootloader/mbed-bootloader-ublox_c030_u201-block_device-kvstore-v4.0.3.bin‎

-29.2 KB
Binary file not shown.

‎bootloader/mbed-bootloader-ublox_evk_odin_w2-block_device-kvstore-v4.1.0.bin‎

-29.2 KB
Binary file not shown.

‎drivers/COMPONENT_WIFI_ESP32.lib‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/esp32-driver/#d6bd83f8710b4c475b3cce101d8b2c77e17feaf6
1+
https://github.com/ARMmbed/esp32-driver/#b1436411af05f1e424181154b87c855d83f2afee

‎drivers/storage/COMPONENT_NUSD.lib‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/OpenNuvoton/NuMaker-mbed-SD-driver/#56406071a4468a8302c0717a4467a241d152ade2
1+
https://github.com/OpenNuvoton/NuMaker-mbed-SD-driver/#8027c2c886a6bb2d850d3121ec3e2e179450e41c

‎mbed-cloud-client.lib‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-cloud-client/#f72a23e0dc21de4c82ee53fe947153341419a5b9
1+
https://github.com/PelionIoT/mbed-cloud-client/#f277bdc5cf8f5dee22063a5d293c03d76a0a8da2

‎mbed-os.lib‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-os/#b6370b4c37f3d4665ed1cdcb1afea85396bba1b3
1+
https://github.com/ARMmbed/mbed-os/#f2278567d09b9ae9f4843e1d9d393526b9462783

‎mbed_app.json‎

Lines changed: 6 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -83,76 +83,8 @@
8383
"storage_tdb_internal.internal_size" : "(128*1024)",
8484
"storage.storage_type" : "TDB_INTERNAL"
8585
},
86-
"UBLOX_EVK_ODIN_W2": {
87-
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS.h\""],
88-
"target.network-default-interface-type" : "WIFI",
89-
"target.bootloader_img" : "bootloader/mbed-bootloader-ublox_evk_odin_w2-block_device-kvstore-v4.1.0.bin",
90-
"target.header_offset" : "0x10000",
91-
"target.app_offset" : "0x10400",
92-
"target.components_add" : ["SD"],
93-
"update-client.bootloader-details" : "0x08007300",
94-
"update-client.application-details" : "(0x08000000+64*1024)",
95-
"update-client.storage-address" : "(1024*1024*64)",
96-
"update-client.storage-size" : "((MBED_ROM_START + MBED_ROM_SIZE - APPLICATION_ADDR) * MBED_CONF_UPDATE_CLIENT_STORAGE_LOCATIONS)",
97-
"mbed-cloud-client.update-storage" : "ARM_UCP_FLASHIAP_BLOCKDEVICE",
98-
"storage_filesystem.internal_base_address" : "(0x08000000+32*1024)",
99-
"storage_filesystem.rbp_internal_size" : "(32*1024)",
100-
"storage_filesystem.external_base_address" : "(0x0)",
101-
"storage_filesystem.external_size" : "(1024*1024*64)",
102-
"storage.storage_type" : "FILESYSTEM",
103-
"storage_filesystem.filesystem" : "LITTLE",
104-
"storage_filesystem.blockdevice" : "SD",
105-
"target.lse_available" : 0,
106-
"target.macros_remove" : ["MBEDTLS_CONFIG_HW_SUPPORT"]
107-
},
108-
"UBLOX_C030_U201": {
109-
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS.h\""],
110-
"target.network-default-interface-type" : "CELLULAR",
111-
"target.bootloader_img" : "bootloader/mbed-bootloader-ublox_c030_u201-block_device-kvstore-v4.0.3.bin",
112-
"target.header_offset" : "0x10000",
113-
"target.app_offset" : "0x10400",
114-
"target.components_add" : ["SD"],
115-
"update-client.bootloader-details" : "0x08006FB8",
116-
"update-client.application-details" : "(0x08000000+64*1024)",
117-
"update-client.storage-address" : "(1024*1024*64)",
118-
"update-client.storage-size" : "((MBED_ROM_START + MBED_ROM_SIZE - APPLICATION_ADDR) * MBED_CONF_UPDATE_CLIENT_STORAGE_LOCATIONS)",
119-
"mbed-cloud-client.update-storage" : "ARM_UCP_FLASHIAP_BLOCKDEVICE",
120-
"storage_filesystem.internal_base_address" : "(0x08000000+32*1024)",
121-
"storage_filesystem.rbp_internal_size" : "(32*1024)",
122-
"storage_filesystem.external_base_address" : "(0x0)",
123-
"storage_filesystem.external_size" : "(1024*1024*64)",
124-
"storage.storage_type" : "FILESYSTEM",
125-
"storage_filesystem.filesystem" : "LITTLE",
126-
"storage_filesystem.blockdevice" : "SD",
127-
"target.lse_available" : 0,
128-
"target.macros_remove" : ["MBEDTLS_CONFIG_HW_SUPPORT"],
129-
"platform.default-serial-baud-rate" : 115200
130-
},
131-
"UBLOX_C030_R412M": {
132-
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS.h\""],
133-
"target.network-default-interface-type" : "CELLULAR",
134-
"target.bootloader_img" : "bootloader/mbed-bootloader-ublox_c030_r412m-block_device-kvstore-v4.0.3.bin",
135-
"target.header_offset" : "0x10000",
136-
"target.app_offset" : "0x10400",
137-
"target.components_add" : ["SD", "FLASHIAP"],
138-
"update-client.bootloader-details" : "0x08006F1C",
139-
"update-client.application-details" : "(0x08000000+64*1024)",
140-
"update-client.storage-address" : "(1024*1024*64)",
141-
"update-client.storage-size" : "((MBED_ROM_START + MBED_ROM_SIZE - APPLICATION_ADDR) * MBED_CONF_UPDATE_CLIENT_STORAGE_LOCATIONS)",
142-
"mbed-cloud-client.update-storage" : "ARM_UCP_FLASHIAP_BLOCKDEVICE",
143-
"storage_filesystem.internal_base_address" : "(0x08000000+32*1024)",
144-
"storage_filesystem.rbp_internal_size" : "(32*1024)",
145-
"storage_filesystem.external_base_address" : "(0x0)",
146-
"storage_filesystem.external_size" : "(1024*1024*64)",
147-
"storage.storage_type" : "FILESYSTEM",
148-
"storage_filesystem.filesystem" : "LITTLE",
149-
"storage_filesystem.blockdevice" : "SD",
150-
"target.macros_remove" : ["MBEDTLS_CONFIG_HW_SUPPORT"],
151-
"platform.default-serial-baud-rate" : 115200
152-
},
15386
"NUCLEO_F411RE": {
154-
"target.extra_labels_add" : ["PSA"],
155-
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS_SW_TRNG_PSA.h\"", "MBEDTLS_PSA_CRYPTO_C", "MBEDTLS_ENTROPY_NV_SEED", "PAL_USE_HW_TRNG=0"],
87+
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS_SW_TRNG.h\"", "MBEDTLS_ENTROPY_NV_SEED", "PAL_USE_HW_TRNG=0"],
15688
"target.network-default-interface-type" : "WIFI",
15789
"target.bootloader_img" : "bootloader/mbed-bootloader-nucleo_f411re-block_device-kvstore-v4.1.0.bin",
15890
"target.header_offset" : "0x10000",
@@ -183,7 +115,6 @@
183115
"esp8266.provide-default" : true
184116
},
185117
"NUMAKER_PFM_NUC472": {
186-
"target.extra_labels_add" : ["PSA"],
187118
"target.network-default-interface-type" : "ETHERNET",
188119
"target.bootloader_img" : "bootloader/mbed-bootloader-nuc472-block_device-kvstore-v4.1.0.bin",
189120
"bootloader-size" : "(64*1024)",
@@ -205,10 +136,9 @@
205136
"storage_filesystem.rbp_internal_size" : "(2*4*1024)",
206137
"storage_filesystem.external_base_address" : "(0x0)",
207138
"storage_filesystem.external_size" : "(1024*1024*64)",
208-
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS_SW_TRNG_PSA.h\"", "MBEDTLS_PSA_CRYPTO_C", "MBEDTLS_ENTROPY_NV_SEED", "PAL_USE_HW_TRNG=0"]
139+
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS_SW_TRNG.h\"", "MBEDTLS_ENTROPY_NV_SEED", "PAL_USE_HW_TRNG=0"]
209140
},
210141
"NUMAKER_PFM_M487": {
211-
"target.extra_labels_add" : ["PSA"],
212142
"target.network-default-interface-type" : "ETHERNET",
213143
"target.bootloader_img" : "bootloader/mbed-bootloader-m487-block_device-kvstore-v4.1.0.bin",
214144
"bootloader-size" : "(64*1024)",
@@ -230,10 +160,9 @@
230160
"storage_filesystem.rbp_internal_size" : "(2*4*1024)",
231161
"storage_filesystem.external_base_address" : "(0x0)",
232162
"storage_filesystem.external_size" : "(1024*1024*64)",
233-
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS_SW_TRNG_PSA.h\"", "MBEDTLS_PSA_CRYPTO_C", "MBEDTLS_ENTROPY_NV_SEED", "PAL_USE_HW_TRNG=0"]
163+
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS_SW_TRNG.h\"", "MBEDTLS_ENTROPY_NV_SEED", "PAL_USE_HW_TRNG=0"]
234164
},
235165
"NUMAKER_IOT_M487": {
236-
"target.extra_labels_add" : ["PSA"],
237166
"target.network-default-interface-type" : "WIFI",
238167
"target.bootloader_img" : "bootloader/mbed-bootloader-m487_iot-block_device-kvstore-v4.1.0.bin",
239168
"bootloader-size" : "(64*1024)",
@@ -261,10 +190,9 @@
261190
"esp8266.cts" : "A3",
262191
"esp8266.rst" : "PH_3",
263192
"esp8266.provide-default" : true,
264-
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS_SW_TRNG_PSA.h\"", "MBEDTLS_PSA_CRYPTO_C", "MBEDTLS_ENTROPY_NV_SEED", "PAL_USE_HW_TRNG=0", "ESP8266_SEND_TIMEOUT=8000"]
193+
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS_SW_TRNG.h\"", "MBEDTLS_ENTROPY_NV_SEED", "PAL_USE_HW_TRNG=0", "ESP8266_SEND_TIMEOUT=8ms"]
265194
},
266195
"NUMAKER_IOT_M263A": {
267-
"target.extra_labels_add" : ["PSA"],
268196
"target.network-default-interface-type" : "WIFI",
269197
"target.bootloader_img" : "bootloader/mbed-bootloader-m263_iot-block_device-kvstore-v4.1.0.bin",
270198
"bootloader-size" : "(64*1024)",
@@ -292,7 +220,7 @@
292220
"esp8266.cts" : "PC_8",
293221
"esp8266.rst" : "PE_12",
294222
"esp8266.provide-default" : true,
295-
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS_SW_TRNG_PSA.h\"", "MBEDTLS_PSA_CRYPTO_C", "MBEDTLS_ENTROPY_NV_SEED", "PAL_USE_HW_TRNG=0", "ESP8266_SEND_TIMEOUT=8000"]
223+
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS_SW_TRNG.h\"", "MBEDTLS_ENTROPY_NV_SEED", "PAL_USE_HW_TRNG=0", "ESP8266_SEND_TIMEOUT=8ms"]
296224
},
297225
"DISCO_L475VG_IOT01A": {
298226
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS.h\""],
@@ -482,8 +410,7 @@
482410
"target.macros_remove" : ["MBEDTLS_CONFIG_HW_SUPPORT"]
483411
},
484412
"RZ_A1H": {
485-
"target.extra_labels_add" : ["PSA"],
486-
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS_SW_TRNG_PSA.h\"", "MBEDTLS_PSA_CRYPTO_C", "MBEDTLS_ENTROPY_NV_SEED", "PAL_USE_HW_TRNG=0"],
413+
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS_SW_TRNG.h\"", "MBEDTLS_ENTROPY_NV_SEED", "PAL_USE_HW_TRNG=0"],
487414
"target.bootloader_supported" : true,
488415
"target.network-default-interface-type" : "ETHERNET",
489416
"target.bootloader_img" : "bootloader/mbed-bootloader-gr_peach-internal_flash-no_rot-v4.1.2.bin",

0 commit comments

Comments
 (0)