diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-05-05 07:20:47 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-05-05 07:20:47 +0000 |
commit | 31e1c7be6d83211a10ce5ea9629ee466fb9bdd6c (patch) | |
tree | 63530718ac715ef9c6775e9f2fce0426061adca1 | |
parent | ad8290460d4f252fde3fcf435e525268ea0854df (diff) | |
download | ChibiOS-31e1c7be6d83211a10ce5ea9629ee466fb9bdd6c.tar.gz ChibiOS-31e1c7be6d83211a10ce5ea9629ee466fb9bdd6c.tar.bz2 ChibiOS-31e1c7be6d83211a10ce5ea9629ee466fb9bdd6c.zip |
Fixed bug 3523322.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4159 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r-- | readme.txt | 1 | ||||
-rw-r--r-- | testhal/LPC11xx/IRQ_STORM/halconf.h | 2 | ||||
-rw-r--r-- | testhal/STM32F1xx/I2C/mcuconf.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/readme.txt b/readme.txt index fef1cac36..5280282da 100644 --- a/readme.txt +++ b/readme.txt @@ -79,6 +79,7 @@ *****************************************************************************
*** 2.5.0 ***
+- FIX: Fixed three testhal builds fail (bug 3523322)(backported to 2.4.1).
- FIX: Fixed MAC driver functions with invalid name (bug 3522808)(backported
to 2.2.10 and 2.4.1).
- FIX: Fixed code coverage crashes with Linux/gcc-4.4.5 (bug 3522301)
diff --git a/testhal/LPC11xx/IRQ_STORM/halconf.h b/testhal/LPC11xx/IRQ_STORM/halconf.h index c9b3ad25a..08b919c73 100644 --- a/testhal/LPC11xx/IRQ_STORM/halconf.h +++ b/testhal/LPC11xx/IRQ_STORM/halconf.h @@ -73,7 +73,7 @@ * @brief Enables the GPT subsystem.
*/
#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
-#define HAL_USE_GPT FALSE
+#define HAL_USE_GPT TRUE
#endif
/**
diff --git a/testhal/STM32F1xx/I2C/mcuconf.h b/testhal/STM32F1xx/I2C/mcuconf.h index 7e3cd31f6..dd127bb50 100644 --- a/testhal/STM32F1xx/I2C/mcuconf.h +++ b/testhal/STM32F1xx/I2C/mcuconf.h @@ -102,7 +102,7 @@ /*
* I2C driver system settings.
*/
-#define STM32_I2C_USE_I2C1 FALSE
+#define STM32_I2C_USE_I2C1 TRUE
#define STM32_I2C_USE_I2C2 FALSE
#define STM32_I2C_USE_I2C3 FALSE
#define STM32_I2C_I2C1_IRQ_PRIORITY 10
|