Skip to content

Commit 20efd46

Browse files
authored
Merge branch 'master' into dev_wio_3g
2 parents c4ebabb + 7d7804c commit 20efd46

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

mbed_app.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
"mbed-cloud-client.update-storage" : "ARM_UCP_FLASHIAP",
5050
"storage_tdb_internal.internal_base_address": "(512*1024)",
5151
"storage_tdb_internal.internal_size" : "(32*1024)",
52-
"storage.storage_type" : "TDB_INTERNAL"
52+
"storage.storage_type" : "TDB_INTERNAL",
53+
"run-ci" : 2
5354
},
5455
"K66F": {
5556
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS.h\""],
@@ -65,7 +66,8 @@
6566
"mbed-cloud-client.update-storage" : "ARM_UCP_FLASHIAP",
6667
"storage_tdb_internal.internal_base_address": "(1024*1024)",
6768
"storage_tdb_internal.internal_size" : "(96*1024)",
68-
"storage.storage_type" : "TDB_INTERNAL"
69+
"storage.storage_type" : "TDB_INTERNAL",
70+
"run-ci" : 2
6971
},
7072
"NUCLEO_F429ZI": {
7173
"target.macros_add" : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS.h\""],
@@ -237,7 +239,8 @@
237239
"update-client.firmware-header-version" : "2",
238240
"update-client.storage-address" : "(MBED_CONF_STORAGE_FILESYSTEM_EXTERNAL_BASE_ADDRESS + MBED_CONF_STORAGE_FILESYSTEM_EXTERNAL_SIZE)",
239241
"update-client.storage-locations" : 1,
240-
"update-client.storage-size" : "((MBED_ROM_START + MBED_ROM_SIZE - APPLICATION_ADDR) * MBED_CONF_UPDATE_CLIENT_STORAGE_LOCATIONS)"
242+
"update-client.storage-size" : "((MBED_ROM_START + MBED_ROM_SIZE - APPLICATION_ADDR) * MBED_CONF_UPDATE_CLIENT_STORAGE_LOCATIONS)",
243+
"run-ci" : 2
241244
},
242245
"EP_AGORA": {
243246
"target.features_add" : ["LWIP", "STORAGE", "BOOTLOADER"],
@@ -353,6 +356,11 @@
353356
"help" : "Helper macro to enable calculation of rom regions. target.header_offset and target.app_offset still needs to be calculated manually, though.",
354357
"value" : "(32*1024)",
355358
"macro_name": "MBED_BOOTLOADER_SIZE"
359+
},
360+
"run-ci": {
361+
"help" : "Configuration item to control the level of CI verification. 0 = ignored, 1 = build-only, 2 = build + E2E tests",
362+
"accepted_values": [0, 1, 2],
363+
"value" : 1
356364
}
357365
}
358366
}

0 commit comments

Comments
 (0)