aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRocco Marco Guglielmi <roccomarco.guglielmi@live.com>2016-12-26 10:20:02 +0000
committerRocco Marco Guglielmi <roccomarco.guglielmi@live.com>2016-12-26 10:20:02 +0000
commitc6c56485d519d67db370ea1c3c247dc562e3d0d3 (patch)
treeaedd9e2eeae19d8a3c96fc1c4fe5b6ce85d4442a
parent4b1426b2deef33d987a06bcf964c4be6153746ad (diff)
downloadChibiOS-c6c56485d519d67db370ea1c3c247dc562e3d0d3.tar.gz
ChibiOS-c6c56485d519d67db370ea1c3c247dc562e3d0d3.tar.bz2
ChibiOS-c6c56485d519d67db370ea1c3c247dc562e3d0d3.zip
Fixed Bug #805
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9991 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/ports/STM32/STM32F0xx/hal_lld.h4
-rw-r--r--readme.txt2
2 files changed, 4 insertions, 2 deletions
diff --git a/os/hal/ports/STM32/STM32F0xx/hal_lld.h b/os/hal/ports/STM32/STM32F0xx/hal_lld.h
index 5f3c54b62..e3d3db5b3 100644
--- a/os/hal/ports/STM32/STM32F0xx/hal_lld.h
+++ b/os/hal/ports/STM32/STM32F0xx/hal_lld.h
@@ -610,6 +610,8 @@
#error "STM32_LSEDRV outside acceptable range ((0<<3)...(3<<3))"
#endif
+#else /* !STM32_LSE_ENABLED */
+
#if STM32_CECSW == STM32_CECSW_LSE
#error "LSE not enabled, required by STM32_CECSW"
#endif
@@ -618,8 +620,6 @@
#error "LSE not enabled, required by STM32_USART1SW"
#endif
-#else /* !STM32_LSE_ENABLED */
-
#if STM32_RTCSEL == STM32_RTCSEL_LSE
#error "LSE not enabled, required by STM32_RTCSEL"
#endif
diff --git a/readme.txt b/readme.txt
index f32db1aa5..9ef6bfa19 100644
--- a/readme.txt
+++ b/readme.txt
@@ -153,6 +153,8 @@
- RT: Merged RT4.
- NIL: Merged NIL2.
- NIL: Added STM32F7 demo.
+- HAL: Fixed misplaced else in STM32F0 port (bug #805)
+ (backported to 16.1.6).
- HAL: Fixed flash waiting state misconfiguration in STM32L4 port (bug #804)
(backported to 16.1.6).
- HAL: Added CR field to DAC configuration in STM32 port (bug #803)