4 files changed, 17 insertions, 9 deletions
diff --git a/os/hal/platforms/STM8L/hal_lld.c b/os/hal/platforms/STM8L/hal_lld.c
index 881a09fdd..5f4dacb53 100644
--- a/os/hal/platforms/STM8L/hal_lld.c
+++ b/os/hal/platforms/STM8L/hal_lld.c
@@ -49,11 +49,15 @@ ROMCONST PALConfig pal_default_config =
     {VAL_GPIODODR, 0, VAL_GPIODDDR, VAL_GPIODCR1, VAL_GPIODCR2},
     {VAL_GPIOEODR, 0, VAL_GPIOEDDR, VAL_GPIOECR1, VAL_GPIOECR2},
     {VAL_GPIOFODR, 0, VAL_GPIOFDDR, VAL_GPIOFCR1, VAL_GPIOFCR2},
+#if STM8L_HAS_GPIOG
     {VAL_GPIOGODR, 0, VAL_GPIOGDDR, VAL_GPIOGCR1, VAL_GPIOGCR2},
-#if defined(STM8L15X_MDP) || defined(STM8L15X_HD)
+#if STM8L_HAS_GPIOI
     {VAL_GPIOHODR, 0, VAL_GPIOHDDR, VAL_GPIOHCR1, VAL_GPIOHCR2},
+#if STM8L_HAS_GPIOH
     {VAL_GPIOIODR, 0, VAL_GPIOIDDR, VAL_GPIOICR1, VAL_GPIOICR2},
 #endif
+#endif
+#endif
   }
 };
 
@@ -80,7 +84,7 @@ ROMCONST PALConfig pal_default_config =
  */
 void hal_lld_init(void) {
 
-#if STM8L_CLOCK_INIT
+#if !STM8L_NO_CLOCK_INIT
   /* Makes sure that HSI is stable before proceeding.*/
   CLK->ICKCR |= CLK_ICKCR_HSION;
   while ((CLK->ICKCR & CLK_ICKCR_HSIRDY) == 0)
@@ -141,7 +145,7 @@ void hal_lld_init(void) {
 #if !STM8L_HSI_ENABLED
   CLK->ICKCR &= ~CLK_ICKCR_HSION;
 #endif
-#endif /* STM8L_CLOCK_INIT */
+#endif /* !STM8L_NO_CLOCK_INIT */
 }
 
 /** @} */
diff --git a/os/hal/platforms/STM8L/hal_lld.h b/os/hal/platforms/STM8L/hal_lld.h
index 45fcc29aa..a26e6ba84 100644
--- a/os/hal/platforms/STM8L/hal_lld.h
+++ b/os/hal/platforms/STM8L/hal_lld.h
@@ -102,10 +102,10 @@
 /*===========================================================================*/
 
 /**
- * @brief   Enables the clock initialization in the HAL.
+ * @brief   Disables the clock initialization in the HAL.
  */
 #if !defined(STM8L_NO_CLOCK_INIT) || defined(__DOXYGEN__)
-#define STM8L_CLOCK_INIT            TRUE
+#define STM8L_NO_CLOCK_INIT         FALSE
 #endif
 
 /**
diff --git a/os/hal/platforms/STM8L/hal_lld_stm8l_md.h b/os/hal/platforms/STM8L/hal_lld_stm8l_md.h
index c32ec112f..f1b1e89b8 100644
--- a/os/hal/platforms/STM8L/hal_lld_stm8l_md.h
+++ b/os/hal/platforms/STM8L/hal_lld_stm8l_md.h
@@ -55,7 +55,7 @@
 #define STM8L_HAS_GPIOD             TRUE
 #define STM8L_HAS_GPIOE             TRUE
 #define STM8L_HAS_GPIOF             TRUE
-#define STM8L_HAS_GPIOG             TRUE
+#define STM8L_HAS_GPIOG             FALSE
 #define STM8L_HAS_GPIOH             FALSE
 #define STM8L_HAS_GPIOI             FALSE
 
diff --git a/os/hal/platforms/STM8L/pal_lld.h b/os/hal/platforms/STM8L/pal_lld.h
index 6cf2afb26..347fed85a 100644
--- a/os/hal/platforms/STM8L/pal_lld.h
+++ b/os/hal/platforms/STM8L/pal_lld.h
@@ -58,10 +58,14 @@
  *          or whole ports can be reprogrammed at later time.
  */
 typedef struct {
-#if defined(STM8L15X_MD) || defined(__DOXYGEN__)
-  GPIO_TypeDef          P[7];
-#elif defined(STM8L15X_MDP) || defined(STM8L15X_HD)
+#if STM8L_HAS_GPIOI || defined(__DOXYGEN__)
   GPIO_TypeDef          P[9];
+#elif STM8L_HAS_GPIOH || defined(__DOXYGEN__)
+  GPIO_TypeDef          P[8];
+#elif STM8L_HAS_GPIOG || defined(__DOXYGEN__)
+  GPIO_TypeDef          P[7];
+#else
+  GPIO_TypeDef          P[6];
 #endif
 } PALConfig;