2 files changed, 14 insertions, 8 deletions
diff --git a/os/hal/ports/STM32/STM32L4xx/hal_lld.h b/os/hal/ports/STM32/STM32L4xx/hal_lld.h
index d3b5578f4..40da4cc73 100644
--- a/os/hal/ports/STM32/STM32L4xx/hal_lld.h
+++ b/os/hal/ports/STM32/STM32L4xx/hal_lld.h
@@ -762,16 +762,22 @@
    added gradually.*/
 #if defined(STM32L432xx) && !defined(STM32L432_MCUCONF)
 #error "Using a wrong mcuconf.h file, STM32L432_MCUCONF not defined"
+#endif
 
-#elif defined(STM32L476xx) && !defined(STM32L476_MCUCONF)
+#if defined(STM32L476xx) && !defined(STM32L476_MCUCONF)
 #error "Using a wrong mcuconf.h file, STM32L476_MCUCONF not defined"
+#endif
+
+#if defined(STM32L486xx) && !defined(STM32L486_MCUCONF)
+#error "Using a wrong mcuconf.h file, STM32L486_MCUCONF not defined"
+#endif
 
-#elif defined(STM32L496xx) && !defined(STM32L496_MCUCONF)
+#if defined(STM32L496xx) && !defined(STM32L496_MCUCONF)
 #error "Using a wrong mcuconf.h file, STM32L496_MCUCONF not defined"
+#endif
 
-#elif defined(STM32L4A6xx) && !defined(STM32L4A6_MCUCONF)
+#if defined(STM32L4A6xx) && !defined(STM32L4A6_MCUCONF)
 #error "Using a wrong mcuconf.h file, STM32L4A6_MCUCONF not defined"
-
 #endif
 
 /*
diff --git a/os/hal/ports/STM32/STM32L4xx/stm32_registry.h b/os/hal/ports/STM32/STM32L4xx/stm32_registry.h
index c45061ea7..2e5b48724 100644
--- a/os/hal/ports/STM32/STM32L4xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32L4xx/stm32_registry.h
@@ -718,10 +718,10 @@
 #endif /* defined(STM32L443xx) */
 
 /*===========================================================================*/
-/* STM32L476xx.                                                              */
+/* STM32L476xx, STM32L486xx.                                                 */
 /*===========================================================================*/
 
-#if defined(STM32L476xx)
+#if defined(STM32L476xx) || defined(STM32L486xx)
 
 /* Clock attributes.*/
 #define STM32_CLOCK_HAS_HSI48               FALSE
@@ -1125,10 +1125,10 @@
 #endif /* defined(STM32L476xx) */
 
 /*===========================================================================*/
-/* STM32L496xx.                                                              */
+/* STM32L496xx, STM32L4A6xx.                                                 */
 /*===========================================================================*/
 
-#if defined(STM32L496xx)
+#if defined(STM32L496xx) || defined(STM32L4A6xx)
 
 /* Clock attributes.*/
 #define STM32_CLOCK_HAS_HSI48               FALSE