From fdad72228c2802d503c36aeca39c8f41706bc1de Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Mon, 6 Jan 2025 09:34:48 +0100
Subject: [PATCH] fix(stm32): HAL build issue

Since stm32 core release 2.8.0 including:
https://github.com/stm32duino/Arduino_Core_STM32/pull/2380

ArduinoOTA can't be built due to direct include of HAL flash ex
module for STM32F0, STM32F1 and STM32F3.
Including stm32_def.h solve the issue by properly including HAL headers.

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 src/utility/stm32_flash_boot.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/utility/stm32_flash_boot.c b/src/utility/stm32_flash_boot.c
index a9e5aff..7369390 100644
--- a/src/utility/stm32_flash_boot.c
+++ b/src/utility/stm32_flash_boot.c
@@ -19,18 +19,9 @@
 #ifdef ARDUINO_ARCH_STM32
 
 #include "stm32_flash_boot.h"
-#if defined(STM32F0xx)
-#include <stm32f0xx_hal_flash_ex.h> // FLASH_PAGE_SIZE is in hal.h
-#elif defined(STM32F1xx)
-#include <stm32f1xx_hal_flash_ex.h> // FLASH_PAGE_SIZE is in hal.h
-#elif defined(STM32F2xx)
-#include <stm32f2xx.h>
-#elif defined(STM32F3xx)
-#include <stm32f3xx_hal_flash_ex.h> // FLASH_PAGE_SIZE is in hal.h
-#elif defined(STM32F4xx)
-#include "stm32f4xx.h"
-#elif defined(STM32F7xx)
-#include <stm32f7xx.h>
+#include "stm32_def.h" // To get FLASH_PAGE_SIZE
+
+#if defined(STM32F7xx)
 #define SMALL_SECTOR_SIZE 0x8000 // sectors 0 to 3
 #define LARGE_SECTOR_SIZE 0x40000 // from sector 5
 #endif