From f81c1de1302328dd3799bf291d1c88759dabd5de Mon Sep 17 00:00:00 2001 From: Reto Schneider Date: Thu, 3 Oct 2024 22:31:39 +0200 Subject: [PATCH] drivers: serial: Sort CMake and Kconfig files alphabetically By sorting the lines alphabetically, merge conflicts can be reduced. Signed-off-by: Reto Schneider --- drivers/serial/CMakeLists.txt | 129 ++++++++++++----------- drivers/serial/Kconfig | 189 ++++++++++++---------------------- 2 files changed, 130 insertions(+), 188 deletions(-) diff --git a/drivers/serial/CMakeLists.txt b/drivers/serial/CMakeLists.txt index f264370f9a8..6dabc0e8e3e 100644 --- a/drivers/serial/CMakeLists.txt +++ b/drivers/serial/CMakeLists.txt @@ -3,29 +3,87 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/uart.h) zephyr_library() -zephyr_library_sources_ifdef(CONFIG_UART_ALTERA_JTAG uart_altera_jtag.c) + +# zephyr-keep-sorted-start +zephyr_library_sources_ifdef(CONFIG_SERIAL_TEST serial_test.c) +zephyr_library_sources_ifdef(CONFIG_UART_ASYNC_RX_HELPER uart_async_rx.c) +zephyr_library_sources_ifdef(CONFIG_UART_ASYNC_TO_INT_DRIVEN_API uart_async_to_irq.c) +zephyr_library_sources_ifdef(CONFIG_USB_CDC_ACM ${ZEPHYR_BASE}/misc/empty_file.c) +# zephyr-keep-sorted-stop + +# zephyr-keep-sorted-start +zephyr_library_sources_ifdef(CONFIG_LEUART_GECKO leuart_gecko.c) +zephyr_library_sources_ifdef(CONFIG_SERIAL_ESP32_USB serial_esp32_usb.c) zephyr_library_sources_ifdef(CONFIG_UART_ALTERA uart_altera.c) -zephyr_library_sources_ifdef(CONFIG_UART_TELINK_B91 uart_b91.c) -zephyr_library_sources_ifdef(CONFIG_UART_IMX uart_imx.c) -zephyr_library_sources_ifdef(CONFIG_UART_ITE_IT8XXX2 uart_ite_it8xxx2.c) +zephyr_library_sources_ifdef(CONFIG_UART_ALTERA_JTAG uart_altera_jtag.c) +zephyr_library_sources_ifdef(CONFIG_UART_APBUART uart_apbuart.c) +zephyr_library_sources_ifdef(CONFIG_UART_BCM2711_MU uart_bcm2711.c) +zephyr_library_sources_ifdef(CONFIG_UART_BT uart_bt.c) zephyr_library_sources_ifdef(CONFIG_UART_CC13XX_CC26XX uart_cc13xx_cc26xx.c) zephyr_library_sources_ifdef(CONFIG_UART_CC32XX uart_cc32xx.c) +zephyr_library_sources_ifdef(CONFIG_UART_CDNS uart_cdns.c) zephyr_library_sources_ifdef(CONFIG_UART_CMSDK_APB uart_cmsdk_apb.c) +zephyr_library_sources_ifdef(CONFIG_UART_EFINIX_SAPPIHIRE uart_efinix_sapphire.c) +zephyr_library_sources_ifdef(CONFIG_UART_EMUL uart_emul.c) +zephyr_library_sources_ifdef(CONFIG_UART_ENE_KB1200 uart_ene_kb1200.c) zephyr_library_sources_ifdef(CONFIG_UART_ESP32 uart_esp32.c) -zephyr_library_sources_ifdef(CONFIG_SERIAL_ESP32_USB serial_esp32_usb.c) -zephyr_library_sources_ifdef(CONFIG_UART_SIFIVE uart_sifive.c) zephyr_library_sources_ifdef(CONFIG_UART_GECKO uart_gecko.c) -zephyr_library_sources_ifdef(CONFIG_LEUART_GECKO leuart_gecko.c) +zephyr_library_sources_ifdef(CONFIG_UART_HOSTLINK uart_hostlink.c) +zephyr_library_sources_ifdef(CONFIG_UART_IMX uart_imx.c) +zephyr_library_sources_ifdef(CONFIG_UART_INFINEON_CAT1 uart_ifx_cat1.c) +zephyr_library_sources_ifdef(CONFIG_UART_INTEL_LW uart_intel_lw.c) +zephyr_library_sources_ifdef(CONFIG_UART_ITE_IT8XXX2 uart_ite_it8xxx2.c) +zephyr_library_sources_ifdef(CONFIG_UART_LITEX uart_litex.c) zephyr_library_sources_ifdef(CONFIG_UART_LPC11U6X uart_lpc11u6x.c) +zephyr_library_sources_ifdef(CONFIG_UART_MAX32 uart_max32.c) zephyr_library_sources_ifdef(CONFIG_UART_MCUX uart_mcux.c) zephyr_library_sources_ifdef(CONFIG_UART_MCUX_FLEXCOMM uart_mcux_flexcomm.c) zephyr_library_sources_ifdef(CONFIG_UART_MCUX_IUART uart_mcux_iuart.c) -zephyr_library_sources_ifdef(CONFIG_UART_MCUX_LPUART uart_mcux_lpuart.c) zephyr_library_sources_ifdef(CONFIG_UART_MCUX_LPSCI uart_mcux_lpsci.c) +zephyr_library_sources_ifdef(CONFIG_UART_MCUX_LPUART uart_mcux_lpuart.c) zephyr_library_sources_ifdef(CONFIG_UART_MIV uart_miv.c) zephyr_library_sources_ifdef(CONFIG_UART_MSP432P4XX uart_msp432p4xx.c) -zephyr_library_sources_ifdef(CONFIG_UART_NS16550 uart_ns16550.c) +zephyr_library_sources_ifdef(CONFIG_UART_NEORV32 uart_neorv32.c) +zephyr_library_sources_ifdef(CONFIG_UART_NPCX uart_npcx.c) zephyr_library_sources_ifdef(CONFIG_UART_NRFX_UART uart_nrfx_uart.c) +zephyr_library_sources_ifdef(CONFIG_UART_NS16550 uart_ns16550.c) +zephyr_library_sources_ifdef(CONFIG_UART_NUMAKER uart_numaker.c) +zephyr_library_sources_ifdef(CONFIG_UART_NUMICRO uart_numicro.c) +zephyr_library_sources_ifdef(CONFIG_UART_NXP_S32_LINFLEXD uart_nxp_s32_linflexd.c) +zephyr_library_sources_ifdef(CONFIG_UART_OPENTITAN uart_opentitan.c) +zephyr_library_sources_ifdef(CONFIG_UART_PIPE uart_pipe.c) +zephyr_library_sources_ifdef(CONFIG_UART_PL011 uart_pl011.c) +zephyr_library_sources_ifdef(CONFIG_UART_PSOC6 uart_psoc6.c) +zephyr_library_sources_ifdef(CONFIG_UART_QUICKLOGIC_USBSERIALPORT_S3B uart_ql_usbserialport_s3b.c) +zephyr_library_sources_ifdef(CONFIG_UART_RA8_SCI_B uart_renesas_ra8_sci_b.c) +zephyr_library_sources_ifdef(CONFIG_UART_RCAR uart_rcar.c) +zephyr_library_sources_ifdef(CONFIG_UART_RENESAS_RA uart_renesas_ra.c) +zephyr_library_sources_ifdef(CONFIG_UART_RPI_PICO_PIO uart_rpi_pico_pio.c) +zephyr_library_sources_ifdef(CONFIG_UART_RTT_DRIVER uart_rtt.c) +zephyr_library_sources_ifdef(CONFIG_UART_RV32M1_LPUART uart_rv32m1_lpuart.c) +zephyr_library_sources_ifdef(CONFIG_UART_RZT2M uart_rzt2m.c) +zephyr_library_sources_ifdef(CONFIG_UART_SAM uart_sam.c) +zephyr_library_sources_ifdef(CONFIG_UART_SAM0 uart_sam0.c) +zephyr_library_sources_ifdef(CONFIG_UART_SCI_RA uart_renesas_ra_sci.c) +zephyr_library_sources_ifdef(CONFIG_UART_SEDI uart_sedi.c) +zephyr_library_sources_ifdef(CONFIG_UART_SI32_USART uart_si32_usart.c) +zephyr_library_sources_ifdef(CONFIG_UART_SIFIVE uart_sifive.c) +zephyr_library_sources_ifdef(CONFIG_UART_SMARTBOND uart_smartbond.c) +zephyr_library_sources_ifdef(CONFIG_UART_STELLARIS uart_stellaris.c) +zephyr_library_sources_ifdef(CONFIG_UART_STM32 uart_stm32.c) +zephyr_library_sources_ifdef(CONFIG_UART_SY1XX uart_sy1xx.c) +zephyr_library_sources_ifdef(CONFIG_UART_TELINK_B91 uart_b91.c) +zephyr_library_sources_ifdef(CONFIG_UART_XEC uart_mchp_xec.c) +zephyr_library_sources_ifdef(CONFIG_UART_XEN_HVC uart_hvc_xen.c) +zephyr_library_sources_ifdef(CONFIG_UART_XEN_HVC_CONSOLEIO uart_hvc_xen_consoleio.c) +zephyr_library_sources_ifdef(CONFIG_UART_XLNX_PS uart_xlnx_ps.c) +zephyr_library_sources_ifdef(CONFIG_UART_XLNX_UARTLITE uart_xlnx_uartlite.c) +zephyr_library_sources_ifdef(CONFIG_UART_XMC4XXX uart_xmc4xxx.c) +zephyr_library_sources_ifdef(CONFIG_USART_GD32 usart_gd32.c) +zephyr_library_sources_ifdef(CONFIG_USART_SAM usart_sam.c) +zephyr_library_sources_ifdef(CONFIG_USERSPACE uart_handlers.c) +# zephyr-keep-sorted-stop + if (CONFIG_UART_NRFX_UARTE) if (CONFIG_UART_NRFX_UARTE_LEGACY_SHIM) zephyr_library_sources(uart_nrfx_uarte.c) @@ -33,53 +91,6 @@ if (CONFIG_UART_NRFX_UARTE) zephyr_library_sources(uart_nrfx_uarte2.c) endif() endif() -zephyr_library_sources_ifdef(CONFIG_UART_NUMICRO uart_numicro.c) -zephyr_library_sources_ifdef(CONFIG_UART_SAM uart_sam.c) -zephyr_library_sources_ifdef(CONFIG_USART_SAM usart_sam.c) -zephyr_library_sources_ifdef(CONFIG_UART_STELLARIS uart_stellaris.c) -zephyr_library_sources_ifdef(CONFIG_UART_STM32 uart_stm32.c) -zephyr_library_sources_ifdef(CONFIG_UART_SAM0 uart_sam0.c) -zephyr_library_sources_ifdef(CONFIG_UART_PSOC6 uart_psoc6.c) -zephyr_library_sources_ifdef(CONFIG_UART_PL011 uart_pl011.c) -zephyr_library_sources_ifdef(CONFIG_UART_QUICKLOGIC_USBSERIALPORT_S3B uart_ql_usbserialport_s3b.c) -zephyr_library_sources_ifdef(CONFIG_UART_RV32M1_LPUART uart_rv32m1_lpuart.c) -zephyr_library_sources_ifdef(CONFIG_UART_RPI_PICO_PIO uart_rpi_pico_pio.c) -zephyr_library_sources_ifdef(CONFIG_UART_LITEX uart_litex.c) -zephyr_library_sources_ifdef(CONFIG_UART_RTT_DRIVER uart_rtt.c) -zephyr_library_sources_ifdef(CONFIG_UART_XLNX_PS uart_xlnx_ps.c) -zephyr_library_sources_ifdef(CONFIG_UART_XLNX_UARTLITE uart_xlnx_uartlite.c) -zephyr_library_sources_ifdef(CONFIG_UART_XMC4XXX uart_xmc4xxx.c) -zephyr_library_sources_ifdef(CONFIG_UART_NPCX uart_npcx.c) -zephyr_library_sources_ifdef(CONFIG_UART_APBUART uart_apbuart.c) -zephyr_library_sources_ifdef(CONFIG_USB_CDC_ACM ${ZEPHYR_BASE}/misc/empty_file.c) -zephyr_library_sources_ifdef(CONFIG_UART_RCAR uart_rcar.c) -zephyr_library_sources_ifdef(CONFIG_UART_XEC uart_mchp_xec.c) -zephyr_library_sources_ifdef(CONFIG_UART_NEORV32 uart_neorv32.c) -zephyr_library_sources_ifdef(CONFIG_USART_GD32 usart_gd32.c) -zephyr_library_sources_ifdef(CONFIG_UART_XEN_HVC uart_hvc_xen.c) -zephyr_library_sources_ifdef(CONFIG_UART_XEN_HVC_CONSOLEIO uart_hvc_xen_consoleio.c) -zephyr_library_sources_ifdef(CONFIG_UART_INFINEON_CAT1 uart_ifx_cat1.c) -zephyr_library_sources_ifdef(CONFIG_UART_PIPE uart_pipe.c) -zephyr_library_sources_ifdef(CONFIG_UART_SMARTBOND uart_smartbond.c) -zephyr_library_sources_ifdef(CONFIG_UART_NXP_S32_LINFLEXD uart_nxp_s32_linflexd.c) -zephyr_library_sources_ifdef(CONFIG_UART_CDNS uart_cdns.c) -zephyr_library_sources_ifdef(CONFIG_UART_OPENTITAN uart_opentitan.c) -zephyr_library_sources_ifdef(CONFIG_UART_HOSTLINK uart_hostlink.c) -zephyr_library_sources_ifdef(CONFIG_UART_EMUL uart_emul.c) -zephyr_library_sources_ifdef(CONFIG_UART_NUMAKER uart_numaker.c) -zephyr_library_sources_ifdef(CONFIG_UART_EFINIX_SAPPIHIRE uart_efinix_sapphire.c) -zephyr_library_sources_ifdef(CONFIG_UART_SEDI uart_sedi.c) -zephyr_library_sources_ifdef(CONFIG_UART_MAX32 uart_max32.c) -zephyr_library_sources_ifdef(CONFIG_UART_BCM2711_MU uart_bcm2711.c) -zephyr_library_sources_ifdef(CONFIG_UART_INTEL_LW uart_intel_lw.c) -zephyr_library_sources_ifdef(CONFIG_UART_RENESAS_RA uart_renesas_ra.c) -zephyr_library_sources_ifdef(CONFIG_UART_ENE_KB1200 uart_ene_kb1200.c) -zephyr_library_sources_ifdef(CONFIG_UART_RZT2M uart_rzt2m.c) -zephyr_library_sources_ifdef(CONFIG_UART_RA8_SCI_B uart_renesas_ra8_sci_b.c) -zephyr_library_sources_ifdef(CONFIG_UART_SI32_USART uart_si32_usart.c) -zephyr_library_sources_ifdef(CONFIG_USERSPACE uart_handlers.c) -zephyr_library_sources_ifdef(CONFIG_UART_SCI_RA uart_renesas_ra_sci.c) -zephyr_library_sources_ifdef(CONFIG_UART_SY1XX uart_sy1xx.c) if(CONFIG_UART_NATIVE_POSIX) zephyr_library_compile_definitions(NO_POSIX_CHEATS) @@ -100,9 +111,3 @@ if(CONFIG_UART_NATIVE_TTY) target_sources(native_simulator INTERFACE uart_native_tty_bottom.c) endif() endif() - -zephyr_library_sources_ifdef(CONFIG_UART_BT uart_bt.c) - -zephyr_library_sources_ifdef(CONFIG_SERIAL_TEST serial_test.c) -zephyr_library_sources_ifdef(CONFIG_UART_ASYNC_RX_HELPER uart_async_rx.c) -zephyr_library_sources_ifdef(CONFIG_UART_ASYNC_TO_INT_DRIVEN_API uart_async_to_irq.c) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 673e38671f2..a8b20fe2877 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -150,137 +150,74 @@ config UART_ASYNC_TO_INT_DRIVEN_RX_TIMEOUT comment "Serial Drivers" -rsource "Kconfig.b91" - -rsource "Kconfig.ns16550" - -rsource "Kconfig.mcux" - -rsource "Kconfig.mcux_flexcomm" - -rsource "Kconfig.mcux_iuart" - -rsource "Kconfig.mcux_lpsci" - -rsource "Kconfig.mcux_lpuart" - -rsource "Kconfig.miv" - -rsource "Kconfig.imx" - -rsource "Kconfig.it8xxx2" - -rsource "Kconfig.stellaris" - -rsource "Kconfig.native_posix" - -rsource "Kconfig.usart_sam" - -rsource "Kconfig.uart_sam" - -rsource "Kconfig.stm32" - -rsource "Kconfig.nrfx" - -rsource "Kconfig.altera_jtag" - -rsource "Kconfig.cc13xx_cc26xx" - -rsource "Kconfig.cc32xx" - -rsource "Kconfig.cmsdk_apb" - -rsource "Kconfig.sifive" - -rsource "Kconfig.esp32" - -rsource "Kconfig.gecko" - -rsource "Kconfig.leuart_gecko" - -rsource "Kconfig.msp432p4xx" - -rsource "Kconfig.numicro" - -rsource "Kconfig.sam0" - -rsource "Kconfig.psoc6" - -rsource "Kconfig.pl011" - -rsource "Kconfig.ql_usbserialport_s3b" - -rsource "Kconfig.rv32m1_lpuart" - -rsource "Kconfig.rpi_pico" - -rsource "Kconfig.litex" - -rsource "Kconfig.rtt" - -rsource "Kconfig.bt" - -rsource "Kconfig.xlnx" - -rsource "Kconfig.xmc4xxx" - -rsource "Kconfig.lpc11u6x" - -rsource "Kconfig.npcx" - -rsource "Kconfig.apbuart" - -rsource "Kconfig.rcar" - -rsource "Kconfig.xec" - -rsource "Kconfig.gd32" - -rsource "Kconfig.test" - -rsource "Kconfig.neorv32" - -rsource "Kconfig.xen" - -rsource "Kconfig.ifx_cat1" - -rsource "Kconfig.smartbond" - -rsource "Kconfig.nxp_s32" - -rsource "Kconfig.cdns" - -rsource "Kconfig.opentitan" - +# zephyr-keep-sorted-start rsource "Kconfig.altera" - -rsource "Kconfig.hostlink" - -rsource "Kconfig.emul" - -rsource "Kconfig.native_tty" - -rsource "Kconfig.numaker" - -rsource "Kconfig.efinix_sapphire" - -rsource "Kconfig.sedi" - -rsource "Kconfig.max32" - +rsource "Kconfig.altera_jtag" +rsource "Kconfig.apbuart" +rsource "Kconfig.b91" rsource "Kconfig.bcm2711" - -rsource "Kconfig.intel_lw" - -rsource "Kconfig.renesas_ra" - +rsource "Kconfig.bt" +rsource "Kconfig.cc13xx_cc26xx" +rsource "Kconfig.cc32xx" +rsource "Kconfig.cdns" +rsource "Kconfig.cmsdk_apb" +rsource "Kconfig.efinix_sapphire" +rsource "Kconfig.emul" rsource "Kconfig.ene" - -rsource "Kconfig.rzt2m" - +rsource "Kconfig.esp32" +rsource "Kconfig.gd32" +rsource "Kconfig.gecko" +rsource "Kconfig.hostlink" +rsource "Kconfig.ifx_cat1" +rsource "Kconfig.imx" +rsource "Kconfig.intel_lw" +rsource "Kconfig.it8xxx2" +rsource "Kconfig.leuart_gecko" +rsource "Kconfig.litex" +rsource "Kconfig.lpc11u6x" +rsource "Kconfig.max32" +rsource "Kconfig.mcux" +rsource "Kconfig.mcux_flexcomm" +rsource "Kconfig.mcux_iuart" +rsource "Kconfig.mcux_lpsci" +rsource "Kconfig.mcux_lpuart" +rsource "Kconfig.miv" +rsource "Kconfig.msp432p4xx" +rsource "Kconfig.native_posix" +rsource "Kconfig.native_tty" +rsource "Kconfig.neorv32" +rsource "Kconfig.npcx" +rsource "Kconfig.nrfx" +rsource "Kconfig.ns16550" +rsource "Kconfig.numaker" +rsource "Kconfig.numicro" +rsource "Kconfig.nxp_s32" +rsource "Kconfig.opentitan" +rsource "Kconfig.pl011" +rsource "Kconfig.psoc6" +rsource "Kconfig.ql_usbserialport_s3b" +rsource "Kconfig.rcar" +rsource "Kconfig.renesas_ra" rsource "Kconfig.renesas_ra8" - +rsource "Kconfig.rpi_pico" +rsource "Kconfig.rtt" +rsource "Kconfig.rv32m1_lpuart" +rsource "Kconfig.rzt2m" +rsource "Kconfig.sam0" +rsource "Kconfig.sedi" +rsource "Kconfig.sifive" +rsource "Kconfig.smartbond" +rsource "Kconfig.stellaris" +rsource "Kconfig.stm32" rsource "Kconfig.sy1xx" +rsource "Kconfig.test" +rsource "Kconfig.uart_sam" +rsource "Kconfig.usart_sam" +rsource "Kconfig.xec" +rsource "Kconfig.xen" +rsource "Kconfig.xlnx" +rsource "Kconfig.xmc4xxx" +# zephyr-keep-sorted-stop source "drivers/serial/Kconfig.si32"