diff options
| -rw-r--r-- | src/stm32/Kconfig | 6 | ||||
| -rw-r--r-- | src/stm32/serial.c | 2 | ||||
| -rw-r--r-- | src/stm32/stm32f0_serial.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/stm32/Kconfig b/src/stm32/Kconfig index 85c46373..2d1495c4 100644 --- a/src/stm32/Kconfig +++ b/src/stm32/Kconfig @@ -230,19 +230,19 @@ choice config STM32_SERIAL_USART1 bool "Serial (on USART1 PA10/PA9)" select SERIAL - config STM32_SERIAL_USART1_ALT + config STM32_SERIAL_USART1_ALT_PA15_PA14 bool "Serial (on USART1 PA15/PA14)" if LOW_LEVEL_OPTIONS && MACH_STM32F0 select SERIAL config STM32_SERIAL_USART2 bool "Serial (on USART2 PA3/PA2)" if LOW_LEVEL_OPTIONS select SERIAL - config STM32_SERIAL_USART2_ALT + config STM32_SERIAL_USART2_ALT_PA15_PA14 bool "Serial (on USART2 PA15/PA14)" if LOW_LEVEL_OPTIONS && MACH_STM32F0 select SERIAL config STM32_SERIAL_USART3 bool "Serial (on USART3 PB11/PB10)" if LOW_LEVEL_OPTIONS && !MACH_STM32F0 select SERIAL - config STM32_SERIAL_USART3_ALT + config STM32_SERIAL_USART3_ALT_PD9_PD8 depends on LOW_LEVEL_OPTIONS && (MACH_STM32F405 || MACH_STM32F407) bool "Serial (on USART3 PD9/PD8)" select SERIAL diff --git a/src/stm32/serial.c b/src/stm32/serial.c index 2e11304e..38432fa5 100644 --- a/src/stm32/serial.c +++ b/src/stm32/serial.c @@ -30,7 +30,7 @@ #define GPIO_Tx GPIO('B', 10) #define USARTx USART3 #define USARTx_IRQn USART3_IRQn -#elif CONFIG_STM32_SERIAL_USART3_ALT +#elif CONFIG_STM32_SERIAL_USART3_ALT_PD9_PD8 DECL_CONSTANT_STR("RESERVE_PINS_serial", "PD9,PD8"); #define GPIO_Rx GPIO('D', 9) #define GPIO_Tx GPIO('D', 8) diff --git a/src/stm32/stm32f0_serial.c b/src/stm32/stm32f0_serial.c index 4a299441..3fb7974a 100644 --- a/src/stm32/stm32f0_serial.c +++ b/src/stm32/stm32f0_serial.c @@ -18,7 +18,7 @@ #define GPIO_Tx GPIO('A', 9) #define USARTx USART1 #define USARTx_IRQn USART1_IRQn -#elif CONFIG_STM32_SERIAL_USART1_ALT +#elif CONFIG_STM32_SERIAL_USART1_ALT_PA15_PA14 DECL_CONSTANT_STR("RESERVE_PINS_serial", "PA15,PA14"); #define GPIO_Rx GPIO('A', 15) #define GPIO_Tx GPIO('A', 14) @@ -30,7 +30,7 @@ #define GPIO_Tx GPIO('A', 2) #define USARTx USART2 #define USARTx_IRQn USART2_IRQn -#elif CONFIG_STM32_SERIAL_USART2_ALT +#elif CONFIG_STM32_SERIAL_USART2_ALT_PA15_PA14 DECL_CONSTANT_STR("RESERVE_PINS_serial", "PA15,PA14"); #define GPIO_Rx GPIO('A', 15) #define GPIO_Tx GPIO('A', 14) |