Skip to content

Commit 582c990

Browse files
rettichschnidirettichschnidi
committed
drivers: serial: Sort CMake and Kconfig files alphabetically
By sorting the lines alphabetically, merge conflicts can be reduced. Signed-off-by: Reto Schneider <[email protected]>
1 parent 73a3438 commit 582c990

File tree

2 files changed

+117
-175
lines changed

2 files changed

+117
-175
lines changed

‎drivers/serial/CMakeLists.txt‎

Lines changed: 65 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -3,83 +3,94 @@
33
zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/uart.h)
44

55
zephyr_library()
6-
zephyr_library_sources_ifdef(CONFIG_UART_ALTERA_JTAG uart_altera_jtag.c)
6+
7+
# zephyr-keep-sorted-start
8+
zephyr_library_sources_ifdef(CONFIG_SERIAL_TEST serial_test.c)
9+
zephyr_library_sources_ifdef(CONFIG_UART_ASYNC_RX_HELPER uart_async_rx.c)
10+
zephyr_library_sources_ifdef(CONFIG_UART_ASYNC_TO_INT_DRIVEN_API uart_async_to_irq.c)
11+
zephyr_library_sources_ifdef(CONFIG_USB_CDC_ACM ${ZEPHYR_BASE}/misc/empty_file.c)
12+
# zephyr-keep-sorted-stop
13+
14+
# zephyr-keep-sorted-start
15+
zephyr_library_sources_ifdef(CONFIG_LEUART_GECKO leuart_gecko.c)
16+
zephyr_library_sources_ifdef(CONFIG_SERIAL_ESP32_USB serial_esp32_usb.c)
717
zephyr_library_sources_ifdef(CONFIG_UART_ALTERA uart_altera.c)
8-
zephyr_library_sources_ifdef(CONFIG_UART_TELINK_B91 uart_b91.c)
9-
zephyr_library_sources_ifdef(CONFIG_UART_IMX uart_imx.c)
10-
zephyr_library_sources_ifdef(CONFIG_UART_ITE_IT8XXX2 uart_ite_it8xxx2.c)
18+
zephyr_library_sources_ifdef(CONFIG_UART_ALTERA_JTAG uart_altera_jtag.c)
19+
zephyr_library_sources_ifdef(CONFIG_UART_APBUART uart_apbuart.c)
20+
zephyr_library_sources_ifdef(CONFIG_UART_BCM2711_MU uart_bcm2711.c)
21+
zephyr_library_sources_ifdef(CONFIG_UART_BT uart_bt.c)
1122
zephyr_library_sources_ifdef(CONFIG_UART_CC13XX_CC26XX uart_cc13xx_cc26xx.c)
1223
zephyr_library_sources_ifdef(CONFIG_UART_CC32XX uart_cc32xx.c)
24+
zephyr_library_sources_ifdef(CONFIG_UART_CDNS uart_cdns.c)
1325
zephyr_library_sources_ifdef(CONFIG_UART_CMSDK_APB uart_cmsdk_apb.c)
26+
zephyr_library_sources_ifdef(CONFIG_UART_EFINIX_SAPPIHIRE uart_efinix_sapphire.c)
27+
zephyr_library_sources_ifdef(CONFIG_UART_EMUL uart_emul.c)
28+
zephyr_library_sources_ifdef(CONFIG_UART_ENE_KB1200 uart_ene_kb1200.c)
1429
zephyr_library_sources_ifdef(CONFIG_UART_ESP32 uart_esp32.c)
15-
zephyr_library_sources_ifdef(CONFIG_SERIAL_ESP32_USB serial_esp32_usb.c)
16-
zephyr_library_sources_ifdef(CONFIG_UART_SIFIVE uart_sifive.c)
1730
zephyr_library_sources_ifdef(CONFIG_UART_GECKO uart_gecko.c)
18-
zephyr_library_sources_ifdef(CONFIG_LEUART_GECKO leuart_gecko.c)
31+
zephyr_library_sources_ifdef(CONFIG_UART_HOSTLINK uart_hostlink.c)
32+
zephyr_library_sources_ifdef(CONFIG_UART_IMX uart_imx.c)
33+
zephyr_library_sources_ifdef(CONFIG_UART_INFINEON_CAT1 uart_ifx_cat1.c)
34+
zephyr_library_sources_ifdef(CONFIG_UART_INTEL_LW uart_intel_lw.c)
35+
zephyr_library_sources_ifdef(CONFIG_UART_ITE_IT8XXX2 uart_ite_it8xxx2.c)
36+
zephyr_library_sources_ifdef(CONFIG_UART_LITEX uart_litex.c)
1937
zephyr_library_sources_ifdef(CONFIG_UART_LPC11U6X uart_lpc11u6x.c)
38+
zephyr_library_sources_ifdef(CONFIG_UART_MAX32 uart_max32.c)
2039
zephyr_library_sources_ifdef(CONFIG_UART_MCUX uart_mcux.c)
2140
zephyr_library_sources_ifdef(CONFIG_UART_MCUX_FLEXCOMM uart_mcux_flexcomm.c)
2241
zephyr_library_sources_ifdef(CONFIG_UART_MCUX_IUART uart_mcux_iuart.c)
23-
zephyr_library_sources_ifdef(CONFIG_UART_MCUX_LPUART uart_mcux_lpuart.c)
2442
zephyr_library_sources_ifdef(CONFIG_UART_MCUX_LPSCI uart_mcux_lpsci.c)
43+
zephyr_library_sources_ifdef(CONFIG_UART_MCUX_LPUART uart_mcux_lpuart.c)
2544
zephyr_library_sources_ifdef(CONFIG_UART_MIV uart_miv.c)
2645
zephyr_library_sources_ifdef(CONFIG_UART_MSP432P4XX uart_msp432p4xx.c)
27-
zephyr_library_sources_ifdef(CONFIG_UART_NS16550 uart_ns16550.c)
46+
zephyr_library_sources_ifdef(CONFIG_UART_NEORV32 uart_neorv32.c)
47+
zephyr_library_sources_ifdef(CONFIG_UART_NPCX uart_npcx.c)
2848
zephyr_library_sources_ifdef(CONFIG_UART_NRFX_UART uart_nrfx_uart.c)
29-
if (CONFIG_UART_NRFX_UARTE)
30-
if (CONFIG_UART_NRFX_UARTE_LEGACY_SHIM)
31-
zephyr_library_sources(uart_nrfx_uarte.c)
32-
else()
33-
zephyr_library_sources(uart_nrfx_uarte2.c)
34-
endif()
35-
endif()
49+
zephyr_library_sources_ifdef(CONFIG_UART_NS16550 uart_ns16550.c)
50+
zephyr_library_sources_ifdef(CONFIG_UART_NUMAKER uart_numaker.c)
3651
zephyr_library_sources_ifdef(CONFIG_UART_NUMICRO uart_numicro.c)
37-
zephyr_library_sources_ifdef(CONFIG_UART_SAM uart_sam.c)
38-
zephyr_library_sources_ifdef(CONFIG_USART_SAM usart_sam.c)
39-
zephyr_library_sources_ifdef(CONFIG_UART_STELLARIS uart_stellaris.c)
40-
zephyr_library_sources_ifdef(CONFIG_UART_STM32 uart_stm32.c)
41-
zephyr_library_sources_ifdef(CONFIG_UART_SAM0 uart_sam0.c)
42-
zephyr_library_sources_ifdef(CONFIG_UART_PSOC6 uart_psoc6.c)
52+
zephyr_library_sources_ifdef(CONFIG_UART_NXP_S32_LINFLEXD uart_nxp_s32_linflexd.c)
53+
zephyr_library_sources_ifdef(CONFIG_UART_OPENTITAN uart_opentitan.c)
54+
zephyr_library_sources_ifdef(CONFIG_UART_PIPE uart_pipe.c)
4355
zephyr_library_sources_ifdef(CONFIG_UART_PL011 uart_pl011.c)
56+
zephyr_library_sources_ifdef(CONFIG_UART_PSOC6 uart_psoc6.c)
4457
zephyr_library_sources_ifdef(CONFIG_UART_QUICKLOGIC_USBSERIALPORT_S3B uart_ql_usbserialport_s3b.c)
45-
zephyr_library_sources_ifdef(CONFIG_UART_RV32M1_LPUART uart_rv32m1_lpuart.c)
58+
zephyr_library_sources_ifdef(CONFIG_UART_RA8_SCI_B uart_renesas_ra8_sci_b.c)
59+
zephyr_library_sources_ifdef(CONFIG_UART_RCAR uart_rcar.c)
60+
zephyr_library_sources_ifdef(CONFIG_UART_RENESAS_RA uart_renesas_ra.c)
4661
zephyr_library_sources_ifdef(CONFIG_UART_RPI_PICO_PIO uart_rpi_pico_pio.c)
47-
zephyr_library_sources_ifdef(CONFIG_UART_LITEX uart_litex.c)
4862
zephyr_library_sources_ifdef(CONFIG_UART_RTT_DRIVER uart_rtt.c)
63+
zephyr_library_sources_ifdef(CONFIG_UART_RV32M1_LPUART uart_rv32m1_lpuart.c)
64+
zephyr_library_sources_ifdef(CONFIG_UART_RZT2M uart_rzt2m.c)
65+
zephyr_library_sources_ifdef(CONFIG_UART_SAM uart_sam.c)
66+
zephyr_library_sources_ifdef(CONFIG_UART_SAM0 uart_sam0.c)
67+
zephyr_library_sources_ifdef(CONFIG_UART_SCI_RA uart_renesas_ra_sci.c)
68+
zephyr_library_sources_ifdef(CONFIG_UART_SEDI uart_sedi.c)
69+
zephyr_library_sources_ifdef(CONFIG_UART_SI32_USART uart_si32_usart.c)
70+
zephyr_library_sources_ifdef(CONFIG_UART_SIFIVE uart_sifive.c)
71+
zephyr_library_sources_ifdef(CONFIG_UART_SMARTBOND uart_smartbond.c)
72+
zephyr_library_sources_ifdef(CONFIG_UART_STELLARIS uart_stellaris.c)
73+
zephyr_library_sources_ifdef(CONFIG_UART_STM32 uart_stm32.c)
74+
zephyr_library_sources_ifdef(CONFIG_UART_SY1XX uart_sy1xx.c)
75+
zephyr_library_sources_ifdef(CONFIG_UART_TELINK_B91 uart_b91.c)
76+
zephyr_library_sources_ifdef(CONFIG_UART_XEC uart_mchp_xec.c)
77+
zephyr_library_sources_ifdef(CONFIG_UART_XEN_HVC uart_hvc_xen.c)
78+
zephyr_library_sources_ifdef(CONFIG_UART_XEN_HVC_CONSOLEIO uart_hvc_xen_consoleio.c)
4979
zephyr_library_sources_ifdef(CONFIG_UART_XLNX_PS uart_xlnx_ps.c)
5080
zephyr_library_sources_ifdef(CONFIG_UART_XLNX_UARTLITE uart_xlnx_uartlite.c)
5181
zephyr_library_sources_ifdef(CONFIG_UART_XMC4XXX uart_xmc4xxx.c)
52-
zephyr_library_sources_ifdef(CONFIG_UART_NPCX uart_npcx.c)
53-
zephyr_library_sources_ifdef(CONFIG_UART_APBUART uart_apbuart.c)
54-
zephyr_library_sources_ifdef(CONFIG_USB_CDC_ACM ${ZEPHYR_BASE}/misc/empty_file.c)
55-
zephyr_library_sources_ifdef(CONFIG_UART_RCAR uart_rcar.c)
56-
zephyr_library_sources_ifdef(CONFIG_UART_XEC uart_mchp_xec.c)
57-
zephyr_library_sources_ifdef(CONFIG_UART_NEORV32 uart_neorv32.c)
5882
zephyr_library_sources_ifdef(CONFIG_USART_GD32 usart_gd32.c)
59-
zephyr_library_sources_ifdef(CONFIG_UART_XEN_HVC uart_hvc_xen.c)
60-
zephyr_library_sources_ifdef(CONFIG_UART_XEN_HVC_CONSOLEIO uart_hvc_xen_consoleio.c)
61-
zephyr_library_sources_ifdef(CONFIG_UART_INFINEON_CAT1 uart_ifx_cat1.c)
62-
zephyr_library_sources_ifdef(CONFIG_UART_PIPE uart_pipe.c)
63-
zephyr_library_sources_ifdef(CONFIG_UART_SMARTBOND uart_smartbond.c)
64-
zephyr_library_sources_ifdef(CONFIG_UART_NXP_S32_LINFLEXD uart_nxp_s32_linflexd.c)
65-
zephyr_library_sources_ifdef(CONFIG_UART_CDNS uart_cdns.c)
66-
zephyr_library_sources_ifdef(CONFIG_UART_OPENTITAN uart_opentitan.c)
67-
zephyr_library_sources_ifdef(CONFIG_UART_HOSTLINK uart_hostlink.c)
68-
zephyr_library_sources_ifdef(CONFIG_UART_EMUL uart_emul.c)
69-
zephyr_library_sources_ifdef(CONFIG_UART_NUMAKER uart_numaker.c)
70-
zephyr_library_sources_ifdef(CONFIG_UART_EFINIX_SAPPIHIRE uart_efinix_sapphire.c)
71-
zephyr_library_sources_ifdef(CONFIG_UART_SEDI uart_sedi.c)
72-
zephyr_library_sources_ifdef(CONFIG_UART_MAX32 uart_max32.c)
73-
zephyr_library_sources_ifdef(CONFIG_UART_BCM2711_MU uart_bcm2711.c)
74-
zephyr_library_sources_ifdef(CONFIG_UART_INTEL_LW uart_intel_lw.c)
75-
zephyr_library_sources_ifdef(CONFIG_UART_RENESAS_RA uart_renesas_ra.c)
76-
zephyr_library_sources_ifdef(CONFIG_UART_ENE_KB1200 uart_ene_kb1200.c)
77-
zephyr_library_sources_ifdef(CONFIG_UART_RZT2M uart_rzt2m.c)
78-
zephyr_library_sources_ifdef(CONFIG_UART_RA8_SCI_B uart_renesas_ra8_sci_b.c)
79-
zephyr_library_sources_ifdef(CONFIG_UART_SI32_USART uart_si32_usart.c)
80-
zephyr_library_sources_ifdef(CONFIG_USERSPACE uart_handlers.c)
81-
zephyr_library_sources_ifdef(CONFIG_UART_SCI_RA uart_renesas_ra_sci.c)
82-
zephyr_library_sources_ifdef(CONFIG_UART_SY1XX uart_sy1xx.c)
83+
zephyr_library_sources_ifdef(CONFIG_USART_SAM usart_sam.c)
84+
zephyr_library_sources_ifdef(CONFIG_USERSPACE uart_handlers.c)
85+
# zephyr-keep-sorted-stop
86+
87+
if (CONFIG_UART_NRFX_UARTE)
88+
if (CONFIG_UART_NRFX_UARTE_LEGACY_SHIM)
89+
zephyr_library_sources(uart_nrfx_uarte.c)
90+
else()
91+
zephyr_library_sources(uart_nrfx_uarte2.c)
92+
endif()
93+
endif()
8394

8495
if(CONFIG_UART_NATIVE_POSIX)
8596
zephyr_library_compile_definitions(NO_POSIX_CHEATS)
@@ -100,9 +111,3 @@ if(CONFIG_UART_NATIVE_TTY)
100111
target_sources(native_simulator INTERFACE uart_native_tty_bottom.c)
101112
endif()
102113
endif()
103-
104-
zephyr_library_sources_ifdef(CONFIG_UART_BT uart_bt.c)
105-
106-
zephyr_library_sources_ifdef(CONFIG_SERIAL_TEST serial_test.c)
107-
zephyr_library_sources_ifdef(CONFIG_UART_ASYNC_RX_HELPER uart_async_rx.c)
108-
zephyr_library_sources_ifdef(CONFIG_UART_ASYNC_TO_INT_DRIVEN_API uart_async_to_irq.c)

‎drivers/serial/Kconfig‎

Lines changed: 52 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -150,137 +150,74 @@ config UART_ASYNC_TO_INT_DRIVEN_RX_TIMEOUT
150150

151151
comment "Serial Drivers"
152152

153+
# zephyr-keep-sorted-start
154+
rsource "Kconfig.altera"
155+
rsource "Kconfig.altera_jtag"
156+
rsource "Kconfig.apbuart"
153157
rsource "Kconfig.b91"
154-
155-
rsource "Kconfig.ns16550"
156-
158+
rsource "Kconfig.bcm2711"
159+
rsource "Kconfig.bt"
160+
rsource "Kconfig.cc13xx_cc26xx"
161+
rsource "Kconfig.cc32xx"
162+
rsource "Kconfig.cdns"
163+
rsource "Kconfig.cmsdk_apb"
164+
rsource "Kconfig.efinix_sapphire"
165+
rsource "Kconfig.emul"
166+
rsource "Kconfig.ene"
167+
rsource "Kconfig.esp32"
168+
rsource "Kconfig.gd32"
169+
rsource "Kconfig.gecko"
170+
rsource "Kconfig.hostlink"
171+
rsource "Kconfig.ifx_cat1"
172+
rsource "Kconfig.imx"
173+
rsource "Kconfig.intel_lw"
174+
rsource "Kconfig.it8xxx2"
175+
rsource "Kconfig.leuart_gecko"
176+
rsource "Kconfig.litex"
177+
rsource "Kconfig.lpc11u6x"
178+
rsource "Kconfig.max32"
157179
rsource "Kconfig.mcux"
158-
159180
rsource "Kconfig.mcux_flexcomm"
160-
161181
rsource "Kconfig.mcux_iuart"
162-
163182
rsource "Kconfig.mcux_lpsci"
164-
165183
rsource "Kconfig.mcux_lpuart"
166-
167184
rsource "Kconfig.miv"
168-
169-
rsource "Kconfig.imx"
170-
171-
rsource "Kconfig.it8xxx2"
172-
173-
rsource "Kconfig.stellaris"
174-
185+
rsource "Kconfig.msp432p4xx"
175186
rsource "Kconfig.native_posix"
176-
177-
rsource "Kconfig.usart_sam"
178-
179-
rsource "Kconfig.uart_sam"
180-
181-
rsource "Kconfig.stm32"
182-
187+
rsource "Kconfig.native_tty"
188+
rsource "Kconfig.neorv32"
189+
rsource "Kconfig.npcx"
183190
rsource "Kconfig.nrfx"
184-
185-
rsource "Kconfig.altera_jtag"
186-
187-
rsource "Kconfig.cc13xx_cc26xx"
188-
189-
rsource "Kconfig.cc32xx"
190-
191-
rsource "Kconfig.cmsdk_apb"
192-
193-
rsource "Kconfig.sifive"
194-
195-
rsource "Kconfig.esp32"
196-
197-
rsource "Kconfig.gecko"
198-
199-
rsource "Kconfig.leuart_gecko"
200-
201-
rsource "Kconfig.msp432p4xx"
202-
191+
rsource "Kconfig.ns16550"
192+
rsource "Kconfig.numaker"
203193
rsource "Kconfig.numicro"
204-
205-
rsource "Kconfig.sam0"
206-
207-
rsource "Kconfig.psoc6"
208-
194+
rsource "Kconfig.nxp_s32"
195+
rsource "Kconfig.opentitan"
209196
rsource "Kconfig.pl011"
210-
197+
rsource "Kconfig.psoc6"
211198
rsource "Kconfig.ql_usbserialport_s3b"
212-
213-
rsource "Kconfig.rv32m1_lpuart"
214-
215-
rsource "Kconfig.rpi_pico"
216-
217-
rsource "Kconfig.litex"
218-
219-
rsource "Kconfig.rtt"
220-
221-
rsource "Kconfig.bt"
222-
223-
rsource "Kconfig.xlnx"
224-
225-
rsource "Kconfig.xmc4xxx"
226-
227-
rsource "Kconfig.lpc11u6x"
228-
229-
rsource "Kconfig.npcx"
230-
231-
rsource "Kconfig.apbuart"
232-
233199
rsource "Kconfig.rcar"
234-
235-
rsource "Kconfig.xec"
236-
237-
rsource "Kconfig.gd32"
238-
239-
rsource "Kconfig.test"
240-
241-
rsource "Kconfig.neorv32"
242-
243-
rsource "Kconfig.xen"
244-
245-
rsource "Kconfig.ifx_cat1"
246-
247-
rsource "Kconfig.smartbond"
248-
249-
rsource "Kconfig.nxp_s32"
250-
251-
rsource "Kconfig.cdns"
252-
253-
rsource "Kconfig.opentitan"
254-
255-
rsource "Kconfig.altera"
256-
257-
rsource "Kconfig.hostlink"
258-
259-
rsource "Kconfig.emul"
260-
261-
rsource "Kconfig.native_tty"
262-
263-
rsource "Kconfig.numaker"
264-
265-
rsource "Kconfig.efinix_sapphire"
266-
267-
rsource "Kconfig.sedi"
268-
269-
rsource "Kconfig.max32"
270-
271-
rsource "Kconfig.bcm2711"
272-
273-
rsource "Kconfig.intel_lw"
274-
275200
rsource "Kconfig.renesas_ra"
276-
277-
rsource "Kconfig.ene"
278-
279-
rsource "Kconfig.rzt2m"
280-
281201
rsource "Kconfig.renesas_ra8"
282-
202+
rsource "Kconfig.rpi_pico"
203+
rsource "Kconfig.rtt"
204+
rsource "Kconfig.rv32m1_lpuart"
205+
rsource "Kconfig.rzt2m"
206+
rsource "Kconfig.sam0"
207+
rsource "Kconfig.sedi"
208+
rsource "Kconfig.sifive"
209+
rsource "Kconfig.smartbond"
210+
rsource "Kconfig.stellaris"
211+
rsource "Kconfig.stm32"
283212
rsource "Kconfig.sy1xx"
213+
rsource "Kconfig.test"
214+
rsource "Kconfig.uart_sam"
215+
rsource "Kconfig.usart_sam"
216+
rsource "Kconfig.xec"
217+
rsource "Kconfig.xen"
218+
rsource "Kconfig.xlnx"
219+
rsource "Kconfig.xmc4xxx"
220+
# zephyr-keep-sorted-stop
284221

285222
source "drivers/serial/Kconfig.si32"
286223

0 commit comments

Comments
 (0)