Skip to content

Commit 3f5ab2f

Browse files
authored
Revert "cfstore flash-journal integration with config_system (Resubmitted)"
1 parent 76c8be6 commit 3f5ab2f

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

hal/targets.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -535,14 +535,7 @@
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"],
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-
}
538+
"features": ["IPV4"]
546539
},
547540
"MTS_GAMBIT": {
548541
"inherits": ["Target"],

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 STORAGE_DRIVER_CONFIG_HARDWARE_MTD_ASYNC_OPS
215+
#ifndef YOTTA_CFG_CONFIG_HARDWARE_MTD_ASYNC_OPS
216216
.asynchronous_ops = 1,
217217
#else
218-
.asynchronous_ops = STORAGE_DRIVER_CONFIG_HARDWARE_MTD_ASYNC_OPS,
218+
.asynchronous_ops = YOTTA_CFG_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)