Skip to content

Commit 9d926e2

Browse files
author
Liyou Zhou
committed
v3.5.0 - New Mbed OS, New Boards
New Features - Update mbed-os to 5.10.0 - Update cloud client dependency to 2.0.1.1 - Add configuration for NUCLEO_F303RE, NUCLEO_F207ZG, DISCO_L475VG_IOT01A, and NRF52840_DK
1 parent 1003366 commit 9d926e2

8 files changed

+64
-13
lines changed

.mbedignore

+7-1
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,20 @@ mbed-os/features/cellular/*
1717
mbed-os/features/lorawan/*
1818
mbed-os/features/nanostack/*
1919
mbed-os/features/netsocket/*
20-
mbed-os/features/storage/*
2120
mbed-os/features/filesystem/littlefs/*
2221
mbed-os/features/filesystem/fat/*
2322
mbed-os/features/device_key/*
23+
mbed-os/components/wifi/*
24+
mbed-os/components/storage/*
25+
mbed-os/features/frameworks/mbed-client-cli/*
26+
mbed-os/features/lwipstack/*
27+
mbed-os/features/nfc/*
2428
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/onboard_modem_api.c
2529
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/onboard_modem_api.h
2630
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/min_battery_voltage.c
2731
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/min_battery_voltage.h
2832
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/ublox-odin-w2-drivers/default_wifi_interface.cpp
33+
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/ublox-odin-w2-drivers/OdinWiFiInterface.cpp
2934
mbed-os/features/frameworks/mbed-client-randlib/*
3035
mbed-os/features/frameworks/mbed-coap/*
3136
mbed-os/features/frameworks/mbed-trace/*
@@ -66,3 +71,4 @@ mbed-cloud-client/nanostack-libservice/*
6671
mbed-cloud-client/ns-hal-pal/*
6772
mbed-cloud-client/sal-stack-nanostack-eventloop/*
6873
mbed-cloud-client/source/*
74+
mbed-cloud-client/certificate-enrollment-client/*

configs/internal_flash_fake_rot.json

+13-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"SHOW_PROGRESS_BAR=1",
77
"MAX_BOOT_RETRIES=3",
88
"ARM_UC_USE_PAL_CRYPTO=0",
9+
"ARM_UC_PROFILE_MBED_CLOUD_CLIENT=1",
10+
"ARM_UC_FEATURE_CRYPTO_PAL=0",
11+
"ARM_UC_FEATURE_CRYPTO_MBEDTLS=1",
912
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1013
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP",
1114
"Mutex=PlatformMutex"
@@ -22,8 +25,7 @@
2225
},
2326
"target_overrides": {
2427
"*": {
25-
"target.features_remove": ["LWIP"],
26-
"target.features_add": ["COMMON_PAL"],
28+
"target.features_remove": ["LWIP", "STORAGE"],
2729
"platform.stdio-baud-rate": 115200,
2830
"platform.stdio-flush-at-exit": false,
2931
"update-client.firmware-header-version": "2"
@@ -45,6 +47,15 @@
4547
"update-client.storage-size" : "(512*1024)",
4648
"update-client.storage-locations" : 1,
4749
"update-client.storage-page" : 1
50+
},
51+
"NUCLEO_F303RE": {
52+
"update-client.application-details": "(0x08000000+36*1024)",
53+
"application-start-address" : "(0x08000000+37*1024)",
54+
"max-application-size" : "(MBED_CONF_UPDATE_CLIENT_STORAGE_ADDRESS-MBED_CONF_APP_APPLICATION_START_ADDRESS)",
55+
"update-client.storage-address" : "(0x08000000+(256+18)*1024)",
56+
"update-client.storage-size" : "((256-18)*1024)",
57+
"update-client.storage-locations" : 1,
58+
"update-client.storage-page" : 4
4859
}
4960
}
5061
}

configs/internal_flash_nvstore.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"SHOW_PROGRESS_BAR=1",
77
"MAX_BOOT_RETRIES=3",
88
"ARM_UC_USE_PAL_CRYPTO=0",
9+
"ARM_UC_PROFILE_MBED_CLOUD_CLIENT=1",
10+
"ARM_UC_FEATURE_CRYPTO_PAL=0",
11+
"ARM_UC_FEATURE_CRYPTO_MBEDTLS=1",
912
"ARM_BOOTLOADER_USE_NVSTORE_ROT=1",
1013
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP",
1114
"Mutex=PlatformMutex"
@@ -22,8 +25,7 @@
2225
},
2326
"target_overrides": {
2427
"*": {
25-
"target.features_remove": ["LWIP"],
26-
"target.features_add": ["COMMON_PAL"],
28+
"target.features_remove": ["LWIP", "STORAGE"],
2729
"platform.stdio-baud-rate": 115200,
2830
"platform.stdio-flush-at-exit": false,
2931
"update-client.firmware-header-version": "2"

configs/nrf52_block_device_fake_rot.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"SHOW_PROGRESS_BAR=1",
77
"MAX_BOOT_RETRIES=3",
88
"ARM_UC_USE_PAL_CRYPTO=0",
9+
"ARM_UC_PROFILE_MBED_CLIENT_LITE=1",
10+
"ARM_UC_FEATURE_CRYPTO_PAL=0",
11+
"ARM_UC_FEATURE_CRYPTO_MBEDTLS=1",
912
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1013
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1114
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
@@ -23,8 +26,7 @@
2326
},
2427
"target_overrides": {
2528
"*": {
26-
"target.features_remove": ["LWIP"],
27-
"target.features_add": ["COMMON_PAL"],
29+
"target.features_remove": ["LWIP", "STORAGE"],
2830
"platform.stdio-baud-rate": 115200,
2931
"platform.stdio-flush-at-exit": false,
3032
"update-client.firmware-header-version": "2"

configs/nrf52_internal_flash_fake_rot.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"SHOW_PROGRESS_BAR=1",
77
"MAX_BOOT_RETRIES=3",
88
"ARM_UC_USE_PAL_CRYPTO=0",
9+
"ARM_UC_PROFILE_MBED_CLIENT_LITE=1",
10+
"ARM_UC_FEATURE_CRYPTO_PAL=0",
11+
"ARM_UC_FEATURE_CRYPTO_MBEDTLS=1",
912
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1013
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP",
1114
"Mutex=PlatformMutex"
@@ -22,8 +25,7 @@
2225
},
2326
"target_overrides": {
2427
"*": {
25-
"target.features_remove": ["LWIP"],
26-
"target.features_add": ["COMMON_PAL"],
28+
"target.features_remove": ["LWIP", "STORAGE"],
2729
"platform.stdio-baud-rate": 115200,
2830
"platform.stdio-flush-at-exit": false,
2931
"update-client.firmware-header-version": "2"

mbed-cloud-client.lib

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-cloud-client/#9b0bc6a2f3f1f5dbb5be1827db83004d531b99c9
1+
https://github.com/ARMmbed/mbed-cloud-client/#62de4b89d2350379278893f2f7a3ac937b4ae5f6

mbed-os.lib

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-os/#485bdeee150e2bc8ed75e27d936060fb63a7a7d1
1+
https://github.com/ARMmbed/mbed-os/#610e35ddc6d59f153173c1e7b2748cf96d6c9bcd

mbed_app.json

+30-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
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)",
1313
"DISABLE_ERROR_DESCRIPTION=1",
14+
"ARM_UC_PROFILE_MBED_CLOUD_CLIENT=1",
15+
"ARM_UC_FEATURE_CRYPTO_PAL=0",
16+
"ARM_UC_FEATURE_CRYPTO_MBEDTLS=1",
1417
"Mutex=PlatformMutex"
1518
],
1619
"config": {
@@ -37,8 +40,7 @@
3740
},
3841
"target_overrides": {
3942
"*": {
40-
"target.features_remove": ["LWIP"],
41-
"target.features_add" : ["COMMON_PAL"],
43+
"target.features_remove": ["LWIP", "STORAGE"],
4244
"platform.stdio-baud-rate" : 115200,
4345
"platform.stdio-flush-at-exit": false,
4446
"update-client.storage-address" : "(1024*1024*64)",
@@ -101,6 +103,17 @@
101103
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+38*1024)",
102104
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
103105
},
106+
"DISCO_L475VG_IOT01A": {
107+
"flash-start-address" : "0x08000000",
108+
"flash-size" : "(1024*1024)",
109+
"nvstore.area_1_address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
110+
"nvstore.area_1_size" : "(2*1024)",
111+
"nvstore.area_2_address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+34*1024)",
112+
"nvstore.area_2_size" : "(2*1024)",
113+
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+36*1024)",
114+
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+38*1024)",
115+
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
116+
},
104117
"NUCLEO_F411RE": {
105118
"flash-start-address" : "0x08000000",
106119
"flash-size" : "(512*1024)",
@@ -127,6 +140,21 @@
127140
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+65*1024)",
128141
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
129142
},
143+
"NUCLEO_F207ZG": {
144+
"flash-start-address" : "0x08000000",
145+
"flash-size" : "(1024*1024)",
146+
"nvstore.area_1_address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
147+
"nvstore.area_1_size" : "(16*1024)",
148+
"nvstore.area_2_address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+48*1024)",
149+
"nvstore.area_2_size" : "(16*1024)",
150+
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+64*1024)",
151+
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+65*1024)",
152+
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE",
153+
"sd.SPI_MOSI": "PC_12",
154+
"sd.SPI_MISO": "PC_11",
155+
"sd.SPI_CLK": "PC_10",
156+
"sd.SPI_CS": "PA_15"
157+
},
130158
"UBLOX_EVK_ODIN_W2": {
131159
"target.device_has_remove": ["EMAC"],
132160
"flash-start-address" : "0x08000000",

0 commit comments

Comments
 (0)