Disable LL driver

Author: Jamie Smith

targets/TARGET_STM/TARGET_STM32H5/STM32Cube_FW/CMSIS/stm32h5xx.h

@@ -8,8 +8,8 @@
   *          is using in the C source code, usually in main.c. This file contains:
   *           - Configuration section that allows to select:
   *              - The STM32H5xx device used in the target application
-  *              - To use or not the peripheral’s drivers in application code(i.e.
-  *                code will be based on direct access to peripheral’s registers
+  *              - To use or not the peripheral drivers in application code(i.e.
+  *                code will be based on direct access to peripherals' registers
   *                rather than drivers API), this option is controlled by
   *                "#define USE_HAL_DRIVER"
   *

targets/TARGET_STM/TARGET_STM32H5/STM32Cube_FW/CMakeLists.txt

@@ -97,7 +97,6 @@ target_sources(mbed-stm32h5cube-fw
         STM32H5xx_HAL_Driver/stm32h5xx_ll_fmc.c
         STM32H5xx_HAL_Driver/stm32h5xx_ll_gpio.c
         STM32H5xx_HAL_Driver/stm32h5xx_ll_i2c.c
-        STM32H5xx_HAL_Driver/stm32h5xx_ll_i3c.c
         STM32H5xx_HAL_Driver/stm32h5xx_ll_icache.c
         STM32H5xx_HAL_Driver/stm32h5xx_ll_lptim.c
         STM32H5xx_HAL_Driver/stm32h5xx_ll_lpuart.c
@@ -114,6 +113,9 @@ target_sources(mbed-stm32h5cube-fw
         STM32H5xx_HAL_Driver/stm32h5xx_ll_usb.c
         STM32H5xx_HAL_Driver/stm32h5xx_ll_utils.c
         STM32H5xx_HAL_Driver/stm32h5xx_util_i3c.c
+
+        # NOTE: Don't compile stm32h5xx_ll_i3c.c, it does not build if the
+        # HAL driver for i3c is enabled due to a circular include issue.
 )
 
 # Silence warning

targets/TARGET_STM/TARGET_STM32H5/STM32Cube_FW/stm32h5xx_hal_conf.h

@@ -422,12 +422,9 @@ in voltage and temperature.*/
 #include "stm32h5xx_hal_i2s.h"
 #endif /* HAL_I2S_MODULE_ENABLED */
 
-// Mbed patch to prevent circular include: ll_i3c.h includes this header, but hal_i3c.h needs ll_i3c.h to compile.
-// Boom.
-// So, don't include hal_i3c.h from this header.
-// #ifdef HAL_I3C_MODULE_ENABLED
-// #include "stm32h5xx_hal_i3c.h"
-// #endif /* HAL_I3C_MODULE_ENABLED */
+#ifdef HAL_I3C_MODULE_ENABLED
+#include "stm32h5xx_hal_i3c.h"
+#endif /* HAL_I3C_MODULE_ENABLED */
 
 #ifdef HAL_IWDG_MODULE_ENABLED
 #include "stm32h5xx_hal_iwdg.h"