Skip to content

Commit 8f6957e

Browse files
committed
cfstore flash-journal integration sync mode test fixes.
1 parent ca2fd64 commit 8f6957e

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

hal/targets.json

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,14 @@
535535
"progen": {"target": "frdm-k64f"},
536536
"detect_code": ["0240"],
537537
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES", "STORAGE"],
538-
"features": ["IPV4"]
538+
"features": ["IPV4"],
539+
"config": {
540+
"storage_driver_mode": {
541+
"help": "Configuration parameter to select flash storage driver mode. 1 => async operation, 0 => sync operation",
542+
"macro_name": "STORAGE_DRIVER_CONFIG_HARDWARE_MTD_ASYNC_OPS",
543+
"value": 1
544+
}
545+
}
539546
},
540547
"MTS_GAMBIT": {
541548
"inherits": ["Target"],
@@ -569,7 +576,7 @@
569576
"inherits": ["Target"],
570577
"progen": {"target": "nucleo-f030r8"},
571578
"detect_code": ["0725"],
572-
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
579+
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
573580
"default_build": "small"
574581
},
575582
"NUCLEO_F031K6": {
@@ -605,7 +612,7 @@
605612
"inherits": ["Target"],
606613
"progen": {"target": "nucleo-f070rb"},
607614
"detect_code": ["0755"],
608-
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
615+
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
609616
"default_build": "small"
610617
},
611618
"NUCLEO_F072RB": {
@@ -617,7 +624,7 @@
617624
"inherits": ["Target"],
618625
"progen": {"target": "nucleo-f072rb"},
619626
"detect_code": ["0730"],
620-
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
627+
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
621628
"default_build": "small"
622629
},
623630
"NUCLEO_F091RC": {
@@ -629,7 +636,7 @@
629636
"inherits": ["Target"],
630637
"progen": {"target": "nucleo-f091rc"},
631638
"detect_code": ["0750"],
632-
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
639+
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
633640
"default_build": "small"
634641
},
635642
"NUCLEO_F103RB": {

hal/targets/hal/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_K64F/storage_driver.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,10 @@ static const ARM_STORAGE_CAPABILITIES caps = {
212212
* 1, drivers may still complete asynchronous operations synchronously as
213213
* necessary--in which case they return a positive error code to indicate
214214
* synchronous completion. */
215-
#ifndef YOTTA_CFG_CONFIG_HARDWARE_MTD_ASYNC_OPS
215+
#ifndef STORAGE_DRIVER_CONFIG_HARDWARE_MTD_ASYNC_OPS
216216
.asynchronous_ops = 1,
217217
#else
218-
.asynchronous_ops = YOTTA_CFG_CONFIG_HARDWARE_MTD_ASYNC_OPS,
218+
.asynchronous_ops = STORAGE_DRIVER_CONFIG_HARDWARE_MTD_ASYNC_OPS,
219219
#endif
220220

221221
/* Enable chip-erase functionality if we own all of block-1. */

0 commit comments

Comments
 (0)