Skip to content

Commit 230ee45

Browse files
author
Janne Kiiskilä
authored
Merge pull request ARMmbed#150 from deepikabhavnani/sd_component_add
Update configs
2 parents 03e46bc + bac969c commit 230ee45

9 files changed

+72
-25
lines changed

‎configs/internal_flash_fake_rot.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"ARM_UC_FEATURE_CRYPTO_MBEDTLS=1",
1212
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1313
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP",
14-
"Mutex=PlatformMutex"
14+
"Mutex=PlatformMutex",
15+
"MBED_FAULT_HANDLER_DISABLED"
1516
],
1617
"config": {
1718
"application-start-address": {

‎configs/internal_flash_nvstore.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"ARM_UC_FEATURE_CRYPTO_MBEDTLS=1",
1212
"ARM_BOOTLOADER_USE_NVSTORE_ROT=1",
1313
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP",
14-
"Mutex=PlatformMutex"
14+
"Mutex=PlatformMutex",
15+
"MBED_FAULT_HANDLER_DISABLED"
1516
],
1617
"config": {
1718
"application-start-address": {

‎configs/nrf52_block_device_fake_rot.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1313
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1414
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
15-
"Mutex=PlatformMutex"
15+
"Mutex=PlatformMutex",
16+
"MBED_FAULT_HANDLER_DISABLED"
1617
],
1718
"config": {
1819
"application-start-address": {
@@ -32,6 +33,8 @@
3233
"update-client.firmware-header-version": "2"
3334
},
3435
"NRF52_DK": {
36+
"target.components_add" : ["SD"],
37+
"sd.CRC_ENABLED" : 0,
3538
"minimal-printf.console-output" : "SWO",
3639
"target.app_offset" : "0x74000",
3740
"update-client.application-details" : "(508*1024)",

‎configs/nrf52_internal_flash_fake_rot.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"ARM_UC_FEATURE_CRYPTO_MBEDTLS=1",
1212
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1313
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP",
14-
"Mutex=PlatformMutex"
14+
"Mutex=PlatformMutex",
15+
"MBED_FAULT_HANDLER_DISABLED"
1516
],
1617
"config": {
1718
"application-start-address": {

‎configs/test_configs/fake_rot_sd_card.json

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1414
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
1515
"DEFAULT_MAX_APPLICATION_SIZE=(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - MBED_CONF_APP_APPLICATION_START_ADDRESS)",
16-
"Mutex=PlatformMutex"
16+
"Mutex=PlatformMutex",
17+
"MBED_FAULT_HANDLER_DISABLED"
1718
],
1819
"config": {
1920
"application-start-address": {
@@ -52,37 +53,47 @@
5253
"flash-size" : "(1024*1024)",
5354
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+40*1024)",
5455
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+41*1024)",
55-
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
56+
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE",
57+
"sd.CRC_ENABLED" : 0
5658
},
5759
"K66F": {
5860
"flash-start-address" : "0x0",
5961
"flash-size" : "(2048*1024)",
6062
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+40*1024)",
6163
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+41*1024)",
62-
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
64+
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE",
65+
"sd.CRC_ENABLED" : 0
6366
},
6467
"KW24D": {
68+
"target.components_add" : ["SD"],
69+
"sd.CRC_ENABLED" : 0,
6570
"flash-start-address" : "0x0",
6671
"flash-size" : "(512*1024)",
6772
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+36*1024)",
6873
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+37*1024)",
6974
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
7075
},
7176
"NUCLEO_L476RG": {
77+
"target.components_add" : ["SD"],
78+
"sd.CRC_ENABLED" : 0,
7279
"flash-start-address" : "0x08000000",
7380
"flash-size" : "(1024*1024)",
7481
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+36*1024)",
7582
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+38*1024)",
7683
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
7784
},
7885
"DISCO_L476VG": {
86+
"target.components_add" : ["SD"],
87+
"sd.CRC_ENABLED" : 0,
7988
"flash-start-address" : "0x08000000",
8089
"flash-size" : "(1024*1024)",
8190
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+36*1024)",
8291
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+38*1024)",
8392
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
8493
},
8594
"NUCLEO_F429ZI": {
95+
"target.components_add" : ["SD"],
96+
"sd.CRC_ENABLED" : 0,
8697
"flash-start-address" : "0x08000000",
8798
"flash-size" : "(2048*1024)",
8899
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+64*1024)",
@@ -91,13 +102,17 @@
91102
},
92103
"UBLOX_EVK_ODIN_W2": {
93104
"target.device_has_remove": ["EMAC"],
105+
"target.components_add" : ["SD"],
106+
"sd.CRC_ENABLED" : 0,
94107
"flash-start-address" : "0x08000000",
95108
"flash-size" : "(2048*1024)",
96109
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+64*1024)",
97110
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+65*1024)",
98111
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
99112
},
100113
"UBLOX_C030_U201": {
114+
"target.components_add" : ["SD"],
115+
"sd.CRC_ENABLED" : 0,
101116
"flash-start-address" : "0x08000000",
102117
"flash-size" : "(1024*1024)",
103118
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+64*1024)",

‎configs/test_configs/header_separate_after_app.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1414
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
1515
"DEFAULT_MAX_APPLICATION_SIZE=(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - MBED_CONF_APP_APPLICATION_START_ADDRESS)",
16-
"Mutex=PlatformMutex"
16+
"Mutex=PlatformMutex",
17+
"MBED_FAULT_HANDLER_DISABLED"
1718
],
1819
"config": {
1920
"application-start-address": {
@@ -52,7 +53,8 @@
5253
"flash-size" : "(1024*1024)",
5354
"update-client.application-details" : "(MBED_CONF_APP_FLASH_START_ADDRESS+1020*1024)",
5455
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+40*1024)",
55-
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
56+
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE",
57+
"sd.CRC_ENABLED" : 0
5658
}
5759
}
5860
}

‎configs/test_configs/header_separate_before_app.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1414
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
1515
"DEFAULT_MAX_APPLICATION_SIZE=(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - MBED_CONF_APP_APPLICATION_START_ADDRESS)",
16-
"Mutex=PlatformMutex"
16+
"Mutex=PlatformMutex",
17+
"MBED_FAULT_HANDLER_DISABLED"
1718
],
1819
"config": {
1920
"application-start-address": {
@@ -52,7 +53,8 @@
5253
"flash-size" : "(1024*1024)",
5354
"update-client.application-details" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
5455
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+40*1024)",
55-
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
56+
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE",
57+
"sd.CRC_ENABLED" : 0
5658
}
5759
}
5860
}

‎configs/test_configs/power_cut_test.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1414
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
1515
"BOOTLOADER_POWER_CUT_TEST=1",
16-
"Mutex=PlatformMutex"
16+
"Mutex=PlatformMutex",
17+
"MBED_FAULT_HANDLER_DISABLED"
1718
],
1819
"config": {
1920
"application-start-address": {
@@ -38,7 +39,8 @@
3839
"K64F": {
3940
"update-client.application-details": "88*1024",
4041
"application-start-address" : "89*1024",
41-
"max-application-size" : "(1024*1024-MBED_CONF_APP_APPLICATION_START_ADDRESS)"
42+
"max-application-size" : "(1024*1024-MBED_CONF_APP_APPLICATION_START_ADDRESS)",
43+
"sd.CRC_ENABLED" : 0
4244
}
4345
}
4446
}

‎mbed_app.json

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"ARM_UC_PROFILE_MBED_CLOUD_CLIENT=1",
1515
"ARM_UC_FEATURE_CRYPTO_PAL=0",
1616
"ARM_UC_FEATURE_CRYPTO_MBEDTLS=1",
17-
"Mutex=PlatformMutex"
17+
"Mutex=PlatformMutex",
18+
"MBED_FAULT_HANDLER_DISABLED"
1819
],
1920
"config": {
2021
"application-start-address": {
@@ -40,14 +41,11 @@
4041
},
4142
"target_overrides": {
4243
"*": {
43-
"target.features_remove" : ["LWIP", "STORAGE"],
44-
"target.components_add" : ["SD"],
45-
"platform.use-mpu" : false,
46-
"platform.stdio-baud-rate" : 115200,
47-
"platform.stdio-flush-at-exit" : false,
48-
"platform.crash-capture-enabled" : 0,
49-
"sd.crc-enabled" : 0,
50-
"sd.write-enabled" : 0,
44+
"target.features_remove": ["LWIP", "STORAGE"],
45+
"platform.use-mpu" : false,
46+
"platform.stdio-baud-rate" : 115200,
47+
"platform.stdio-flush-at-exit" : false,
48+
"platform.crash-capture-enabled": 0,
5149
"update-client.storage-address" : "(1024*1024*64)",
5250
"update-client.storage-size" : "(1024*1024*2)",
5351
"update-client.storage-locations": 1,
@@ -62,7 +60,8 @@
6260
"nvstore.area_2_size" : "(4*1024)",
6361
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+40*1024)",
6462
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+41*1024)",
65-
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
63+
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE",
64+
"sd.CRC_ENABLED" : 0
6665
},
6766
"K66F": {
6867
"flash-start-address" : "0x0",
@@ -73,9 +72,12 @@
7372
"nvstore.area_2_size" : "(4*1024)",
7473
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+40*1024)",
7574
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+41*1024)",
76-
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
75+
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE",
76+
"sd.CRC_ENABLED" : 0
7777
},
7878
"KW24D": {
79+
"target.components_add" : ["SD"],
80+
"sd.CRC_ENABLED" : 0,
7981
"flash-start-address" : "0x0",
8082
"flash-size" : "(512*1024)",
8183
"nvstore.area_1_address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
@@ -87,6 +89,8 @@
8789
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
8890
},
8991
"NUCLEO_L476RG": {
92+
"target.components_add" : ["SD"],
93+
"sd.CRC_ENABLED" : 0,
9094
"flash-start-address" : "0x08000000",
9195
"flash-size" : "(1024*1024)",
9296
"nvstore.area_1_address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
@@ -98,6 +102,8 @@
98102
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
99103
},
100104
"DISCO_L476VG": {
105+
"target.components_add" : ["SD"],
106+
"sd.CRC_ENABLED" : 0,
101107
"flash-start-address" : "0x08000000",
102108
"flash-size" : "(1024*1024)",
103109
"nvstore.area_1_address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
@@ -109,6 +115,8 @@
109115
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
110116
},
111117
"DISCO_L475VG_IOT01A": {
118+
"target.components_add" : ["SD"],
119+
"sd.CRC_ENABLED" : 0,
112120
"flash-start-address" : "0x08000000",
113121
"flash-size" : "(1024*1024)",
114122
"nvstore.area_1_address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
@@ -129,12 +137,16 @@
129137
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+64*1024)",
130138
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+65*1024)",
131139
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE",
140+
"target.components_add" : ["SD"],
132141
"sd.SPI_CS" : "PB_9",
133142
"sd.SPI_MOSI" : "PC_3",
134143
"sd.SPI_MISO" : "PC_2",
135-
"sd.SPI_CLK" : "PC_7"
144+
"sd.SPI_CLK" : "PC_7",
145+
"sd.CRC_ENABLED" : 0
136146
},
137147
"NUCLEO_F429ZI": {
148+
"target.components_add" : ["SD"],
149+
"sd.CRC_ENABLED" : 0,
138150
"flash-start-address" : "0x08000000",
139151
"flash-size" : "(2048*1024)",
140152
"nvstore.area_1_address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
@@ -155,12 +167,16 @@
155167
"update-client.application-details": "(MBED_CONF_APP_FLASH_START_ADDRESS+64*1024)",
156168
"application-start-address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+65*1024)",
157169
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE",
170+
"target.components_add" : ["SD"],
171+
"sd.CRC_ENABLED" : 0,
158172
"sd.SPI_MOSI": "PC_12",
159173
"sd.SPI_MISO": "PC_11",
160174
"sd.SPI_CLK": "PC_10",
161175
"sd.SPI_CS": "PA_15"
162176
},
163177
"UBLOX_EVK_ODIN_W2": {
178+
"target.components_add" : ["SD"],
179+
"sd.CRC_ENABLED" : 0,
164180
"target.device_has_remove": ["EMAC"],
165181
"flash-start-address" : "0x08000000",
166182
"flash-size" : "(2048*1024)",
@@ -173,6 +189,8 @@
173189
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
174190
},
175191
"UBLOX_C030_U201": {
192+
"target.components_add" : ["SD"],
193+
"sd.CRC_ENABLED" : 0,
176194
"flash-start-address" : "0x08000000",
177195
"flash-size" : "(1024*1024)",
178196
"nvstore.area_1_address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+32*1024)",
@@ -184,6 +202,8 @@
184202
"max-application-size" : "DEFAULT_MAX_APPLICATION_SIZE"
185203
},
186204
"NRF52840_DK": {
205+
"target.components_add" : ["SD"],
206+
"sd.CRC_ENABLED" : 0,
187207
"flash-start-address" : "0x0",
188208
"flash-size" : "(1024*1024)",
189209
"nvstore.area_1_address" : "(MBED_CONF_APP_FLASH_START_ADDRESS+1024*1016)",

0 commit comments

Comments
 (0)