stm32cube: Remove deprecated eth API support on impacted series.

Support for this legacy API is deprecated since 4 releases now. Fully removing it now. Signed-off-by: Erwan Gouriou <erwan.gouriou@st.com>
zephyrproject-rtos · May 27, 2024 · 366c5c9 · 366c5c9
1 parent 0dca3c5
commit 366c5c9
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 43 deletions.
diff --git a/stm32cube/stm32f4xx/CMakeLists.txt b/stm32cube/stm32f4xx/CMakeLists.txt
@@ -24,11 +24,7 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA drivers/src/stm32f4xx_hal_
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA2D drivers/src/stm32f4xx_hal_dma2d.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA_EX drivers/src/stm32f4xx_hal_dma_ex.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DSI drivers/src/stm32f4xx_hal_dsi.c)
-if(CONFIG_ETH_STM32_HAL_API_V2)
-  zephyr_library_sources(drivers/src/stm32f4xx_hal_eth.c)
-else()
-  zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH drivers/src/Legacy/stm32f4xx_hal_eth.c)
-endif()
+zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH drivers/src/stm32f4xx_hal_eth.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_EXTI drivers/src/stm32f4xx_hal_exti.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_FLASH drivers/src/stm32f4xx_hal_flash.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_FLASH_EX drivers/src/stm32f4xx_hal_flash_ex.c)

diff --git a/stm32cube/stm32f4xx/drivers/include/stm32f4xx_hal_conf.h b/stm32cube/stm32f4xx/drivers/include/stm32f4xx_hal_conf.h
@@ -44,12 +44,7 @@
 #define HAL_DCMI_MODULE_ENABLED
 #define HAL_DMA_MODULE_ENABLED
 #define HAL_DMA2D_MODULE_ENABLED
-/* ETH driver is chosen by CMake/Kconfig */
-#if defined(CONFIG_ETH_STM32_HAL_API_V2)
-  #define HAL_ETH_MODULE_ENABLED
-#else
-  #define HAL_ETH_LEGACY_MODULE_ENABLED
-#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
+#define HAL_ETH_MODULE_ENABLED
 #define HAL_FLASH_MODULE_ENABLED
 #define HAL_NAND_MODULE_ENABLED
 #define HAL_NOR_MODULE_ENABLED

diff --git a/stm32cube/stm32f7xx/CMakeLists.txt b/stm32cube/stm32f7xx/CMakeLists.txt
@@ -25,11 +25,7 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA drivers/src/stm32f7xx_hal_
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA2D drivers/src/stm32f7xx_hal_dma2d.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA_EX drivers/src/stm32f7xx_hal_dma_ex.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DSI drivers/src/stm32f7xx_hal_dsi.c)
-if(CONFIG_ETH_STM32_HAL_API_V2)
-  zephyr_library_sources(drivers/src/stm32f7xx_hal_eth.c)
-else()
-  zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH drivers/src/Legacy/stm32f7xx_hal_eth.c)
-endif()
+zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH drivers/src/stm32f7xx_hal_eth.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_EXTI drivers/src/stm32f7xx_hal_exti.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_FLASH drivers/src/stm32f7xx_hal_flash.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_FLASH_EX drivers/src/stm32f7xx_hal_flash_ex.c)

diff --git a/stm32cube/stm32f7xx/drivers/include/stm32f7xx_hal_conf.h b/stm32cube/stm32f7xx/drivers/include/stm32f7xx_hal_conf.h
@@ -44,12 +44,7 @@
 #define HAL_DCMI_MODULE_ENABLED
 #define HAL_DMA_MODULE_ENABLED
 #define HAL_DMA2D_MODULE_ENABLED
-/* ETH driver is chosen by CMake/Kconfig */
-#if defined(CONFIG_ETH_STM32_HAL_API_V2)
-  #define HAL_ETH_MODULE_ENABLED
-#else
-  #define HAL_ETH_LEGACY_MODULE_ENABLED
-#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
+#define HAL_ETH_MODULE_ENABLED
 #define HAL_EXTI_MODULE_ENABLED
 #define HAL_FLASH_MODULE_ENABLED
 #define HAL_NAND_MODULE_ENABLED

diff --git a/stm32cube/stm32h5xx/CMakeLists.txt b/stm32cube/stm32h5xx/CMakeLists.txt
@@ -23,14 +23,8 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DCMI drivers/src/stm32h5xx_hal
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA drivers/src/stm32h5xx_hal_dma.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA_EX drivers/src/stm32h5xx_hal_dma_ex.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DTS drivers/src/stm32h5xx_hal_dts.c)
-if(CONFIG_USE_STM32_HAL_ETH)
-	if(NOT CONFIG_ETH_STM32_HAL_API_V2)
-		message(FATAL_ERROR "wrong config")
-	else()
-		zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH drivers/src/stm32h5xx_hal_eth.c)
-		zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH_EX drivers/src/stm32h5xx_hal_eth_ex.c)
-	endif()
-endif()
+zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH drivers/src/stm32h5xx_hal_eth.c)
+zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH_EX drivers/src/stm32h5xx_hal_eth_ex.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_EXTI drivers/src/stm32h5xx_hal_exti.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_FDCAN drivers/src/stm32h5xx_hal_fdcan.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_FLASH drivers/src/stm32h5xx_hal_flash.c)

diff --git a/stm32cube/stm32h7xx/CMakeLists.txt b/stm32cube/stm32h7xx/CMakeLists.txt
@@ -27,13 +27,8 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA2D drivers/src/stm32h7xx_ha
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA_EX drivers/src/stm32h7xx_hal_dma_ex.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DSI drivers/src/stm32h7xx_hal_dsi.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DTS drivers/src/stm32h7xx_hal_dts.c)
-if(CONFIG_ETH_STM32_HAL_API_V2)
-	zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH drivers/src/stm32h7xx_hal_eth.c)
-	zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH_EX drivers/src/stm32h7xx_hal_eth_ex.c)
-else()
-	zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH drivers/src/Legacy/stm32h7xx_hal_eth.c)
-	zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH_EX drivers/src/Legacy/stm32h7xx_hal_eth_ex.c)
-endif()
+zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH drivers/src/stm32h7xx_hal_eth.c)
+zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH_EX drivers/src/stm32h7xx_hal_eth_ex.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_EXTI drivers/src/stm32h7xx_hal_exti.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_FDCAN drivers/src/stm32h7xx_hal_fdcan.c)
 zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_FLASH drivers/src/stm32h7xx_hal_flash.c)

diff --git a/stm32cube/stm32h7xx/drivers/include/stm32h7xx_hal_conf.h b/stm32cube/stm32h7xx/drivers/include/stm32h7xx_hal_conf.h
@@ -48,12 +48,7 @@
 #define HAL_DMA2D_MODULE_ENABLED
 #define HAL_DTS_MODULE_ENABLED
 #define HAL_DSI_MODULE_ENABLED
-/* ETH driver is chosen by CMake/Kconfig */
-#if defined(CONFIG_ETH_STM32_HAL_API_V2)
-  #define HAL_ETH_MODULE_ENABLED
-#else
-  #define HAL_ETH_LEGACY_MODULE_ENABLED
-#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
+#define HAL_ETH_MODULE_ENABLED
 #define HAL_EXTI_MODULE_ENABLED
 #define HAL_FDCAN_MODULE_ENABLED
 #define HAL_FLASH_MODULE_ENABLED