From 45f5d30e2eccd1da4f7e5253d1ac637d4cecd02d Mon Sep 17 00:00:00 2001 From: no1wudi <757509347@qq.com> Date: Thu, 23 Mar 2017 13:38:26 +0800 Subject: [PATCH 1/2] fix compile error when disabled the flash data cache corruption for stm32 f1xx --- arch/arm/src/stm32/stm32_flash.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/src/stm32/stm32_flash.c b/arch/arm/src/stm32/stm32_flash.c index 8ba48a82623..f955085a27b 100644 --- a/arch/arm/src/stm32/stm32_flash.c +++ b/arch/arm/src/stm32/stm32_flash.c @@ -127,6 +127,7 @@ static void flash_lock(void) { modifyreg32(STM32_FLASH_CR, 0, FLASH_CR_LOCK); } +#if defined(CONFIG_STM32_FLASH_WORKAROUND_DATA_CACHE_CORRUPTION_ON_RWW) static void data_cache_disable(void) { @@ -144,6 +145,7 @@ static void data_cache_enable(void) modifyreg32(STM32_FLASH_ACR, 0, FLASH_ACR_DCEN); } +#endif /************************************************************************************ * Public Functions ************************************************************************************/ From fd76a3db05d18989f1c49fb539b62ef3e22d8ae7 Mon Sep 17 00:00:00 2001 From: no1wudi <757509347@qq.com> Date: Fri, 24 Mar 2017 08:52:46 +0800 Subject: [PATCH 2/2] fix spacing --- arch/arm/src/stm32/stm32_flash.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/src/stm32/stm32_flash.c b/arch/arm/src/stm32/stm32_flash.c index 0267d58eb25..85a3fb18040 100644 --- a/arch/arm/src/stm32/stm32_flash.c +++ b/arch/arm/src/stm32/stm32_flash.c @@ -127,7 +127,6 @@ static void flash_lock(void) { modifyreg32(STM32_FLASH_CR, 0, FLASH_CR_LOCK); } -#if defined(CONFIG_STM32_FLASH_WORKAROUND_DATA_CACHE_CORRUPTION_ON_RWW) #if defined(CONFIG_STM32_FLASH_WORKAROUND_DATA_CACHE_CORRUPTION_ON_RWW) static void data_cache_disable(void) @@ -145,9 +144,8 @@ static void data_cache_enable(void) modifyreg32(STM32_FLASH_ACR, 0, FLASH_ACR_DCEN); } -#endif +#endif /* defined(CONFIG_STM32_FLASH_WORKAROUND_DATA_CACHE_CORRUPTION_ON_RWW) */ -#endif /************************************************************************************ * Public Functions ************************************************************************************/