From 8f6957e195236b859ee60bde46058e6742828300 Mon Sep 17 00:00:00 2001 From: Simon Hughes Date: Fri, 17 Jun 2016 14:14:11 +0100 Subject: [PATCH 1/3] cfstore flash-journal integration sync mode test fixes. --- hal/targets.json | 17 ++++++++++++----- .../TARGET_K64F/storage_driver.c | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/hal/targets.json b/hal/targets.json index 21c7382adae..e8ec3d80e44 100644 --- a/hal/targets.json +++ b/hal/targets.json @@ -535,7 +535,14 @@ "progen": {"target": "frdm-k64f"}, "detect_code": ["0240"], "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": { "inherits": ["Target"], @@ -569,7 +576,7 @@ "inherits": ["Target"], "progen": {"target": "nucleo-f030r8"}, "detect_code": ["0725"], - "device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], + "device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], "default_build": "small" }, "NUCLEO_F031K6": { @@ -605,7 +612,7 @@ "inherits": ["Target"], "progen": {"target": "nucleo-f070rb"}, "detect_code": ["0755"], - "device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], + "device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], "default_build": "small" }, "NUCLEO_F072RB": { @@ -617,7 +624,7 @@ "inherits": ["Target"], "progen": {"target": "nucleo-f072rb"}, "detect_code": ["0730"], - "device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], + "device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], "default_build": "small" }, "NUCLEO_F091RC": { @@ -629,7 +636,7 @@ "inherits": ["Target"], "progen": {"target": "nucleo-f091rc"}, "detect_code": ["0750"], - "device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], + "device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], "default_build": "small" }, "NUCLEO_F103RB": { diff --git a/hal/targets/hal/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_K64F/storage_driver.c b/hal/targets/hal/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_K64F/storage_driver.c index e98f14ee40b..79c757ed65f 100644 --- a/hal/targets/hal/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_K64F/storage_driver.c +++ b/hal/targets/hal/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_K64F/storage_driver.c @@ -212,10 +212,10 @@ static const ARM_STORAGE_CAPABILITIES caps = { * 1, drivers may still complete asynchronous operations synchronously as * necessary--in which case they return a positive error code to indicate * synchronous completion. */ -#ifndef YOTTA_CFG_CONFIG_HARDWARE_MTD_ASYNC_OPS +#ifndef STORAGE_DRIVER_CONFIG_HARDWARE_MTD_ASYNC_OPS .asynchronous_ops = 1, #else - .asynchronous_ops = YOTTA_CFG_CONFIG_HARDWARE_MTD_ASYNC_OPS, + .asynchronous_ops = STORAGE_DRIVER_CONFIG_HARDWARE_MTD_ASYNC_OPS, #endif /* Enable chip-erase functionality if we own all of block-1. */ From e5c081e23fd3cacf82e891005807761db72cffdf Mon Sep 17 00:00:00 2001 From: Simon Hughes Date: Fri, 17 Jun 2016 14:29:01 +0100 Subject: [PATCH 2/3] cfstore flash mode set to sync by default --- hal/targets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hal/targets.json b/hal/targets.json index e8ec3d80e44..0b833bfc4f6 100644 --- a/hal/targets.json +++ b/hal/targets.json @@ -540,7 +540,7 @@ "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 + "value": 0 } } }, From 6d76dacef72652a1f35603fb3c97fcf0fcec7e2e Mon Sep 17 00:00:00 2001 From: Simon Hughes Date: Fri, 17 Jun 2016 14:56:09 +0100 Subject: [PATCH 3/3] cfstore flash mode set to async by default --- hal/targets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hal/targets.json b/hal/targets.json index 0b833bfc4f6..e8ec3d80e44 100644 --- a/hal/targets.json +++ b/hal/targets.json @@ -540,7 +540,7 @@ "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": 0 + "value": 1 } } },