ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1974 from simonqhughes/master 

cfstore flash-journal integration with config_system (Resubmitted)
pull/1964/merge
Bogdan Marinescu 2016-06-20 11:56:17 +03:00 committed by GitHub
parent ca2fd64722 f299b113bb
commit 76c8be692c
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hal/targets.json
View File

@ -535,7 +535,14 @@
"progen": {"target": "frdm-k64f"}, "progen": {"target": "frdm-k64f"},
"detect_code": ["0240"], "detect_code": ["0240"],
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES", "STORAGE"], "device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES", "STORAGE"],
"features": ["IPV4"] "features": ["IPV4"],
"config": {
"storage_driver_mode": {
"help": "Configuration parameter to select flash storage driver mode. 1 => async operation, 0 => sync operation",
"macro_name": "STORAGE_DRIVER_CONFIG_HARDWARE_MTD_ASYNC_OPS",
"value": 1
}
}
}, },
"MTS_GAMBIT": { "MTS_GAMBIT": {
"inherits": ["Target"], "inherits": ["Target"],

4
hal/targets/hal/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_K64F/storage_driver.c
View File

@ -212,10 +212,10 @@ static const ARM_STORAGE_CAPABILITIES caps = {
* 1, drivers may still complete asynchronous operations synchronously as * 1, drivers may still complete asynchronous operations synchronously as
* necessary--in which case they return a positive error code to indicate * necessary--in which case they return a positive error code to indicate
* synchronous completion. */ * synchronous completion. */
#ifndef YOTTA_CFG_CONFIG_HARDWARE_MTD_ASYNC_OPS #ifndef STORAGE_DRIVER_CONFIG_HARDWARE_MTD_ASYNC_OPS
.asynchronous_ops = 1, .asynchronous_ops = 1,
#else #else
.asynchronous_ops = YOTTA_CFG_CONFIG_HARDWARE_MTD_ASYNC_OPS, .asynchronous_ops = STORAGE_DRIVER_CONFIG_HARDWARE_MTD_ASYNC_OPS,
#endif #endif
/* Enable chip-erase functionality if we own all of block-1. */ /* Enable chip-erase functionality if we own all of block-1. */