Skip to content

Commit 8640b79

Browse files
rettichschnidianangl
rettichschnidi
authored and
anangl
committed
[nrf fromtree] drivers: flash: Sort CMake and Kconfig files alphabetically
By sorting the lines alphabetically, merge conflicts can be reduced. Signed-off-by: Reto Schneider <[email protected]> (cherry picked from commit 7fa5a22)
1 parent 45943dc commit 8640b79

File tree

2 files changed

+79
-104
lines changed

2 files changed

+79
-104
lines changed

‎drivers/flash/CMakeLists.txt‎

Lines changed: 53 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,55 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/flash.h)
1616

1717
zephyr_library()
1818

19+
# zephyr-keep-sorted-start
20+
zephyr_library_sources_ifdef(CONFIG_FLASH_JESD216 jesd216.c)
21+
zephyr_library_sources_ifdef(CONFIG_FLASH_PAGE_LAYOUT flash_page_layout.c)
22+
zephyr_library_sources_ifdef(CONFIG_FLASH_SHELL flash_shell.c)
23+
zephyr_library_sources_ifdef(CONFIG_USERSPACE flash_handlers.c)
24+
# zephyr-keep-sorted-stop
25+
26+
# zephyr-keep-sorted-start
27+
zephyr_library_sources_ifdef(CONFIG_FLASH_AMBIQ flash_ambiq.c)
28+
zephyr_library_sources_ifdef(CONFIG_FLASH_ANDES_QSPI flash_andes_qspi.c)
29+
zephyr_library_sources_ifdef(CONFIG_FLASH_CAD_QSPI_NOR flash_cadence_qspi_nor.c flash_cadence_qspi_nor_ll.c)
30+
zephyr_library_sources_ifdef(CONFIG_FLASH_CDNS_NAND flash_cadence_nand.c flash_cadence_nand_ll.c)
31+
zephyr_library_sources_ifdef(CONFIG_FLASH_INFINEON_CAT1 flash_ifx_cat1.c)
32+
zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_HYPERFLASH flash_mcux_flexspi_hyperflash.c)
33+
zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_MX25UM51345G flash_mcux_flexspi_mx25um51345g.c)
34+
zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_NOR flash_mcux_flexspi_nor.c)
35+
zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_ATXP032 flash_mspi_atxp032.c)
36+
zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_EMUL_DEVICE flash_mspi_emul_device.c)
37+
zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_NOR flash_npcx_fiu_nor.c)
38+
zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_QSPI flash_npcx_fiu_qspi.c)
39+
zephyr_library_sources_ifdef(CONFIG_FLASH_RPI_PICO flash_rpi_pico.c)
40+
zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_OSPI flash_stm32_ospi.c)
41+
zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_QSPI flash_stm32_qspi.c)
42+
zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_XSPI flash_stm32_xspi.c)
43+
zephyr_library_sources_ifdef(CONFIG_INFINEON_CAT1_QSPI_FLASH flash_ifx_cat1_qspi.c)
44+
zephyr_library_sources_ifdef(CONFIG_NORDIC_QSPI_NOR nrf_qspi_nor.c)
1945
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_CC13XX_CC26XX soc_flash_cc13xx_cc26xx.c)
46+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_ESP32 flash_esp32.c)
47+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_GECKO flash_gecko.c)
48+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_ITE_IT8XXX2 flash_ite_it8xxx2.c)
49+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_LPC soc_flash_lpc.c)
50+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_MCUX soc_flash_mcux.c)
51+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NIOS2_QSPI soc_flash_nios2_qspi.c)
52+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF soc_flash_nrf.c)
53+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_MRAM soc_flash_nrf_mram.c)
54+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_RRAM soc_flash_nrf_rram.c)
55+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NUMAKER soc_flash_numaker.c)
56+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NUMAKER_RMC soc_flash_numaker_rmc.c)
57+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_RV32M1 soc_flash_rv32m1.c)
58+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SAM flash_sam.c)
59+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SAM0 flash_sam0.c)
60+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SI32 flash_si32.c)
61+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SMARTBOND flash_smartbond.c)
2062
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_TELINK_B91 soc_flash_b91.c)
63+
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_XMC4XXX soc_flash_xmc4xxx.c)
64+
zephyr_library_sources_ifdef(CONFIG_SPI_FLASH_AT45 spi_flash_at45.c)
2165
zephyr_library_sources_ifdef(CONFIG_SPI_NOR spi_nor.c)
22-
zephyr_library_sources_ifdef(CONFIG_NORDIC_QSPI_NOR nrf_qspi_nor.c)
66+
# zephyr-keep-sorted-stop
67+
2368
if(CONFIG_FLASH_SIMULATOR)
2469
zephyr_library_sources(flash_simulator.c)
2570
if(CONFIG_NATIVE_LIBRARY)
@@ -28,36 +73,7 @@ if(CONFIG_FLASH_SIMULATOR)
2873
zephyr_library_sources(flash_simulator_native.c)
2974
endif()
3075
endif()
31-
zephyr_library_sources_ifdef(CONFIG_SPI_FLASH_AT45 spi_flash_at45.c)
32-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_ITE_IT8XXX2 flash_ite_it8xxx2.c)
33-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF soc_flash_nrf.c)
34-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_MCUX soc_flash_mcux.c)
35-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_LPC soc_flash_lpc.c)
36-
zephyr_library_sources_ifdef(CONFIG_FLASH_PAGE_LAYOUT flash_page_layout.c)
37-
zephyr_library_sources_ifdef(CONFIG_USERSPACE flash_handlers.c)
38-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SAM0 flash_sam0.c)
39-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SAM flash_sam.c)
40-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NIOS2_QSPI soc_flash_nios2_qspi.c)
41-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_GECKO flash_gecko.c)
42-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_RV32M1 soc_flash_rv32m1.c)
43-
zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_QSPI flash_npcx_fiu_qspi.c)
44-
zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_NOR flash_npcx_fiu_nor.c)
45-
zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_QSPI flash_stm32_qspi.c)
46-
zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_OSPI flash_stm32_ospi.c)
47-
zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_XSPI flash_stm32_xspi.c)
48-
zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_MX25UM51345G flash_mcux_flexspi_mx25um51345g.c)
49-
zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_NOR flash_mcux_flexspi_nor.c)
50-
zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_HYPERFLASH flash_mcux_flexspi_hyperflash.c)
51-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_ESP32 flash_esp32.c)
52-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SMARTBOND flash_smartbond.c)
53-
zephyr_library_sources_ifdef(CONFIG_FLASH_CAD_QSPI_NOR flash_cadence_qspi_nor.c flash_cadence_qspi_nor_ll.c)
54-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_XMC4XXX soc_flash_xmc4xxx.c)
55-
zephyr_library_sources_ifdef(CONFIG_FLASH_RPI_PICO flash_rpi_pico.c)
56-
zephyr_library_sources_ifdef(CONFIG_FLASH_ANDES_QSPI flash_andes_qspi.c)
57-
zephyr_library_sources_ifdef(CONFIG_FLASH_AMBIQ flash_ambiq.c)
58-
zephyr_library_sources_ifdef(CONFIG_FLASH_CDNS_NAND flash_cadence_nand.c flash_cadence_nand_ll.c)
59-
zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_EMUL_DEVICE flash_mspi_emul_device.c)
60-
zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_ATXP032 flash_mspi_atxp032.c)
76+
6177
zephyr_library_include_directories_ifdef(CONFIG_MSPI ${ZEPHYR_BASE}/drivers/mspi)
6278
if(CONFIG_FLASH_MCUX_FLEXSPI_XIP)
6379
dt_chosen(chosen_flash PROPERTY "zephyr,flash")
@@ -91,25 +107,29 @@ if(CONFIG_SOC_FLASH_STM32)
91107
zephyr_library_sources(flash_stm32.c)
92108
zephyr_library_sources_ifdef(CONFIG_FLASH_EX_OP_ENABLED flash_stm32_ex_op.c)
93109

110+
# zephyr-keep-sorted-start
94111
zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32F1_FLASH_CONTROLLER_ENABLED flash_stm32f1x.c)
95112
zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32F2_FLASH_CONTROLLER_ENABLED flash_stm32f2x.c)
96113
zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32F4_FLASH_CONTROLLER_ENABLED flash_stm32f4x.c)
97114
zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32F7_FLASH_CONTROLLER_ENABLED flash_stm32f7x.c)
115+
zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32G0_FLASH_CONTROLLER_ENABLED flash_stm32g0x.c)
116+
zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32G4_FLASH_CONTROLLER_ENABLED flash_stm32g4x.c)
98117
zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32L4_FLASH_CONTROLLER_ENABLED flash_stm32l4x.c)
99118
zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32L5_FLASH_CONTROLLER_ENABLED flash_stm32l5x.c)
100119
zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32WB_FLASH_CONTROLLER_ENABLED flash_stm32wbx.c)
101-
zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32G0_FLASH_CONTROLLER_ENABLED flash_stm32g0x.c)
102-
zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32G4_FLASH_CONTROLLER_ENABLED flash_stm32g4x.c)
120+
# zephyr-keep-sorted-stop
103121
endif()
104122
endif()
105123
endif()
106124

107125
if(CONFIG_SOC_FLASH_GD32)
108126
zephyr_library_sources(flash_gd32.c)
109127

128+
# zephyr-keep-sorted-start
110129
zephyr_library_sources_ifdef(CONFIG_GD32_NV_FLASH_V1 flash_gd32_v1.c)
111130
zephyr_library_sources_ifdef(CONFIG_GD32_NV_FLASH_V2 flash_gd32_v2.c)
112131
zephyr_library_sources_ifdef(CONFIG_GD32_NV_FLASH_V3 flash_gd32_v3.c)
132+
# zephyr-keep-sorted-stop
113133
endif()
114134

115135
zephyr_library_include_directories_ifdef(
@@ -133,16 +153,6 @@ zephyr_library_include_directories_ifdef(
133153
${ZEPHYR_BASE}/drivers/memc
134154
)
135155

136-
zephyr_library_sources_ifdef(CONFIG_FLASH_SHELL flash_shell.c)
137-
zephyr_library_sources_ifdef(CONFIG_FLASH_JESD216 jesd216.c)
138-
zephyr_library_sources_ifdef(CONFIG_FLASH_INFINEON_CAT1 flash_ifx_cat1.c)
139-
zephyr_library_sources_ifdef(CONFIG_INFINEON_CAT1_QSPI_FLASH flash_ifx_cat1_qspi.c)
140-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NUMAKER soc_flash_numaker.c)
141-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_RRAM soc_flash_nrf_rram.c)
142-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_MRAM soc_flash_nrf_mram.c)
143-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NUMAKER_RMC soc_flash_numaker_rmc.c)
144-
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SI32 flash_si32.c)
145-
146156
if(CONFIG_RA_FLASH_HP)
147157
zephyr_library_sources(flash_hp_ra.c)
148158
zephyr_library_sources_ifdef(CONFIG_FLASH_EX_OP_ENABLED flash_hp_ra_ex_op.c)

‎drivers/flash/Kconfig‎

Lines changed: 26 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -163,81 +163,46 @@ config FLASH_INIT_PRIORITY
163163
priority is used unless the driver implementation has its own
164164
initialization priority
165165

166+
# zephyr-keep-sorted-start
167+
source "drivers/flash/Kconfig.ambiq"
168+
source "drivers/flash/Kconfig.andes"
169+
source "drivers/flash/Kconfig.at45"
166170
source "drivers/flash/Kconfig.b91"
167-
171+
source "drivers/flash/Kconfig.cadence_nand"
172+
source "drivers/flash/Kconfig.cadence_qspi_nor"
168173
source "drivers/flash/Kconfig.cc13xx_cc26xx"
169-
170-
source "drivers/flash/Kconfig.at45"
171-
172174
source "drivers/flash/Kconfig.esp32"
173-
175+
source "drivers/flash/Kconfig.gd32"
176+
source "drivers/flash/Kconfig.gecko"
177+
source "drivers/flash/Kconfig.ifx_cat1"
174178
source "drivers/flash/Kconfig.it8xxx2"
175-
176-
source "drivers/flash/Kconfig.nrf"
177-
178179
source "drivers/flash/Kconfig.lpc"
179-
180180
source "drivers/flash/Kconfig.mcux"
181-
182181
source "drivers/flash/Kconfig.mspi"
183-
184182
source "drivers/flash/Kconfig.nios2_qspi"
185-
186-
source "drivers/flash/Kconfig.npcx_fiu"
187-
188-
source "drivers/flash/Kconfig.gecko"
189-
190183
source "drivers/flash/Kconfig.nor"
191-
184+
source "drivers/flash/Kconfig.nordic_qspi_nor"
185+
source "drivers/flash/Kconfig.npcx_fiu"
186+
source "drivers/flash/Kconfig.nrf"
187+
source "drivers/flash/Kconfig.nrf_mram"
188+
source "drivers/flash/Kconfig.nrf_rram"
189+
source "drivers/flash/Kconfig.numaker"
190+
source "drivers/flash/Kconfig.numaker_rmc"
191+
source "drivers/flash/Kconfig.nxp_s32"
192+
source "drivers/flash/Kconfig.renesas_ra"
192193
source "drivers/flash/Kconfig.rpi_pico"
193-
194-
source "drivers/flash/Kconfig.stm32"
195-
196-
source "drivers/flash/Kconfig.stm32_qspi"
197-
198-
source "drivers/flash/Kconfig.stm32_ospi"
199-
200-
source "drivers/flash/Kconfig.stm32_xspi"
201-
202-
source "drivers/flash/Kconfig.sam0"
203-
194+
source "drivers/flash/Kconfig.rv32m1"
204195
source "drivers/flash/Kconfig.sam"
205-
206-
source "drivers/flash/Kconfig.simulator"
207-
196+
source "drivers/flash/Kconfig.sam0"
208197
source "drivers/flash/Kconfig.si32"
209-
210-
source "drivers/flash/Kconfig.rv32m1"
211-
212-
source "drivers/flash/Kconfig.nordic_qspi_nor"
213-
198+
source "drivers/flash/Kconfig.simulator"
214199
source "drivers/flash/Kconfig.smartbond"
215-
216-
source "drivers/flash/Kconfig.cadence_qspi_nor"
217-
218-
source "drivers/flash/Kconfig.gd32"
219-
200+
source "drivers/flash/Kconfig.stm32"
201+
source "drivers/flash/Kconfig.stm32_ospi"
202+
source "drivers/flash/Kconfig.stm32_qspi"
203+
source "drivers/flash/Kconfig.stm32_xspi"
220204
source "drivers/flash/Kconfig.xmc4xxx"
221-
222-
source "drivers/flash/Kconfig.ifx_cat1"
223-
224-
source "drivers/flash/Kconfig.cadence_nand"
225-
226-
source "drivers/flash/Kconfig.numaker"
227-
228-
source "drivers/flash/Kconfig.nxp_s32"
229-
230-
source "drivers/flash/Kconfig.andes"
231-
232-
source "drivers/flash/Kconfig.ambiq"
233-
234-
source "drivers/flash/Kconfig.nrf_rram"
235-
236-
source "drivers/flash/Kconfig.nrf_mram"
237-
238-
source "drivers/flash/Kconfig.numaker_rmc"
239-
240-
source "drivers/flash/Kconfig.renesas_ra"
205+
# zephyr-keep-sorted-stop
241206

242207
module = FLASH
243208
module-str = flash

0 commit comments

Comments
 (0)