Skip to content

Commit ea205bc

Browse files
rettichschnidikartben
rettichschnidi
authored and
kartben
committed
drivers: spi: 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 2953c38 commit ea205bc

File tree

2 files changed

+93
-133
lines changed

2 files changed

+93
-133
lines changed

‎drivers/spi/CMakeLists.txt‎

Lines changed: 60 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,61 +4,64 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/spi.h)
44

55
zephyr_library()
66

7-
zephyr_library_sources_ifdef(CONFIG_SPI_SHELL spi_shell.c)
8-
zephyr_library_sources_ifdef(CONFIG_SPI_TELINK_B91 spi_b91.c)
9-
zephyr_library_sources_ifdef(CONFIG_SPI_CC13XX_CC26XX spi_cc13xx_cc26xx.c)
10-
zephyr_library_sources_ifdef(CONFIG_SPI_DW spi_dw.c)
11-
zephyr_library_sources_ifdef(CONFIG_SPI_EMUL spi_emul.c)
12-
zephyr_library_sources_ifdef(CONFIG_SPI_STM32 spi_ll_stm32.c)
13-
zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_DSPI spi_mcux_dspi.c)
14-
zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_ECSPI spi_mcux_ecspi.c)
15-
zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_FLEXCOMM spi_mcux_flexcomm.c)
16-
zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_FLEXIO spi_mcux_flexio.c)
17-
zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_LPSPI spi_mcux_lpspi.c)
18-
zephyr_library_sources_ifdef(CONFIG_SPI_SAM spi_sam.c)
19-
zephyr_library_sources_ifdef(CONFIG_SPI_SAM0 spi_sam0.c)
20-
zephyr_library_sources_ifdef(CONFIG_SPI_SIFIVE spi_sifive.c)
21-
zephyr_library_sources_ifdef(CONFIG_SPI_RV32M1_LPSPI spi_rv32m1_lpspi.c)
22-
zephyr_library_sources_ifdef(CONFIG_SPI_NRFX_SPI spi_nrfx_spi.c
23-
spi_nrfx_common.c)
24-
zephyr_library_sources_ifdef(CONFIG_SPI_NRFX_SPIM spi_nrfx_spim.c
25-
spi_nrfx_common.c)
26-
zephyr_library_sources_ifdef(CONFIG_SPI_NRFX_SPIS spi_nrfx_spis.c)
27-
zephyr_library_sources_ifdef(CONFIG_SPI_LITEX spi_litex.c)
28-
zephyr_library_sources_ifdef(CONFIG_SPI_LITEX_LITESPI spi_litex_litespi.c)
29-
zephyr_library_sources_ifdef(CONFIG_SPI_OC_SIMPLE spi_oc_simple.c)
30-
zephyr_library_sources_ifdef(CONFIG_SPI_XEC_QMSPI spi_xec_qmspi.c)
31-
zephyr_library_sources_ifdef(CONFIG_SPI_GECKO_USART spi_gecko_usart.c)
32-
zephyr_library_sources_ifdef(CONFIG_SPI_GECKO_EUSART spi_gecko_eusart.c)
33-
zephyr_library_sources_ifdef(CONFIG_SPI_XLNX_AXI_QUADSPI spi_xlnx_axi_quadspi.c)
34-
zephyr_library_sources_ifdef(CONFIG_ESP32_SPIM spi_esp32_spim.c)
35-
zephyr_library_sources_ifdef(CONFIG_SPI_TEST spi_test.c)
36-
zephyr_library_sources_ifdef(CONFIG_SPI_PSOC6 spi_psoc6.c)
37-
zephyr_library_sources_ifdef(CONFIG_SPI_BITBANG spi_bitbang.c)
38-
zephyr_library_sources_ifdef(CONFIG_SPI_XEC_QMSPI_LDMA spi_xec_qmspi_ldma.c)
39-
zephyr_library_sources_ifdef(CONFIG_SPI_GD32 spi_gd32.c)
40-
zephyr_library_sources_ifdef(CONFIG_SPI_MCHP_QSPI spi_mchp_mss_qspi.c)
41-
zephyr_library_sources_ifdef(CONFIG_SPI_PL022 spi_pl022.c)
42-
zephyr_library_sources_ifdef(CONFIG_SPI_ANDES_ATCSPI200 spi_andes_atcspi200.c)
43-
zephyr_library_sources_ifdef(CONFIG_NXP_S32_SPI spi_nxp_s32.c)
44-
zephyr_library_sources_ifdef(CONFIG_SPI_XMC4XXX spi_xmc4xxx.c)
45-
zephyr_library_sources_ifdef(CONFIG_SPI_PW spi_pw.c)
46-
zephyr_library_sources_ifdef(CONFIG_SPI_SMARTBOND spi_smartbond.c)
47-
zephyr_library_sources_ifdef(CONFIG_SPI_OPENTITAN spi_opentitan.c)
48-
zephyr_library_sources_ifdef(CONFIG_SPI_NUMAKER spi_numaker.c)
49-
zephyr_library_sources_ifdef(CONFIG_SPI_AMBIQ_SPIC spi_ambiq_spic.c)
50-
zephyr_library_sources_ifdef(CONFIG_SPI_AMBIQ_SPID spi_ambiq_spid.c)
51-
zephyr_library_sources_ifdef(CONFIG_SPI_AMBIQ_BLEIF spi_ambiq_bleif.c)
52-
zephyr_library_sources_ifdef(CONFIG_SPI_RPI_PICO_PIO spi_rpi_pico_pio.c)
53-
zephyr_library_sources_ifdef(CONFIG_SPI_MCHP_MSS spi_mchp_mss.c)
54-
zephyr_library_sources_ifdef(CONFIG_SPI_RENESAS_RA8 spi_b_renesas_ra8.c)
55-
zephyr_library_sources_ifdef(CONFIG_SPI_RENESAS_RA spi_renesas_ra.c)
56-
zephyr_library_sources_ifdef(CONFIG_SPI_RTIO spi_rtio.c)
7+
# zephyr-keep-sorted-start
578
zephyr_library_sources_ifdef(CONFIG_SPI_ASYNC spi_signal.c)
58-
zephyr_library_sources_ifdef(CONFIG_SPI_ITE_IT8XXX2 spi_it8xxx2.c)
59-
zephyr_library_sources_ifdef(CONFIG_USERSPACE spi_handlers.c)
60-
zephyr_library_sources_ifdef(CONFIG_SPI_INFINEON_CAT1 spi_ifx_cat1.c)
61-
zephyr_library_sources_ifdef(CONFIG_SPI_SEDI spi_sedi.c)
62-
zephyr_library_sources_ifdef(CONFIG_SPI_NPCX_SPIP spi_npcx_spip.c)
63-
zephyr_library_sources_ifdef(CONFIG_SPI_GRLIB_SPIMCTRL spi_grlib_spimctrl.c)
64-
zephyr_library_sources_ifdef(CONFIG_SPI_MAX32 spi_max32.c)
9+
zephyr_library_sources_ifdef(CONFIG_SPI_RTIO spi_rtio.c)
10+
zephyr_library_sources_ifdef(CONFIG_SPI_SHELL spi_shell.c)
11+
zephyr_library_sources_ifdef(CONFIG_USERSPACE spi_handlers.c)
12+
# zephyr-keep-sorted-stop
13+
14+
# zephyr-keep-sorted-start
15+
zephyr_library_sources_ifdef(CONFIG_ESP32_SPIM spi_esp32_spim.c)
16+
zephyr_library_sources_ifdef(CONFIG_NXP_S32_SPI spi_nxp_s32.c)
17+
zephyr_library_sources_ifdef(CONFIG_SPI_AMBIQ_BLEIF spi_ambiq_bleif.c)
18+
zephyr_library_sources_ifdef(CONFIG_SPI_AMBIQ_SPIC spi_ambiq_spic.c)
19+
zephyr_library_sources_ifdef(CONFIG_SPI_AMBIQ_SPID spi_ambiq_spid.c)
20+
zephyr_library_sources_ifdef(CONFIG_SPI_ANDES_ATCSPI200 spi_andes_atcspi200.c)
21+
zephyr_library_sources_ifdef(CONFIG_SPI_BITBANG spi_bitbang.c)
22+
zephyr_library_sources_ifdef(CONFIG_SPI_CC13XX_CC26XX spi_cc13xx_cc26xx.c)
23+
zephyr_library_sources_ifdef(CONFIG_SPI_DW spi_dw.c)
24+
zephyr_library_sources_ifdef(CONFIG_SPI_EMUL spi_emul.c)
25+
zephyr_library_sources_ifdef(CONFIG_SPI_GD32 spi_gd32.c)
26+
zephyr_library_sources_ifdef(CONFIG_SPI_GECKO_EUSART spi_gecko_eusart.c)
27+
zephyr_library_sources_ifdef(CONFIG_SPI_GECKO_USART spi_gecko_usart.c)
28+
zephyr_library_sources_ifdef(CONFIG_SPI_GRLIB_SPIMCTRL spi_grlib_spimctrl.c)
29+
zephyr_library_sources_ifdef(CONFIG_SPI_INFINEON_CAT1 spi_ifx_cat1.c)
30+
zephyr_library_sources_ifdef(CONFIG_SPI_ITE_IT8XXX2 spi_it8xxx2.c)
31+
zephyr_library_sources_ifdef(CONFIG_SPI_LITEX spi_litex.c)
32+
zephyr_library_sources_ifdef(CONFIG_SPI_LITEX_LITESPI spi_litex_litespi.c)
33+
zephyr_library_sources_ifdef(CONFIG_SPI_MAX32 spi_max32.c)
34+
zephyr_library_sources_ifdef(CONFIG_SPI_MCHP_MSS spi_mchp_mss.c)
35+
zephyr_library_sources_ifdef(CONFIG_SPI_MCHP_QSPI spi_mchp_mss_qspi.c)
36+
zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_DSPI spi_mcux_dspi.c)
37+
zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_ECSPI spi_mcux_ecspi.c)
38+
zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_FLEXCOMM spi_mcux_flexcomm.c)
39+
zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_FLEXIO spi_mcux_flexio.c)
40+
zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_LPSPI spi_mcux_lpspi.c)
41+
zephyr_library_sources_ifdef(CONFIG_SPI_NPCX_SPIP spi_npcx_spip.c)
42+
zephyr_library_sources_ifdef(CONFIG_SPI_NRFX_SPI spi_nrfx_spi.c spi_nrfx_common.c)
43+
zephyr_library_sources_ifdef(CONFIG_SPI_NRFX_SPIM spi_nrfx_spim.c spi_nrfx_common.c)
44+
zephyr_library_sources_ifdef(CONFIG_SPI_NRFX_SPIS spi_nrfx_spis.c)
45+
zephyr_library_sources_ifdef(CONFIG_SPI_NUMAKER spi_numaker.c)
46+
zephyr_library_sources_ifdef(CONFIG_SPI_OC_SIMPLE spi_oc_simple.c)
47+
zephyr_library_sources_ifdef(CONFIG_SPI_OPENTITAN spi_opentitan.c)
48+
zephyr_library_sources_ifdef(CONFIG_SPI_PL022 spi_pl022.c)
49+
zephyr_library_sources_ifdef(CONFIG_SPI_PSOC6 spi_psoc6.c)
50+
zephyr_library_sources_ifdef(CONFIG_SPI_PW spi_pw.c)
51+
zephyr_library_sources_ifdef(CONFIG_SPI_RENESAS_RA spi_renesas_ra.c)
52+
zephyr_library_sources_ifdef(CONFIG_SPI_RENESAS_RA8 spi_b_renesas_ra8.c)
53+
zephyr_library_sources_ifdef(CONFIG_SPI_RPI_PICO_PIO spi_rpi_pico_pio.c)
54+
zephyr_library_sources_ifdef(CONFIG_SPI_RV32M1_LPSPI spi_rv32m1_lpspi.c)
55+
zephyr_library_sources_ifdef(CONFIG_SPI_SAM spi_sam.c)
56+
zephyr_library_sources_ifdef(CONFIG_SPI_SAM0 spi_sam0.c)
57+
zephyr_library_sources_ifdef(CONFIG_SPI_SEDI spi_sedi.c)
58+
zephyr_library_sources_ifdef(CONFIG_SPI_SIFIVE spi_sifive.c)
59+
zephyr_library_sources_ifdef(CONFIG_SPI_SMARTBOND spi_smartbond.c)
60+
zephyr_library_sources_ifdef(CONFIG_SPI_STM32 spi_ll_stm32.c)
61+
zephyr_library_sources_ifdef(CONFIG_SPI_TELINK_B91 spi_b91.c)
62+
zephyr_library_sources_ifdef(CONFIG_SPI_TEST spi_test.c)
63+
zephyr_library_sources_ifdef(CONFIG_SPI_XEC_QMSPI spi_xec_qmspi.c)
64+
zephyr_library_sources_ifdef(CONFIG_SPI_XEC_QMSPI_LDMA spi_xec_qmspi_ldma.c)
65+
zephyr_library_sources_ifdef(CONFIG_SPI_XLNX_AXI_QUADSPI spi_xlnx_axi_quadspi.c)
66+
zephyr_library_sources_ifdef(CONFIG_SPI_XMC4XXX spi_xmc4xxx.c)
67+
# zephyr-keep-sorted-stop

‎drivers/spi/Kconfig‎

Lines changed: 33 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -75,96 +75,53 @@ module = SPI
7575
module-str = spi
7676
source "subsys/logging/Kconfig.template.log_config"
7777

78+
# zephyr-keep-sorted-start
79+
source "drivers/spi/Kconfig.ambiq"
80+
source "drivers/spi/Kconfig.andes_atcspi200"
7881
source "drivers/spi/Kconfig.b91"
79-
80-
source "drivers/spi/Kconfig.stm32"
81-
82+
source "drivers/spi/Kconfig.bitbang"
83+
source "drivers/spi/Kconfig.cc13xx_cc26xx"
8284
source "drivers/spi/Kconfig.dw"
83-
85+
source "drivers/spi/Kconfig.esp32"
86+
source "drivers/spi/Kconfig.gd32"
87+
source "drivers/spi/Kconfig.gecko_eusart"
88+
source "drivers/spi/Kconfig.gecko_usart"
89+
source "drivers/spi/Kconfig.grlib_spimctrl"
90+
source "drivers/spi/Kconfig.ifx_cat1"
91+
source "drivers/spi/Kconfig.it8xxx2"
92+
source "drivers/spi/Kconfig.litex"
93+
source "drivers/spi/Kconfig.max32"
94+
source "drivers/spi/Kconfig.mchp_mss"
95+
source "drivers/spi/Kconfig.mchp_mss_qspi"
8496
source "drivers/spi/Kconfig.mcux_dspi"
85-
8697
source "drivers/spi/Kconfig.mcux_ecspi"
87-
8898
source "drivers/spi/Kconfig.mcux_flexcomm"
89-
9099
source "drivers/spi/Kconfig.mcux_flexio"
91-
92100
source "drivers/spi/Kconfig.mcux_lpspi"
93-
101+
source "drivers/spi/Kconfig.npcx"
102+
source "drivers/spi/Kconfig.nrfx"
103+
source "drivers/spi/Kconfig.numaker"
104+
source "drivers/spi/Kconfig.nxp_s32"
105+
source "drivers/spi/Kconfig.oc_simple"
106+
source "drivers/spi/Kconfig.opentitan"
107+
source "drivers/spi/Kconfig.pl022"
108+
source "drivers/spi/Kconfig.psoc6"
109+
source "drivers/spi/Kconfig.pw"
110+
source "drivers/spi/Kconfig.renesas_ra"
111+
source "drivers/spi/Kconfig.renesas_ra8"
112+
source "drivers/spi/Kconfig.rpi_pico"
94113
source "drivers/spi/Kconfig.rv32m1_lpspi"
95-
96114
source "drivers/spi/Kconfig.sam"
97-
98115
source "drivers/spi/Kconfig.sam0"
99-
116+
source "drivers/spi/Kconfig.sedi"
100117
source "drivers/spi/Kconfig.sifive"
101-
118+
source "drivers/spi/Kconfig.smartbond"
102119
source "drivers/spi/Kconfig.spi_emul"
103-
104-
source "drivers/spi/Kconfig.nrfx"
105-
106-
source "drivers/spi/Kconfig.cc13xx_cc26xx"
107-
108-
source "drivers/spi/Kconfig.litex"
109-
110-
source "drivers/spi/Kconfig.oc_simple"
111-
120+
source "drivers/spi/Kconfig.stm32"
121+
source "drivers/spi/Kconfig.test"
112122
source "drivers/spi/Kconfig.xec_qmspi"
113-
114-
source "drivers/spi/Kconfig.gecko_usart"
115-
116-
source "drivers/spi/Kconfig.gecko_eusart"
117-
118123
source "drivers/spi/Kconfig.xlnx"
119-
120-
source "drivers/spi/Kconfig.esp32"
121-
122-
source "drivers/spi/Kconfig.test"
123-
124-
source "drivers/spi/Kconfig.psoc6"
125-
126-
source "drivers/spi/Kconfig.bitbang"
127-
128-
source "drivers/spi/Kconfig.gd32"
129-
130-
source "drivers/spi/Kconfig.mchp_mss_qspi"
131-
132-
source "drivers/spi/Kconfig.pl022"
133-
134-
source "drivers/spi/Kconfig.andes_atcspi200"
135-
136-
source "drivers/spi/Kconfig.nxp_s32"
137-
138124
source "drivers/spi/Kconfig.xmc4xxx"
139-
140-
source "drivers/spi/Kconfig.pw"
141-
142-
source "drivers/spi/Kconfig.smartbond"
143-
144-
source "drivers/spi/Kconfig.opentitan"
145-
146-
source "drivers/spi/Kconfig.numaker"
147-
148-
source "drivers/spi/Kconfig.ambiq"
149-
150-
source "drivers/spi/Kconfig.rpi_pico"
151-
152-
source "drivers/spi/Kconfig.ifx_cat1"
153-
154-
source "drivers/spi/Kconfig.sedi"
155-
156-
source "drivers/spi/Kconfig.npcx"
157-
158-
source "drivers/spi/Kconfig.mchp_mss"
159-
160-
source "drivers/spi/Kconfig.grlib_spimctrl"
161-
162-
source "drivers/spi/Kconfig.max32"
163-
164-
source "drivers/spi/Kconfig.renesas_ra8"
165-
166-
source "drivers/spi/Kconfig.it8xxx2"
167-
168-
source "drivers/spi/Kconfig.renesas_ra"
125+
# zephyr-keep-sorted-stop
169126

170127
endif # SPI

0 commit comments

Comments
 (0)