DLYB and SIOO not defined in stm32_hal for stm32h7rsx

Signed-off-by: Titouan Christophe <[email protected]>

Author: titouanc

drivers/flash/Kconfig.stm32_xspi

@@ -22,3 +22,13 @@ config FLASH_STM32_XSPI
 					$(DT_STM32_XSPI_HAS_DMA)
 	help
 	  Enable XSPI-NOR support on the STM32 family of processors.
+
+if FLASH_STM32_XSPI
+config STM32_XSPI_HAS_DLYB
+	bool
+	default y if !SOC_SERIES_STM32H7RSX
+
+config STM32_XSPI_HAS_SIOO
+	bool
+	default y if !SOC_SERIES_STM32H7RSX
+endif

drivers/flash/flash_stm32_xspi.c

@@ -190,7 +190,9 @@ static XSPI_RegularCmdTypeDef xspi_prepare_cmd(const uint8_t transfer_mode,
 		.DQSMode = (transfer_rate == XSPI_DTR_TRANSFER)
 				? HAL_XSPI_DQS_ENABLE
 				: HAL_XSPI_DQS_DISABLE,
+#if CONFIG_STM32_XSPI_HAS_SIOO
 		.SIOOMode = HAL_XSPI_SIOO_INST_EVERY_CMD,
+#endif
 	};
 
 	switch (transfer_mode) {
@@ -773,7 +775,9 @@ static int stm32_xspi_mem_reset(const struct device *dev)
 		.DataLength = HAL_XSPI_DATA_NONE,
 		.DummyCycles = 0U,
 		.DQSMode = HAL_XSPI_DQS_DISABLE,
+#if CONFIG_STM32_XSPI_HAS_SIOO
 		.SIOOMode = HAL_XSPI_SIOO_INST_EVERY_CMD,
+#endif
 	};
 
 	/* Reset enable in SPI mode and STR transfer mode */
@@ -1021,7 +1025,9 @@ static int flash_stm32_xspi_erase(const struct device *dev, off_t addr,
 		.DataMode = HAL_XSPI_DATA_NONE,
 		.DummyCycles = 0U,
 		.DQSMode = HAL_XSPI_DQS_DISABLE,
+#if CONFIG_STM32_XSPI_HAS_SIOO
 		.SIOOMode = HAL_XSPI_SIOO_INST_EVERY_CMD,
+#endif
 	};
 
 	if (stm32_xspi_mem_ready(dev,
@@ -2121,11 +2127,13 @@ static int flash_stm32_xspi_init(const struct device *dev)
 	} else {
 
 	}
+#if CONFIG_STM32_XSPI_HAS_DLYB
 #if STM32_XSPI_DLYB_BYPASSED
 	dev_data->hxspi.Init.DelayBlockBypass = HAL_XSPI_DELAY_BLOCK_BYPASS;
 #else
 	dev_data->hxspi.Init.DelayBlockBypass = HAL_XSPI_DELAY_BLOCK_ON;
 #endif /* STM32_XSPI_DLYB_BYPASSED */
+#endif
 
 
 	if (HAL_XSPI_Init(&dev_data->hxspi) != HAL_OK) {
@@ -2155,6 +2163,7 @@ static int flash_stm32_xspi_init(const struct device *dev)
 
 #endif /* XSPIM */
 
+#if CONFIG_STM32_XSPI_HAS_DLYB
 #if defined(DLYB_XSPI1) || defined(DLYB_XSPI2) || defined(DLYB_OCTOSPI1) || defined(DLYB_OCTOSPI2)
 	/* XSPI delay block init Function */
 	HAL_XSPI_DLYB_CfgTypeDef xspi_delay_block_cfg = {0};
@@ -2170,6 +2179,7 @@ static int flash_stm32_xspi_init(const struct device *dev)
 
 	LOG_DBG("Delay Block Init");
 #endif /* DLYB_ */
+#endif
 
 #if STM32_XSPI_USE_DMA
 	/* Configure and enable the DMA channels after XSPI config */