cmake: wifi: Select a proper ext flash interface for varius boards

When WiFi FW patches are stored on SPI (not QSPI), do not assume a
generic "spi" nodelabel. Locate the external flash via compatible
"jedec,spi-nor" with dt_comp_path and derive the SPI controller
path from that node using get_filename_component.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

Author: ArekBalysNordic

cmake/sysbuild/nrf700x.cmake

@@ -5,8 +5,24 @@
 #
 
 function(setup_nrf700x_xip_data)
-  dt_nodelabel(qspi_nodelabel TARGET ${DEFAULT_IMAGE} NODELABEL "qspi")
-  dt_reg_addr(qspi_xip_address TARGET ${DEFAULT_IMAGE} PATH "${qspi_nodelabel}" NAME "qspi_mm")
+
+  set(interface_xip_address 0)
+
+  if(SB_CONFIG_WIFI_PATCHES_EXT_FLASH_STORE_INTERFACE_QSPI)
+    dt_nodelabel(qspi_nodelabel TARGET ${DEFAULT_IMAGE} NODELABEL "qspi")
+    dt_reg_addr(interface_xip_address TARGET ${DEFAULT_IMAGE} PATH "${qspi_nodelabel}" NAME "qspi_mm")
+  elseif(SB_CONFIG_WIFI_PATCHES_EXT_FLASH_STORE_INTERFACE_SPI)
+    # Multiple SPI controllers may exist; use the sole okay jedec,spi-nor node and its SPI parent.
+    dt_comp_path(spi_nor_path TARGET ${DEFAULT_IMAGE} COMPATIBLE "jedec,spi-nor")
+
+    if(NOT DEFINED spi_nor_path)
+      message(FATAL_ERROR
+        "nRF WiFi FW patch external flash: no devicetree node with compatible \"jedec,spi-nor\"")
+    endif()
+
+    get_filename_component(spi_path "${spi_nor_path}" DIRECTORY)
+    dt_reg_addr(interface_xip_address TARGET ${DEFAULT_IMAGE} PATH "${spi_path}")
+  endif()
 
   set(NRF70_FW_BINS ${ZEPHYR_NRFXLIB_MODULE_DIR}/nrf_wifi/bin/ncs)
 
@@ -58,7 +74,7 @@ function(setup_nrf700x_xip_data)
         ${NRF70_PATCH}
         ${CMAKE_BINARY_DIR}/nrf70.hex
         $<TARGET_PROPERTY:partition_manager,PM_NRF70_WIFI_FW_OFFSET>
-        ${qspi_xip_address}
+        ${interface_xip_address}
         VERBATIM
       )
   else()
@@ -75,7 +91,7 @@ function(setup_nrf700x_xip_data)
         ${NRF70_PATCH}
         ${CMAKE_BINARY_DIR}/nrf70.hex
         ${nrf70_wifi_fw_partition_addr}
-        ${qspi_xip_address}
+        ${interface_xip_address}
         VERBATIM
       )
   endif()

sysbuild/Kconfig.wifi

@@ -63,6 +63,26 @@ config WIFI_PATCHES_EXT_FLASH_STORE
 
 endchoice
 
+choice WIFI_PATCHES_EXT_FLASH_STORE_INTERFACE
+	bool "External flash interface"
+	depends on WIFI_PATCHES_EXT_FLASH_XIP || WIFI_PATCHES_EXT_FLASH_STORE
+	default WIFI_PATCHES_EXT_FLASH_STORE_INTERFACE_QSPI if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840
+	default WIFI_PATCHES_EXT_FLASH_STORE_INTERFACE_SPI
+	help
+	  Select this option to select the interface for external flash access
+
+config WIFI_PATCHES_EXT_FLASH_STORE_INTERFACE_SPI
+	bool "SPI"
+	help
+	  Select this option to use SPI interface for external flash access
+
+config WIFI_PATCHES_EXT_FLASH_STORE_INTERFACE_QSPI
+	bool "QSPI"
+	help
+	  Select this option to use QSPI interface for external flash access
+
+endchoice
+
 endif # WIFI_NRF70
 
 endmenu