Merged in slorquet/nuttx/stm32l4_uarts (pull request #155)

Enable and renames for 32l4 UARTs 4 and 5
This commit is contained in:
Gregory Nutt 2016-10-25 13:09:17 +00:00
commit 04c6319e32
2 changed files with 10 additions and 5 deletions

View File

@ -45,6 +45,8 @@ config STM32L4_STM32L476XX
select ARMV7M_HAVE_ITCM
select ARMV7M_HAVE_DTCM
select STM32L4_HAVE_USART3
select STM32L4_HAVE_UART4
select STM32L4_HAVE_UART5
config STM32L4_STM32L486XX
bool
@ -53,6 +55,9 @@ config STM32L4_STM32L486XX
select ARCH_HAVE_DPFPU # REVISIT
select ARMV7M_HAVE_ITCM
select ARMV7M_HAVE_DTCM
select STM32L4_HAVE_USART3
select STM32L4_HAVE_UART4
select STM32L4_HAVE_UART5
select STM32L4_FLASH_1024KB
choice
@ -425,7 +430,7 @@ config STM32L4_USART3
config STM32L4_UART4
bool "UART4"
default n
depends on STM32L4_HAVE_USART4
depends on STM32L4_HAVE_UART4
select ARCH_HAVE_SERIAL_TERMIOS
select UART4_SERIALDRIVER
select STM32L4_USART
@ -433,7 +438,7 @@ config STM32L4_UART4
config STM32L4_UART5
bool "UART5"
default n
depends on STM32L4_HAVE_USART5
depends on STM32L4_HAVE_UART5
select ARCH_HAVE_SERIAL_TERMIOS
select UART5_SERIALDRIVER
select STM32L4_USART
@ -2507,11 +2512,11 @@ config STM32L4_HAVE_USART3
bool
default n
config STM32L4_HAVE_USART4
config STM32L4_HAVE_UART4
bool
default n
config STM32L4_HAVE_USART5
config STM32L4_HAVE_UART5
bool
default n

View File

@ -96,7 +96,7 @@
# if defined(CONFIG_UART4_RXDMA) || defined(CONFIG_UART5_RXDMA)
# ifndef CONFIG_STM32L4_DMA2
# error STM32L4 USART4/5 receive DMA requires CONFIG_STM32L4_DMA2
# error STM32L4 UART4/5 receive DMA requires CONFIG_STM32L4_DMA2
# endif
# endif