Skip to content

Commit 0c9c601

Browse files
kbidanikartben
authored andcommitted
drivers : flash: replace dt_nodelabel_has_prop()
Replace dt_nodelabel_has_prop() with dt_compat_any_has_prop() in Kconfig.stm32_ospi Signed-off-by: Khaoula Bidani <khaoula.bidani-ext@st.com>
1 parent f840a35 commit 0c9c601

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

drivers/flash/Kconfig.stm32_ospi

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
# Copyright (c) 2022 STMicroelectronics
44
# SPDX-License-Identifier: Apache-2.0
55

6-
DT_STM32_OCTOSPI_1_HAS_DMA := $(dt_nodelabel_has_prop,octospi1,dmas)
7-
DT_STM32_OCTOSPI_2_HAS_DMA := $(dt_nodelabel_has_prop,octospi2,dmas)
6+
DT_STM32_OCTOSPI_HAS_DMA := $(dt_compat_any_has_prop,$(DT_COMPAT_ST_STM32_OSPI),dmas)
87

98
config FLASH_STM32_OSPI
109
bool "STM32 Octo SPI Flash driver"
@@ -19,11 +18,9 @@ config FLASH_STM32_OSPI
1918
select FLASH_HAS_PAGE_LAYOUT
2019
select FLASH_HAS_EXPLICIT_ERASE
2120
select PINCTRL
22-
select DMA if $(DT_STM32_OCTOSPI_1_HAS_DMA) || $(DT_STM32_OCTOSPI_2_HAS_DMA)
23-
select USE_STM32_HAL_DMA if $(DT_STM32_OCTOSPI_1_HAS_DMA) || \
24-
$(DT_STM32_OCTOSPI_2_HAS_DMA)
21+
select DMA if $(DT_STM32_OCTOSPI_HAS_DMA)
22+
select USE_STM32_HAL_DMA if $(DT_STM32_OCTOSPI_HAS_DMA)
2523
select USE_STM32_HAL_DMA_EX if SOC_SERIES_STM32U5X && \
26-
($(DT_STM32_OCTOSPI_1_HAS_DMA) || \
27-
$(DT_STM32_OCTOSPI_2_HAS_DMA))
24+
$(DT_STM32_OCTOSPI_HAS_DMA)
2825
help
2926
Enable OSPI-NOR support on the STM32 family of processors.

drivers/flash/Kconfig.stm32_xspi

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
# Copyright (c) 2024 STMicroelectronics
44
# SPDX-License-Identifier: Apache-2.0
55

6-
DT_STM32_XSPI_1_HAS_DMA := $(dt_nodelabel_has_prop,xspi1,dmas)
7-
DT_STM32_XSPI_2_HAS_DMA := $(dt_nodelabel_has_prop,xspi2,dmas)
6+
DT_STM32_XSPI_HAS_DMA := $(dt_compat_any_has_prop,DT_COMPAT_ST_STM32_XSPI,dmas)
87

98
config FLASH_STM32_XSPI
109
bool "STM32 XSPI Flash driver"
@@ -17,11 +16,9 @@ config FLASH_STM32_XSPI
1716
select FLASH_PAGE_LAYOUT
1817
select FLASH_HAS_PAGE_LAYOUT
1918
select PINCTRL
20-
select DMA if $(DT_STM32_XSPI_1_HAS_DMA) || $(DT_STM32_XSPI_2_HAS_DMA)
21-
select USE_STM32_HAL_DMA if $(DT_STM32_XSPI_1_HAS_DMA) || \
22-
$(DT_STM32_XSPI_2_HAS_DMA)
19+
select DMA if $(DT_STM32_XSPI_HAS_DMA)
20+
select USE_STM32_HAL_DMA if $(DT_STM32_XSPI_HAS_DMA)
2321
select USE_STM32_HAL_DMA_EX if SOC_SERIES_STM32H5X && \
24-
($(DT_STM32_XSPI_1_HAS_DMA) || \
25-
$(DT_STM32_XSPI_2_HAS_DMA))
22+
$(DT_STM32_XSPI_HAS_DMA)
2623
help
2724
Enable XSPI-NOR support on the STM32 family of processors.

0 commit comments

Comments
 (0)