git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10455 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2017-08-22 09:58:33 +00:00
parent f1e6a55322
commit bb48071bc5
2 changed files with 8 additions and 6 deletions

View File

@ -1935,11 +1935,11 @@
#if (STM32_SAI1SEL == STM32_SAI1SEL_OFF) || defined(__DOXYGEN__) #if (STM32_SAI1SEL == STM32_SAI1SEL_OFF) || defined(__DOXYGEN__)
#define STM32_SAI1CLK 0 #define STM32_SAI1CLK 0
#elif STM32_SAI1SEL == STM32_SAI1SEL_SAIPLL #elif STM32_SAI1SEL == STM32_SAI1SEL_SAIPLL
#define STM32_SAI1SEL STM32_PLLSAIDIVQ_CLKOUT #define STM32_SAI1CLK STM32_PLLSAIDIVQ_CLKOUT
#elif STM32_SAI1SEL == STM32_SAI1SEL_I2SPLL #elif STM32_SAI1SEL == STM32_SAI1SEL_I2SPLL
#define STM32_SAI1SEL STM32_PLLI2SDIVQ_CLKOUT #define STM32_SAI1CLK STM32_PLLI2SDIVQ_CLKOUT
#elif STM32_SAI1SEL == STM32_SAI1SEL_CKIN #elif STM32_SAI1SEL == STM32_SAI1SEL_CKIN
#define STM32_SAI1SEL 0 /* Unknown, would require a board value */ #define STM32_SAI1CLK 0 /* Unknown, would require a board value */
#else #else
#error "invalid source selected for SAI1 clock" #error "invalid source selected for SAI1 clock"
#endif #endif
@ -1950,11 +1950,11 @@
#if (STM32_SAI2SEL == STM32_SAI2SEL_OFF) || defined(__DOXYGEN__) #if (STM32_SAI2SEL == STM32_SAI2SEL_OFF) || defined(__DOXYGEN__)
#define STM32_SAI2CLK 0 #define STM32_SAI2CLK 0
#elif STM32_SAI2SEL == STM32_SAI2SEL_SAIPLL #elif STM32_SAI2SEL == STM32_SAI2SEL_SAIPLL
#define STM32_SAI2SEL STM32_PLLSAIDIVQ_CLKOUT #define STM32_SAI2CLK STM32_PLLSAIDIVQ_CLKOUT
#elif STM32_SAI2SEL == STM32_SAI2SEL_I2SPLL #elif STM32_SAI2SEL == STM32_SAI2SEL_I2SPLL
#define STM32_SAI2SEL STM32_PLLI2SDIVQ_CLKOUT #define STM32_SAI2CLK STM32_PLLI2SDIVQ_CLKOUT
#elif STM32_SAI2SEL == STM32_SAI2SEL_CKIN #elif STM32_SAI2SEL == STM32_SAI2SEL_CKIN
#define STM32_SAI2SEL 0 /* Unknown, would require a board value */ #define STM32_SAI2CLK 0 /* Unknown, would require a board value */
#else #else
#error "invalid source selected for SAI2 clock" #error "invalid source selected for SAI2 clock"
#endif #endif

View File

@ -93,6 +93,8 @@
dependencies and configuration directories. This makes possible dependencies and configuration directories. This makes possible
to have multiple non-conflicting makefiles in the same project. to have multiple non-conflicting makefiles in the same project.
Updated the various platform.mk implementing "smart build" mode. Updated the various platform.mk implementing "smart build" mode.
- HAL: Fixed wrong SAI1 and SAI2 clock selection (bug #873)
(backported to 17.6.1).
- HAL: Fixed invalid number of DMA channels on STM32L011 (bug #872) - HAL: Fixed invalid number of DMA channels on STM32L011 (bug #872)
(backported to 17.6.1). (backported to 17.6.1).
- HAL: Fixed STM32 USARTv2 serial incorrect buffer size declarations - HAL: Fixed STM32 USARTv2 serial incorrect buffer size declarations