Skip to content

Commit 82a0368

Browse files
josuahjosuah
committed
drivers: video: 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 10f68df commit 82a0368

File tree

2 files changed

+39
-58
lines changed

2 files changed

+39
-58
lines changed

‎drivers/video/CMakeLists.txt‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,31 @@ zephyr_library_sources(video_common.c)
66
zephyr_library_sources(video_ctrls.c)
77
zephyr_library_sources(video_device.c)
88

9-
zephyr_library_sources_ifdef(CONFIG_VIDEO_MCUX_CSI video_mcux_csi.c)
9+
# zephyr-keep-sorted-start
10+
zephyr_library_sources_ifdef(CONFIG_VIDEO_EMUL_IMAGER video_emul_imager.c)
11+
zephyr_library_sources_ifdef(CONFIG_VIDEO_EMUL_RX video_emul_rx.c)
12+
zephyr_library_sources_ifdef(CONFIG_VIDEO_ESP32 video_esp32_dvp.c)
13+
zephyr_library_sources_ifdef(CONFIG_VIDEO_GC2145 gc2145.c)
14+
zephyr_library_sources_ifdef(CONFIG_VIDEO_HIMAX_HM01B0 hm01b0.c)
15+
zephyr_library_sources_ifdef(CONFIG_VIDEO_HM0360 hm0360.c)
16+
zephyr_library_sources_ifdef(CONFIG_VIDEO_IMX335 imx335.c)
17+
zephyr_library_sources_ifdef(CONFIG_VIDEO_MCUX_CSI video_mcux_csi.c)
1018
zephyr_library_sources_ifdef(CONFIG_VIDEO_MCUX_MIPI_CSI2RX video_mcux_mipi_csi2rx.c)
11-
zephyr_library_sources_ifdef(CONFIG_VIDEO_SHELL video_shell.c)
12-
zephyr_library_sources_ifdef(CONFIG_VIDEO_SW_GENERATOR video_sw_generator.c)
13-
zephyr_library_sources_ifdef(CONFIG_VIDEO_MT9M114 mt9m114.c)
14-
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV7725 ov7725.c)
15-
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV2640 ov2640.c)
16-
zephyr_library_sources_ifdef(CONFIG_VIDEO_GC2145 gc2145.c)
17-
zephyr_library_sources_ifdef(CONFIG_VIDEO_STM32_DCMI video_stm32_dcmi.c)
18-
zephyr_library_sources_ifdef(CONFIG_VIDEO_STM32_VENC video_stm32_venc.c)
19-
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV5640 ov5640.c)
20-
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV7670 ov7670.c)
21-
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV9655 ov9655.c)
22-
zephyr_library_sources_ifdef(CONFIG_VIDEO_HM0360 hm0360.c)
23-
zephyr_library_sources_ifdef(CONFIG_VIDEO_ESP32 video_esp32_dvp.c)
24-
zephyr_library_sources_ifdef(CONFIG_VIDEO_MCUX_SDMA video_mcux_smartdma.c)
25-
zephyr_library_sources_ifdef(CONFIG_VIDEO_EMUL_IMAGER video_emul_imager.c)
26-
zephyr_library_sources_ifdef(CONFIG_VIDEO_EMUL_RX video_emul_rx.c)
27-
zephyr_library_sources_ifdef(CONFIG_VIDEO_IMX335 imx335.c)
28-
zephyr_library_sources_ifdef(CONFIG_VIDEO_ST_MIPID02 video_st_mipid02.c)
29-
zephyr_library_sources_ifdef(CONFIG_VIDEO_STM32_DCMIPP video_stm32_dcmipp.c)
19+
zephyr_library_sources_ifdef(CONFIG_VIDEO_MCUX_SDMA video_mcux_smartdma.c)
20+
zephyr_library_sources_ifdef(CONFIG_VIDEO_MT9M114 mt9m114.c)
21+
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV2640 ov2640.c)
22+
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV5640 ov5640.c)
23+
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV7670 ov7670.c)
24+
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV7725 ov7725.c)
25+
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV9655 ov9655.c)
3026
zephyr_library_sources_ifdef(CONFIG_VIDEO_RENESAS_RA_CEU video_renesas_ra_ceu.c)
31-
zephyr_library_sources_ifdef(CONFIG_VIDEO_STM32_JPEG video_stm32_jpeg.c)
32-
zephyr_library_sources_ifdef(CONFIG_VIDEO_HIMAX_HM01B0 hm01b0.c)
27+
zephyr_library_sources_ifdef(CONFIG_VIDEO_SHELL video_shell.c)
28+
zephyr_library_sources_ifdef(CONFIG_VIDEO_STM32_DCMI video_stm32_dcmi.c)
29+
zephyr_library_sources_ifdef(CONFIG_VIDEO_STM32_DCMIPP video_stm32_dcmipp.c)
30+
zephyr_library_sources_ifdef(CONFIG_VIDEO_STM32_JPEG video_stm32_jpeg.c)
31+
zephyr_library_sources_ifdef(CONFIG_VIDEO_STM32_VENC video_stm32_venc.c)
32+
zephyr_library_sources_ifdef(CONFIG_VIDEO_ST_MIPID02 video_st_mipid02.c)
33+
zephyr_library_sources_ifdef(CONFIG_VIDEO_SW_GENERATOR video_sw_generator.c)
34+
# zephyr-keep-sorted-stop
3335

3436
zephyr_linker_sources(DATA_SECTIONS video.ld)

‎drivers/video/Kconfig‎

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -64,52 +64,31 @@ config VIDEO_ENCODER_H264
6464
config VIDEO_ENCODER_JPEG
6565
bool "JPEG video encoder support"
6666

67+
# zephyr-keep-sorted-start
68+
source "drivers/video/Kconfig.emul_imager"
69+
source "drivers/video/Kconfig.emul_rx"
6770
source "drivers/video/Kconfig.esp32_dvp"
68-
71+
source "drivers/video/Kconfig.gc2145"
72+
source "drivers/video/Kconfig.hm01b0"
73+
source "drivers/video/Kconfig.hm0360"
74+
source "drivers/video/Kconfig.imx335"
6975
source "drivers/video/Kconfig.mcux_csi"
70-
7176
source "drivers/video/Kconfig.mcux_mipi_csi2rx"
72-
73-
source "drivers/video/Kconfig.shell"
74-
75-
source "drivers/video/Kconfig.sw_generator"
76-
77+
source "drivers/video/Kconfig.mcux_sdma"
7778
source "drivers/video/Kconfig.mt9m114"
78-
79-
source "drivers/video/Kconfig.ov7725"
80-
8179
source "drivers/video/Kconfig.ov2640"
82-
83-
source "drivers/video/Kconfig.stm32_dcmi"
84-
85-
source "drivers/video/Kconfig.stm32_venc"
86-
8780
source "drivers/video/Kconfig.ov5640"
88-
8981
source "drivers/video/Kconfig.ov7670"
90-
82+
source "drivers/video/Kconfig.ov7725"
9183
source "drivers/video/Kconfig.ov9655"
92-
93-
source "drivers/video/Kconfig.gc2145"
94-
95-
source "drivers/video/Kconfig.hm01b0"
96-
97-
source "drivers/video/Kconfig.hm0360"
98-
99-
source "drivers/video/Kconfig.mcux_sdma"
100-
101-
source "drivers/video/Kconfig.emul_imager"
102-
103-
source "drivers/video/Kconfig.emul_rx"
104-
105-
source "drivers/video/Kconfig.imx335"
106-
84+
source "drivers/video/Kconfig.renesas_ra_ceu"
85+
source "drivers/video/Kconfig.shell"
10786
source "drivers/video/Kconfig.st_mipid02"
108-
87+
source "drivers/video/Kconfig.stm32_dcmi"
10988
source "drivers/video/Kconfig.stm32_dcmipp"
110-
111-
source "drivers/video/Kconfig.renesas_ra_ceu"
112-
11389
source "drivers/video/Kconfig.stm32_jpeg"
90+
source "drivers/video/Kconfig.stm32_venc"
91+
source "drivers/video/Kconfig.sw_generator"
92+
# zephyr-keep-sorted-stop
11493

11594
endif # VIDEO

0 commit comments

Comments
 (0)