Skip to content

Commit 0ae289b

Browse files
josuahjosuah
committed
drivers: watchdog: sort Kconfig and CMaKe includes
Use the # zephyr-keep-sorted-start/stop comment to have CI check the alphabetical order of includes, to help reducing the chance of conflicts while contributing drivers. Signed-off-by: Josuah Demangeon <me@josuah.net>
1 parent 7f50c8b commit 0ae289b

File tree

2 files changed

+68
-119
lines changed

2 files changed

+68
-119
lines changed

‎drivers/watchdog/CMakeLists.txt‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,27 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/watchdog.h)
44

55
zephyr_library()
66

7-
zephyr_library_sources_ifdef(CONFIG_IWDG_STM32 wdt_iwdg_stm32.c)
8-
zephyr_library_sources_ifdef(CONFIG_WWDG_STM32 wdt_wwdg_stm32.c)
9-
7+
# zephyr-keep-sorted-start
108
zephyr_library_sources_ifdef(CONFIG_FWDGT_GD32 wdt_fwdgt_gd32.c)
11-
zephyr_library_sources_ifdef(CONFIG_WWDGT_GD32 wdt_wwdgt_gd32.c)
12-
9+
zephyr_library_sources_ifdef(CONFIG_IWDG_STM32 wdt_iwdg_stm32.c)
10+
zephyr_library_sources_ifdef(CONFIG_USERSPACE wdt_handlers.c)
1311
zephyr_library_sources_ifdef(CONFIG_WDOG_CMSDK_APB wdt_cmsdk_apb.c)
14-
15-
zephyr_library_sources_ifdef(CONFIG_WDT_CC32XX wdt_cc32xx.c)
12+
zephyr_library_sources_ifdef(CONFIG_WDT_AMBIQ wdt_ambiq.c)
13+
zephyr_library_sources_ifdef(CONFIG_WDT_ANDES_ATCWDT200 wdt_andes_atcwdt200.c)
1614
zephyr_library_sources_ifdef(CONFIG_WDT_CC13XX_CC26XX wdt_cc13xx_cc26xx.c)
1715
zephyr_library_sources_ifdef(CONFIG_WDT_CC23X0 wdt_cc23x0.c)
16+
zephyr_library_sources_ifdef(CONFIG_WDT_CC32XX wdt_cc32xx.c)
17+
zephyr_library_sources_ifdef(CONFIG_WDT_COUNTER wdt_counter.c)
18+
zephyr_library_sources_ifdef(CONFIG_WDT_DW wdt_dw.c wdt_dw_common.c)
19+
zephyr_library_sources_ifdef(CONFIG_WDT_ENE_KB106X wdt_ene_kb106x.c)
20+
zephyr_library_sources_ifdef(CONFIG_WDT_ENE_KB1200 wdt_ene_kb1200.c)
1821
zephyr_library_sources_ifdef(CONFIG_WDT_ESP32 wdt_esp32.c)
19-
zephyr_library_sources_ifdef(CONFIG_WDT_XT_ESP32 xt_wdt_esp32.c)
2022
zephyr_library_sources_ifdef(CONFIG_WDT_GECKO wdt_gecko.c)
23+
zephyr_library_sources_ifdef(CONFIG_WDT_INFINEON_CAT1 wdt_ifx_cat1.c)
24+
zephyr_library_sources_ifdef(CONFIG_WDT_INTEL_ADSP wdt_intel_adsp.c wdt_dw_common.c)
2125
zephyr_library_sources_ifdef(CONFIG_WDT_ITE_IT51XXX wdt_ite_it51xxx.c)
2226
zephyr_library_sources_ifdef(CONFIG_WDT_ITE_IT8XXX2 wdt_ite_it8xxx2.c)
27+
zephyr_library_sources_ifdef(CONFIG_WDT_IWDG_WCH wdt_iwdg_wch.c)
2328
zephyr_library_sources_ifdef(CONFIG_WDT_LITEX wdt_litex.c)
2429
zephyr_library_sources_ifdef(CONFIG_WDT_MAX32 wdt_max32.c)
2530
zephyr_library_sources_ifdef(CONFIG_WDT_MCUX_COP wdt_mcux_cop.c)
@@ -33,40 +38,32 @@ zephyr_library_sources_ifdef(CONFIG_WDT_NPM13XX wdt_npm13xx.c)
3338
zephyr_library_sources_ifdef(CONFIG_WDT_NPM2100 wdt_npm2100.c)
3439
zephyr_library_sources_ifdef(CONFIG_WDT_NPM6001 wdt_npm6001.c)
3540
zephyr_library_sources_ifdef(CONFIG_WDT_NRFX wdt_nrfx.c)
41+
zephyr_library_sources_ifdef(CONFIG_WDT_NXP_EWM wdt_nxp_ewm.c)
42+
zephyr_library_sources_ifdef(CONFIG_WDT_NXP_FS26 wdt_nxp_fs26.c)
43+
zephyr_library_sources_ifdef(CONFIG_WDT_NXP_S32 wdt_nxp_s32.c)
44+
zephyr_library_sources_ifdef(CONFIG_WDT_OPENTITAN wdt_opentitan.c)
45+
zephyr_library_sources_ifdef(CONFIG_WDT_RENESAS_RA wdt_renesas_ra.c)
46+
zephyr_library_sources_ifdef(CONFIG_WDT_RENESAS_RX_IWDT wdt_renesas_rx_iwdt.c)
47+
zephyr_library_sources_ifdef(CONFIG_WDT_RENESAS_RZ wdt_renesas_rz.c)
3648
zephyr_library_sources_ifdef(CONFIG_WDT_RPI_PICO wdt_rpi_pico.c)
3749
zephyr_library_sources_ifdef(CONFIG_WDT_RTS5912 wdt_rts5912.c)
3850
zephyr_library_sources_ifdef(CONFIG_WDT_SAM wdt_sam.c)
39-
zephyr_library_sources_ifdef(CONFIG_WDT_SAM4L wdt_sam4l.c)
4051
zephyr_library_sources_ifdef(CONFIG_WDT_SAM0 wdt_sam0.c)
52+
zephyr_library_sources_ifdef(CONFIG_WDT_SAM4L wdt_sam4l.c)
53+
zephyr_library_sources_ifdef(CONFIG_WDT_SF32LB wdt_sf32lb.c)
54+
zephyr_library_sources_ifdef(CONFIG_WDT_SHELL wdt_shell.c)
4155
zephyr_library_sources_ifdef(CONFIG_WDT_SIFIVE wdt_sifive.c)
4256
zephyr_library_sources_ifdef(CONFIG_WDT_SILABS_SIWX91X wdt_silabs_siwx91x.c)
43-
zephyr_library_sources_ifdef(CONFIG_WDT_TCO wdt_tco.c)
44-
zephyr_library_sources_ifdef(CONFIG_WDT_XEC wdt_mchp_xec.c)
45-
zephyr_library_sources_ifdef(CONFIG_WDT_COUNTER wdt_counter.c)
46-
zephyr_library_sources_ifdef(CONFIG_WDT_NXP_S32 wdt_nxp_s32.c)
4757
zephyr_library_sources_ifdef(CONFIG_WDT_SMARTBOND wdt_smartbond.c)
58+
zephyr_library_sources_ifdef(CONFIG_WDT_TCO wdt_tco.c)
59+
zephyr_library_sources_ifdef(CONFIG_WDT_TI_RTI wdt_ti_rti.c)
4860
zephyr_library_sources_ifdef(CONFIG_WDT_TI_TPS382X wdt_ti_tps382x.c)
61+
zephyr_library_sources_ifdef(CONFIG_WDT_XEC wdt_mchp_xec.c)
4962
zephyr_library_sources_ifdef(CONFIG_WDT_XILINX_AXI wdt_xilinx_axi.c)
50-
zephyr_library_sources_ifdef(CONFIG_WDT_INFINEON_CAT1 wdt_ifx_cat1.c)
51-
zephyr_library_sources_ifdef(CONFIG_WDT_OPENTITAN wdt_opentitan.c)
52-
zephyr_library_sources_ifdef(CONFIG_WDT_AMBIQ wdt_ambiq.c)
5363
zephyr_library_sources_ifdef(CONFIG_WDT_XMC4XXX wdt_xmc4xxx.c)
64+
zephyr_library_sources_ifdef(CONFIG_WDT_XT_ESP32 xt_wdt_esp32.c)
65+
zephyr_library_sources_ifdef(CONFIG_WWDGT_GD32 wdt_wwdgt_gd32.c)
66+
zephyr_library_sources_ifdef(CONFIG_WWDG_STM32 wdt_wwdg_stm32.c)
5467
zephyr_library_sources_ifdef(CONFIG_WWDT_NUMAKER wdt_wwdt_numaker.c)
55-
zephyr_library_sources_ifdef(CONFIG_WDT_ENE_KB106X wdt_ene_kb106x.c)
56-
zephyr_library_sources_ifdef(CONFIG_WDT_ENE_KB1200 wdt_ene_kb1200.c)
57-
zephyr_library_sources_ifdef(CONFIG_WDT_IWDG_WCH wdt_iwdg_wch.c)
5868
zephyr_library_sources_ifdef(CONFIG_XILINX_WINDOW_WATCHDOG wdt_xilinx_wwdt.c)
59-
60-
zephyr_library_sources_ifdef(CONFIG_WDT_DW wdt_dw.c wdt_dw_common.c)
61-
zephyr_library_sources_ifdef(CONFIG_WDT_INTEL_ADSP wdt_intel_adsp.c wdt_dw_common.c)
62-
zephyr_library_sources_ifdef(CONFIG_WDT_ANDES_ATCWDT200 wdt_andes_atcwdt200.c)
63-
zephyr_library_sources_ifdef(CONFIG_WDT_NXP_FS26 wdt_nxp_fs26.c)
64-
zephyr_library_sources_ifdef(CONFIG_WDT_SHELL wdt_shell.c)
65-
zephyr_library_sources_ifdef(CONFIG_WDT_RENESAS_RA wdt_renesas_ra.c)
66-
zephyr_library_sources_ifdef(CONFIG_WDT_RENESAS_RX_IWDT wdt_renesas_rx_iwdt.c)
67-
zephyr_library_sources_ifdef(CONFIG_WDT_RENESAS_RZ wdt_renesas_rz.c)
68-
zephyr_library_sources_ifdef(CONFIG_WDT_NXP_EWM wdt_nxp_ewm.c)
69-
zephyr_library_sources_ifdef(CONFIG_WDT_SF32LB wdt_sf32lb.c)
70-
zephyr_library_sources_ifdef(CONFIG_WDT_TI_RTI wdt_ti_rti.c)
71-
72-
zephyr_library_sources_ifdef(CONFIG_USERSPACE wdt_handlers.c)
69+
# zephyr-keep-sorted-stop

‎drivers/watchdog/Kconfig‎

Lines changed: 38 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -65,106 +65,58 @@ config WDT_COUNTER_CH_COUNT
6565

6666
endif # WDT_COUNTER
6767

68-
source "drivers/watchdog/Kconfig.stm32"
69-
68+
# zephyr-keep-sorted-start
69+
source "drivers/watchdog/Kconfig.ambiq"
70+
source "drivers/watchdog/Kconfig.andes_atcwdt200"
71+
source "drivers/watchdog/Kconfig.cc13xx_cc26xx"
72+
source "drivers/watchdog/Kconfig.cc23x0"
73+
source "drivers/watchdog/Kconfig.cc32xx"
7074
source "drivers/watchdog/Kconfig.cmsdk_apb"
71-
75+
source "drivers/watchdog/Kconfig.dw"
76+
source "drivers/watchdog/Kconfig.ene"
7277
source "drivers/watchdog/Kconfig.esp32"
73-
74-
source "drivers/watchdog/Kconfig.sam"
75-
76-
source "drivers/watchdog/Kconfig.sam4l"
77-
78-
source "drivers/watchdog/Kconfig.sam0"
79-
80-
source "drivers/watchdog/Kconfig.nrfx"
81-
82-
source "drivers/watchdog/Kconfig.mcux"
83-
84-
source "drivers/watchdog/Kconfig.mcux_imx"
85-
86-
source "drivers/watchdog/Kconfig.xec"
87-
78+
source "drivers/watchdog/Kconfig.gd32"
8879
source "drivers/watchdog/Kconfig.gecko"
89-
90-
source "drivers/watchdog/Kconfig.siwx91x"
91-
92-
source "drivers/watchdog/Kconfig.sifive"
93-
94-
source "drivers/watchdog/Kconfig.npcx"
95-
96-
source "drivers/watchdog/Kconfig.cc32xx"
97-
98-
source "drivers/watchdog/Kconfig.cc13xx_cc26xx"
99-
100-
source "drivers/watchdog/Kconfig.cc23x0"
101-
80+
source "drivers/watchdog/Kconfig.ifx_cat1"
81+
source "drivers/watchdog/Kconfig.intel_adsp"
10282
source "drivers/watchdog/Kconfig.it51xxx"
103-
10483
source "drivers/watchdog/Kconfig.it8xxx2"
105-
106-
source "drivers/watchdog/Kconfig.rpi_pico"
107-
108-
source "drivers/watchdog/Kconfig.gd32"
109-
84+
source "drivers/watchdog/Kconfig.litex"
85+
source "drivers/watchdog/Kconfig.max32"
86+
source "drivers/watchdog/Kconfig.mcux"
87+
source "drivers/watchdog/Kconfig.mcux_imx"
88+
source "drivers/watchdog/Kconfig.npcx"
11089
source "drivers/watchdog/Kconfig.npm13xx"
111-
11290
source "drivers/watchdog/Kconfig.npm2100"
113-
11491
source "drivers/watchdog/Kconfig.npm6001"
115-
92+
source "drivers/watchdog/Kconfig.nrfx"
93+
source "drivers/watchdog/Kconfig.numaker"
94+
source "drivers/watchdog/Kconfig.nxp_ewm"
95+
source "drivers/watchdog/Kconfig.nxp_fs26"
11696
source "drivers/watchdog/Kconfig.nxp_s32"
117-
118-
source "drivers/watchdog/Kconfig.dw"
119-
120-
source "drivers/watchdog/Kconfig.intel_adsp"
121-
122-
source "drivers/watchdog/Kconfig.smartbond"
123-
124-
source "drivers/watchdog/Kconfig.ti_tps382x"
125-
126-
source "drivers/watchdog/Kconfig.tco"
127-
128-
source "drivers/watchdog/Kconfig.xlnx"
129-
130-
source "drivers/watchdog/Kconfig.ifx_cat1"
131-
13297
source "drivers/watchdog/Kconfig.opentitan"
133-
134-
source "drivers/watchdog/Kconfig.andes_atcwdt200"
135-
136-
source "drivers/watchdog/Kconfig.nxp_fs26"
137-
138-
source "drivers/watchdog/Kconfig.ambiq"
139-
140-
source "drivers/watchdog/Kconfig.shell"
141-
142-
source "drivers/watchdog/Kconfig.max32"
143-
144-
source "drivers/watchdog/Kconfig.xmc4xxx"
145-
146-
source "drivers/watchdog/Kconfig.numaker"
147-
148-
source "drivers/watchdog/Kconfig.ene"
149-
150-
source "drivers/watchdog/Kconfig.litex"
151-
152-
source "drivers/watchdog/Kconfig.rts5912"
153-
15498
source "drivers/watchdog/Kconfig.renesas_ra"
155-
15699
source "drivers/watchdog/Kconfig.renesas_rx"
157-
158100
source "drivers/watchdog/Kconfig.renesas_rz"
159-
160-
source "drivers/watchdog/Kconfig.wch"
161-
162-
source "drivers/watchdog/Kconfig.nxp_ewm"
163-
101+
source "drivers/watchdog/Kconfig.rpi_pico"
102+
source "drivers/watchdog/Kconfig.rts5912"
103+
source "drivers/watchdog/Kconfig.sam"
104+
source "drivers/watchdog/Kconfig.sam0"
105+
source "drivers/watchdog/Kconfig.sam4l"
164106
source "drivers/watchdog/Kconfig.sf32lb"
165-
166-
source "drivers/watchdog/Kconfig.xilinx_wwdt"
167-
107+
source "drivers/watchdog/Kconfig.shell"
108+
source "drivers/watchdog/Kconfig.sifive"
109+
source "drivers/watchdog/Kconfig.siwx91x"
110+
source "drivers/watchdog/Kconfig.smartbond"
111+
source "drivers/watchdog/Kconfig.stm32"
112+
source "drivers/watchdog/Kconfig.tco"
168113
source "drivers/watchdog/Kconfig.ti_rti"
114+
source "drivers/watchdog/Kconfig.ti_tps382x"
115+
source "drivers/watchdog/Kconfig.wch"
116+
source "drivers/watchdog/Kconfig.xec"
117+
source "drivers/watchdog/Kconfig.xilinx_wwdt"
118+
source "drivers/watchdog/Kconfig.xlnx"
119+
source "drivers/watchdog/Kconfig.xmc4xxx"
120+
# zephyr-keep-sorted-stop
169121

170122
endif # WATCHDOG

0 commit comments

Comments
 (0)