diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig index 30336ce5e70..192cbe3f9d5 100644 --- a/arch/arm/src/stm32/Kconfig +++ b/arch/arm/src/stm32/Kconfig @@ -7335,7 +7335,7 @@ config STM32_SERIAL_RXDMA_BUFFER_SIZE Value given here will be rounded up to next multiple of 4 bytes. -config SERIAL_DISABLE_REORDERING +config STM32_SERIAL_DISABLE_REORDERING bool "Disable reordering of ttySx devices." default n ---help--- diff --git a/arch/arm/src/stm32/stm32_serial.c b/arch/arm/src/stm32/stm32_serial.c index 82f5223f2bb..68136f39581 100644 --- a/arch/arm/src/stm32/stm32_serial.c +++ b/arch/arm/src/stm32/stm32_serial.c @@ -2771,7 +2771,7 @@ void up_serialinit(void) #if CONSOLE_UART > 0 (void)uart_register("/dev/console", &uart_devs[CONSOLE_UART - 1]->dev); -#ifndef CONFIG_SERIAL_DISABLE_REORDERING +#ifndef CONFIG_STM32_SERIAL_DISABLE_REORDERING /* If not disabled, register the console UART to ttyS0 and exclude * it from initializing it further down */ @@ -2800,7 +2800,7 @@ void up_serialinit(void) continue; } -#ifndef CONFIG_SERIAL_DISABLE_REORDERING +#ifndef CONFIG_STM32_SERIAL_DISABLE_REORDERING /* Don't create a device for the console - we did that above */ if (uart_devs[i]->dev.isconsole) diff --git a/arch/arm/src/stm32f0/Kconfig b/arch/arm/src/stm32f0/Kconfig index 47bb27d9bdb..2e702e6d0a5 100644 --- a/arch/arm/src/stm32f0/Kconfig +++ b/arch/arm/src/stm32f0/Kconfig @@ -1470,6 +1470,24 @@ config USART8_RS485_DIR_POLARITY endif # STM32F0_USART8_SERIALDRIVER +menu "Serial Driver Configuration" + depends on STM32F0_SERIALDRIVER + +config STM32F0_SERIAL_DISABLE_REORDERING + bool "Disable reordering of ttySx devices." + default n + ---help--- + NuttX per default reorders the serial ports (/dev/ttySx) so that the + console is always on /dev/ttyS0. If more than one UART is in use this + can, however, have the side-effect that all port mappings + (hardware USART1 -> /dev/ttyS0) change if the console is moved to another + UART. This is in particular relevant if a project uses the USB console + in some configs and a serial console in other configs, but does not + want the side effect of having all serial port names change when just + the console is moved from serial to USB. + +endmenu # Serial Driver Configuration + if PM config STM32F0_PM_SERIAL_ACTIVITY diff --git a/arch/arm/src/stm32f0/stm32f0_serial.c b/arch/arm/src/stm32f0/stm32f0_serial.c index 1f0d6b65cf1..9ab124263ef 100644 --- a/arch/arm/src/stm32f0/stm32f0_serial.c +++ b/arch/arm/src/stm32f0/stm32f0_serial.c @@ -2427,7 +2427,7 @@ void up_serialinit(void) #if CONSOLE_USART > 0 (void)uart_register("/dev/console", &uart_devs[CONSOLE_USART - 1]->dev); -#ifndef CONFIG_SERIAL_DISABLE_REORDERING +#ifndef CONFIG_STM32F0_SERIAL_DISABLE_REORDERING /* If not disabled, register the console USART to ttyS0 and exclude * it from initializing it further down */ @@ -2456,7 +2456,7 @@ void up_serialinit(void) continue; } -#ifndef CONFIG_SERIAL_DISABLE_REORDERING +#ifndef CONFIG_STM32F0_SERIAL_DISABLE_REORDERING /* Don't create a device for the console - we did that above */ if (uart_devs[i]->dev.isconsole) diff --git a/arch/arm/src/stm32f7/Kconfig b/arch/arm/src/stm32f7/Kconfig index d641dcb06bf..82d39937592 100644 --- a/arch/arm/src/stm32f7/Kconfig +++ b/arch/arm/src/stm32f7/Kconfig @@ -1841,7 +1841,7 @@ config STM32F7_SERIAL_RXDMA_BUFFER_SIZE Value given here will be rounded up to next multiple of 32 bytes. -config SERIAL_DISABLE_REORDERING +config STM32F7_SERIAL_DISABLE_REORDERING bool "Disable reordering of ttySx devices." depends on STM32F7_USART1 || STM32F7_USART2 || STM32F7_USART3 || STM32F7_UART4 || STM32F7_UART5 || STM32F7_USART6 || STM32F7_UART7 || STM32F7_UART8 default n diff --git a/arch/arm/src/stm32f7/stm32_serial.c b/arch/arm/src/stm32f7/stm32_serial.c index 18629c0bba5..4537f4bf593 100644 --- a/arch/arm/src/stm32f7/stm32_serial.c +++ b/arch/arm/src/stm32f7/stm32_serial.c @@ -2761,7 +2761,7 @@ void up_serialinit(void) #if CONSOLE_UART > 0 (void)uart_register("/dev/console", &uart_devs[CONSOLE_UART - 1]->dev); -#ifndef CONFIG_SERIAL_DISABLE_REORDERING +#ifndef CONFIG_STM32F7_SERIAL_DISABLE_REORDERING /* If not disabled, register the console UART to ttyS0 and exclude * it from initializing it further down */ @@ -2790,7 +2790,7 @@ void up_serialinit(void) continue; } -#ifndef CONFIG_SERIAL_DISABLE_REORDERING +#ifndef CONFIG_STM32F7_SERIAL_DISABLE_REORDERING /* Don't create a device for the console - we did that above */ if (uart_devs[i]->dev.isconsole) diff --git a/arch/arm/src/stm32h7/Kconfig b/arch/arm/src/stm32h7/Kconfig index a498678c09d..486ae5ac935 100644 --- a/arch/arm/src/stm32h7/Kconfig +++ b/arch/arm/src/stm32h7/Kconfig @@ -529,7 +529,7 @@ config STM32H7_SERIAL_RXDMA_BUFFER_SIZE Value given here will be rounded up to next multiple of 32 bytes. -config SERIAL_DISABLE_REORDERING +config STM32H7_SERIAL_DISABLE_REORDERING bool "Disable reordering of ttySx devices." default n ---help--- diff --git a/arch/arm/src/stm32l4/Kconfig b/arch/arm/src/stm32l4/Kconfig index aa21b5172fc..d91d91755c1 100644 --- a/arch/arm/src/stm32l4/Kconfig +++ b/arch/arm/src/stm32l4/Kconfig @@ -3744,7 +3744,7 @@ config STM32L4_SERIAL_RXDMA_BUFFER_SIZE Value given here will be rounded up to next multiple of 32 bytes. -config SERIAL_DISABLE_REORDERING +config STM32L4_SERIAL_DISABLE_REORDERING bool "Disable reordering of ttySx devices." depends on STM32L4_USART1 || STM32L4_USART2 || STM32L4_USART3 || STM32L4_UART4 || STM32L4_UART5 default n diff --git a/arch/arm/src/stm32l4/stm32l4_serial.c b/arch/arm/src/stm32l4/stm32l4_serial.c index 9d75a187e87..12b89956e6c 100644 --- a/arch/arm/src/stm32l4/stm32l4_serial.c +++ b/arch/arm/src/stm32l4/stm32l4_serial.c @@ -2792,7 +2792,7 @@ void up_serialinit(void) #if CONSOLE_UART > 0 (void)uart_register("/dev/console", &uart_devs[CONSOLE_UART - 1]->dev); -#ifndef CONFIG_SERIAL_DISABLE_REORDERING +#ifndef CONFIG_STM32L4_SERIAL_DISABLE_REORDERING /* If not disabled, register the console UART to ttyS0 and exclude * it from initializing it further down */ @@ -2821,7 +2821,7 @@ void up_serialinit(void) continue; } -#ifndef CONFIG_SERIAL_DISABLE_REORDERING +#ifndef CONFIG_STM32L4_SERIAL_DISABLE_REORDERING /* Don't create a device for the console - we did that above */ if (uart_devs[i]->dev.isconsole) diff --git a/configs/nucleo-144/f722-nsh/defconfig b/configs/nucleo-144/f722-nsh/defconfig index 2953e64237a..e9f63fe3a2e 100644 --- a/configs/nucleo-144/f722-nsh/defconfig +++ b/configs/nucleo-144/f722-nsh/defconfig @@ -37,7 +37,7 @@ CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y -CONFIG_SERIAL_DISABLE_REORDERING=y +CONFIG_STM32F7_SERIAL_DISABLE_REORDERING=y CONFIG_SPI=y CONFIG_STACK_COLORATION=y CONFIG_START_DAY=30 diff --git a/configs/nucleo-144/f746-evalos/defconfig b/configs/nucleo-144/f746-evalos/defconfig index 63dd4fa8c9a..94ada7523b0 100644 --- a/configs/nucleo-144/f746-evalos/defconfig +++ b/configs/nucleo-144/f746-evalos/defconfig @@ -50,7 +50,7 @@ CONFIG_SCHED_HPWORK=y CONFIG_SCHED_LPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y -CONFIG_SERIAL_DISABLE_REORDERING=y +CONFIG_STM32F7_SERIAL_DISABLE_REORDERING=y CONFIG_SPI=y CONFIG_STACK_COLORATION=y CONFIG_START_DAY=30 diff --git a/configs/nucleo-144/f746-nsh/defconfig b/configs/nucleo-144/f746-nsh/defconfig index f63691d1216..814533e7c5e 100644 --- a/configs/nucleo-144/f746-nsh/defconfig +++ b/configs/nucleo-144/f746-nsh/defconfig @@ -1,15 +1,15 @@ # CONFIG_ARCH_FPU is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_NUCLEO_144=y -CONFIG_ARCH_BOARD="nucleo-144" -CONFIG_ARCH_BUTTONS=y -CONFIG_ARCH_CHIP_STM32F7=y -CONFIG_ARCH_CHIP_STM32F746ZG=y -CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH="arm" -CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y +CONFIG_ARCH_BOARD="nucleo-144" +CONFIG_ARCH_BOARD_NUCLEO_144=y +CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP_STM32F746ZG=y +CONFIG_ARCH_CHIP_STM32F7=y +CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_DCACHE=y +CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y CONFIG_ARMV7M_DTCM=y CONFIG_ARMV7M_ICACHE=y CONFIG_BOARD_LOOPSPERMSEC=43103 @@ -38,13 +38,13 @@ CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y -CONFIG_SERIAL_DISABLE_REORDERING=y CONFIG_SPI=y CONFIG_STACK_COLORATION=y CONFIG_START_DAY=30 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2015 CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y +CONFIG_STM32F7_SERIAL_DISABLE_REORDERING=y CONFIG_STM32F7_USART_BREAKS=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y diff --git a/configs/nucleo-144/f767-evalos/defconfig b/configs/nucleo-144/f767-evalos/defconfig index 8676932bcee..a2c60b7d2ec 100644 --- a/configs/nucleo-144/f767-evalos/defconfig +++ b/configs/nucleo-144/f767-evalos/defconfig @@ -4,15 +4,15 @@ # CONFIG_NSH_DISABLE_DATE is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_NUCLEO_144=y -CONFIG_ARCH_BOARD="nucleo-144" -CONFIG_ARCH_BUTTONS=y -CONFIG_ARCH_CHIP_STM32F7=y -CONFIG_ARCH_CHIP_STM32F767ZI=y -CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH="arm" -CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y +CONFIG_ARCH_BOARD="nucleo-144" +CONFIG_ARCH_BOARD_NUCLEO_144=y +CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP_STM32F767ZI=y +CONFIG_ARCH_CHIP_STM32F7=y +CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_DCACHE=y +CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y CONFIG_ARMV7M_DTCM=y CONFIG_ARMV7M_ICACHE=y CONFIG_BOARD_LOOPSPERMSEC=43103 @@ -21,8 +21,8 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_HELLOXX=y CONFIG_EXAMPLES_LEDS=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_MAX_TASKS=16 @@ -50,17 +50,17 @@ CONFIG_SCHED_HPWORK=y CONFIG_SCHED_LPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y -CONFIG_SERIAL_DISABLE_REORDERING=y CONFIG_SPI=y CONFIG_STACK_COLORATION=y CONFIG_START_DAY=30 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2015 CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y +CONFIG_STM32F7_SERIAL_DISABLE_REORDERING=y CONFIG_STM32F7_USART_BREAKS=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_USERLED_LOWER=y CONFIG_USERLED=y +CONFIG_USERLED_LOWER=y +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/nucleo-144/f767-nsh/defconfig b/configs/nucleo-144/f767-nsh/defconfig index c9f845e79a7..ba26dab1ab0 100644 --- a/configs/nucleo-144/f767-nsh/defconfig +++ b/configs/nucleo-144/f767-nsh/defconfig @@ -37,7 +37,7 @@ CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y -CONFIG_SERIAL_DISABLE_REORDERING=y +CONFIG_STM32F7_SERIAL_DISABLE_REORDERING=y CONFIG_SPI=y CONFIG_STACK_COLORATION=y CONFIG_START_DAY=30 diff --git a/configs/olimexino-stm32/can/defconfig b/configs/olimexino-stm32/can/defconfig index c555f7b1235..a010ce30e82 100644 --- a/configs/olimexino-stm32/can/defconfig +++ b/configs/olimexino-stm32/can/defconfig @@ -77,7 +77,6 @@ CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_SDCLONE_DISABLE=y -CONFIG_SERIAL_DISABLE_REORDERING=y CONFIG_SERIAL_TERMIOS=y CONFIG_STACK_COLORATION=y CONFIG_START_YEAR=2014 @@ -94,6 +93,7 @@ CONFIG_STM32_I2C_DYNTIMEO_STARTSTOP=10 CONFIG_STM32_I2C_DYNTIMEO_USECPERBYTE=40 CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PWR=y +CONFIG_STM32_SERIAL_DISABLE_REORDERING=y CONFIG_STM32_SPI2=y CONFIG_STM32_SPI_DMA=y CONFIG_STM32_TIM1=y diff --git a/configs/olimexino-stm32/composite/defconfig b/configs/olimexino-stm32/composite/defconfig index 1444d26e133..8aa26ca241d 100644 --- a/configs/olimexino-stm32/composite/defconfig +++ b/configs/olimexino-stm32/composite/defconfig @@ -91,7 +91,6 @@ CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_RTC=y CONFIG_SDCLONE_DISABLE=y -CONFIG_SERIAL_DISABLE_REORDERING=y CONFIG_SERIAL_TERMIOS=y CONFIG_STACK_COLORATION=y CONFIG_STM32_ADC1=y @@ -110,6 +109,7 @@ CONFIG_STM32_I2C_DYNTIMEO_STARTSTOP=10 CONFIG_STM32_I2C_DYNTIMEO_USECPERBYTE=40 CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PWR=y +CONFIG_STM32_SERIAL_DISABLE_REORDERING=y CONFIG_STM32_SPI1=y CONFIG_STM32_SPI2=y CONFIG_STM32_SPI_DMA=y diff --git a/configs/olimexino-stm32/nsh/defconfig b/configs/olimexino-stm32/nsh/defconfig index 4869a1da4dc..1e69d67100c 100644 --- a/configs/olimexino-stm32/nsh/defconfig +++ b/configs/olimexino-stm32/nsh/defconfig @@ -79,7 +79,6 @@ CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_RTC=y CONFIG_SDCLONE_DISABLE=y -CONFIG_SERIAL_DISABLE_REORDERING=y CONFIG_SERIAL_TERMIOS=y CONFIG_STACK_COLORATION=y CONFIG_STM32_ADC1=y @@ -98,6 +97,7 @@ CONFIG_STM32_I2C_DYNTIMEO_STARTSTOP=10 CONFIG_STM32_I2C_DYNTIMEO_USECPERBYTE=40 CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PWR=y +CONFIG_STM32_SERIAL_DISABLE_REORDERING=y CONFIG_STM32_SPI1=y CONFIG_STM32_SPI2=y CONFIG_STM32_SPI_DMA=y diff --git a/configs/olimexino-stm32/smallnsh/defconfig b/configs/olimexino-stm32/smallnsh/defconfig index 20b6213eea4..5c95f2a102a 100644 --- a/configs/olimexino-stm32/smallnsh/defconfig +++ b/configs/olimexino-stm32/smallnsh/defconfig @@ -71,7 +71,6 @@ CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPERIOD=100000 CONFIG_SCHED_HPWORKSTACKSIZE=758 CONFIG_SDCLONE_DISABLE=y -CONFIG_SERIAL_DISABLE_REORDERING=y CONFIG_STACK_COLORATION=y CONFIG_START_YEAR=2014 CONFIG_STM32_CAN1=y @@ -80,6 +79,7 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_FORCEPOWER=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PWR=y +CONFIG_STM32_SERIAL_DISABLE_REORDERING=y CONFIG_STM32_SPI2=y CONFIG_STM32_SPI_DMA=y CONFIG_STM32_TIM1=y diff --git a/configs/olimexino-stm32/tiny/defconfig b/configs/olimexino-stm32/tiny/defconfig index 5d9a32b260b..0eaf5ceb5a5 100644 --- a/configs/olimexino-stm32/tiny/defconfig +++ b/configs/olimexino-stm32/tiny/defconfig @@ -52,7 +52,6 @@ CONFIG_SCHED_HPWORKSTACKSIZE=758 CONFIG_SCHED_LPWORK=y CONFIG_SCHED_LPWORKSTACKSIZE=768 CONFIG_SDCLONE_DISABLE=y -CONFIG_SERIAL_DISABLE_REORDERING=y CONFIG_STACK_COLORATION=y CONFIG_START_YEAR=2014 CONFIG_STM32_CAN1=y @@ -62,6 +61,7 @@ CONFIG_STM32_FLOWCONTROL_BROKEN=y CONFIG_STM32_FORCEPOWER=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PWR=y +CONFIG_STM32_SERIAL_DISABLE_REORDERING=y CONFIG_STM32_SPI2=y CONFIG_STM32_SPI_DMA=y CONFIG_STM32_TIM1=y