Skip to content

Commit 20ca841

Browse files
committed
Revert "[nrf fromlist] drivers: flash: Add generic NOR flash driver for MSPI devices"
This reverts commit c6ace4b.
1 parent 10ab9b6 commit 20ca841

File tree

4 files changed

+0
-661
lines changed

4 files changed

+0
-661
lines changed

drivers/flash/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_MX25UM51345G flash_mcux_f
3434
zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_NOR flash_mcux_flexspi_nor.c)
3535
zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_ATXP032 flash_mspi_atxp032.c)
3636
zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_EMUL_DEVICE flash_mspi_emul_device.c)
37-
zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_NOR flash_mspi_nor.c)
3837
zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_NOR flash_npcx_fiu_nor.c)
3938
zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_QSPI flash_npcx_fiu_qspi.c)
4039
zephyr_library_sources_ifdef(CONFIG_FLASH_RPI_PICO flash_rpi_pico.c)

drivers/flash/Kconfig.mspi

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,4 @@ config FLASH_MSPI_ATXP032
2828
select FLASH_JESD216
2929
select MSPI_AMBIQ_AP3 if SOC_SERIES_APOLLO3X
3030

31-
menuconfig FLASH_MSPI_NOR
32-
bool "Generic MSPI NOR Flash"
33-
default y
34-
depends on DT_HAS_JEDEC_MSPI_NOR_ENABLED
35-
select FLASH_MSPI
36-
select FLASH_HAS_EXPLICIT_ERASE
37-
select FLASH_JESD216
38-
select GPIO if $(dt_compat_any_has_prop,$(DT_COMPAT_JEDEC_MSPI_NOR),reset-gpios)
39-
40-
config FLASH_MSPI_NOR_INIT_PRIORITY
41-
int
42-
depends on FLASH_MSPI_NOR
43-
default 80
44-
help
45-
Device driver initialization priority.
46-
Device is connected to MSPI bus, it has to
47-
be initialized after MSPI driver.
48-
4931
endmenu

0 commit comments

Comments
 (0)