aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-10-11 09:26:11 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-10-11 09:26:11 +0000
commitfed322ed3c650fa4d03c9bd920900f5652c5d856 (patch)
tree3c67057f72b5c63d80acb0e673597e848c111dc7
parentcd0ab49709bc57e93eb90c6bc4a45228c9d5c033 (diff)
downloadChibiOS-fed322ed3c650fa4d03c9bd920900f5652c5d856.tar.gz
ChibiOS-fed322ed3c650fa4d03c9bd920900f5652c5d856.tar.bz2
ChibiOS-fed322ed3c650fa4d03c9bd920900f5652c5d856.zip
fixed bug #648.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8354 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/ports/STM32/STM32F3xx/hal_lld.h8
-rw-r--r--readme.txt2
2 files changed, 2 insertions, 8 deletions
diff --git a/os/hal/ports/STM32/STM32F3xx/hal_lld.h b/os/hal/ports/STM32/STM32F3xx/hal_lld.h
index 3b9db8474..efedb4b9a 100644
--- a/os/hal/ports/STM32/STM32F3xx/hal_lld.h
+++ b/os/hal/ports/STM32/STM32F3xx/hal_lld.h
@@ -588,14 +588,6 @@
#error "HSI not enabled, required by STM32_I2C2SW"
#endif
-#if STM32_TIM1SW == STM32_TIM1SW_HSI
-#error "HSI not enabled, required by STM32_TIM1SW"
-#endif
-
-#if STM32_TIM8SW == STM32_TIM8SW_HSI
-#error "HSI not enabled, required by STM32_TIM8SW"
-#endif
-
#if (STM32_SW == STM32_SW_PLL) && (STM32_PLLSRC == STM32_PLLSRC_HSI)
#error "HSI not enabled, required by STM32_SW and STM32_PLLSRC"
#endif
diff --git a/readme.txt b/readme.txt
index 6ee4a77f3..6f16c60db 100644
--- a/readme.txt
+++ b/readme.txt
@@ -116,6 +116,8 @@
- HAL: Introduced support for TIM21 and TIM22 in STM32 ST driver.
- HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support
for STM32F030xC, STM32F070x6, STM32F070xB devices.
+- HAL: Fixed STM32F3xx HAL checking for non-existing macros (bug #648)
+ (backported to 3.0.3 and 2.6.10).
- HAL: Fixed error in STM32F030 EXT driver (bug #647)(backported to 3.0.3).
- VAR: Fixed _sbrk_r with incr == 0 should be valid (bug #645)(backported to
3.0.3 and 2.6.10).