Skip to content

Commit adf7f4d

Browse files
committed
drivers: video: sort CMakeLists.txt/Kconfig imports
Switch to zephyr-keep-sorted-start/stop to keep checking the new driver imports are always sorted, which reduces chances of git conflict while adding new drivers from separate branches. Signed-off-by: Josuah Demangeon <me@josuah.net>
1 parent 4699121 commit adf7f4d

File tree

2 files changed

+30
-44
lines changed

2 files changed

+30
-44
lines changed

drivers/video/CMakeLists.txt

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,26 @@ 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_IMX335 imx335.c)
15+
zephyr_library_sources_ifdef(CONFIG_VIDEO_MCUX_CSI video_mcux_csi.c)
1016
zephyr_library_sources_ifdef(CONFIG_VIDEO_MCUX_MIPI_CSI2RX video_mcux_mipi_csi2rx.c)
17+
zephyr_library_sources_ifdef(CONFIG_VIDEO_MCUX_SDMA video_mcux_smartdma.c)
18+
zephyr_library_sources_ifdef(CONFIG_VIDEO_MT9M114 mt9m114.c)
19+
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV2640 ov2640.c)
20+
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV5640 ov5640.c)
21+
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV7670 ov7670.c)
22+
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV7725 ov7725.c)
23+
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV9655 ov9655.c)
1124
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_OV5640 ov5640.c)
19-
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV7670 ov7670.c)
20-
zephyr_library_sources_ifdef(CONFIG_VIDEO_OV9655 ov9655.c)
21-
zephyr_library_sources_ifdef(CONFIG_VIDEO_ESP32 video_esp32_dvp.c)
22-
zephyr_library_sources_ifdef(CONFIG_VIDEO_MCUX_SDMA video_mcux_smartdma.c)
23-
zephyr_library_sources_ifdef(CONFIG_VIDEO_EMUL_IMAGER video_emul_imager.c)
24-
zephyr_library_sources_ifdef(CONFIG_VIDEO_EMUL_RX video_emul_rx.c)
25-
zephyr_library_sources_ifdef(CONFIG_VIDEO_IMX335 imx335.c)
26-
zephyr_library_sources_ifdef(CONFIG_VIDEO_ST_MIPID02 video_st_mipid02.c)
27-
zephyr_library_sources_ifdef(CONFIG_VIDEO_STM32_DCMIPP video_stm32_dcmipp.c)
25+
zephyr_library_sources_ifdef(CONFIG_VIDEO_STM32_DCMI video_stm32_dcmi.c)
26+
zephyr_library_sources_ifdef(CONFIG_VIDEO_STM32_DCMIPP video_stm32_dcmipp.c)
27+
zephyr_library_sources_ifdef(CONFIG_VIDEO_ST_MIPID02 video_st_mipid02.c)
28+
zephyr_library_sources_ifdef(CONFIG_VIDEO_SW_GENERATOR video_sw_generator.c)
29+
# zephyr-keep-sorted-stop
2830

2931
zephyr_linker_sources(DATA_SECTIONS video.ld)

drivers/video/Kconfig

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -58,42 +58,26 @@ config VIDEO_I2C_RETRY_NUM
5858
The default is to not retry. Board configuration files or user project can then
5959
use the number of retries that matches their situation.
6060

61+
# zephyr-keep-sorted-start
62+
source "drivers/video/Kconfig.emul_imager"
63+
source "drivers/video/Kconfig.emul_rx"
6164
source "drivers/video/Kconfig.esp32_dvp"
62-
65+
source "drivers/video/Kconfig.gc2145"
66+
source "drivers/video/Kconfig.imx335"
6367
source "drivers/video/Kconfig.mcux_csi"
64-
6568
source "drivers/video/Kconfig.mcux_mipi_csi2rx"
66-
67-
source "drivers/video/Kconfig.shell"
68-
69-
source "drivers/video/Kconfig.sw_generator"
70-
69+
source "drivers/video/Kconfig.mcux_sdma"
7170
source "drivers/video/Kconfig.mt9m114"
72-
73-
source "drivers/video/Kconfig.ov7725"
74-
7571
source "drivers/video/Kconfig.ov2640"
76-
77-
source "drivers/video/Kconfig.stm32_dcmi"
78-
7972
source "drivers/video/Kconfig.ov5640"
80-
8173
source "drivers/video/Kconfig.ov7670"
82-
74+
source "drivers/video/Kconfig.ov7725"
8375
source "drivers/video/Kconfig.ov9655"
84-
85-
source "drivers/video/Kconfig.gc2145"
86-
87-
source "drivers/video/Kconfig.mcux_sdma"
88-
89-
source "drivers/video/Kconfig.emul_imager"
90-
91-
source "drivers/video/Kconfig.emul_rx"
92-
93-
source "drivers/video/Kconfig.imx335"
94-
76+
source "drivers/video/Kconfig.shell"
9577
source "drivers/video/Kconfig.st_mipid02"
96-
78+
source "drivers/video/Kconfig.stm32_dcmi"
9779
source "drivers/video/Kconfig.stm32_dcmipp"
80+
source "drivers/video/Kconfig.sw_generator"
81+
# zephyr-keep-sorted-stop
9882

9983
endif # VIDEO

0 commit comments

Comments
 (0)