Merge pull request #20495 from Enoch247/simplify-stm32-clk-includes

cpu/stm32: remove redundant conditional compile block
RIOT-OS · Mar 22, 2024 · 9f51dae · 9f51dae
2 parents ad4b8f2 + 1e45261
commit 9f51dae
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 14 deletions.
diff --git a/cpu/stm32/include/clk/c0/cfg_clock_default.h b/cpu/stm32/include/clk/c0/cfg_clock_default.h
@@ -19,6 +19,10 @@
 #ifndef CLK_C0_CFG_CLOCK_DEFAULT_H
 #define CLK_C0_CFG_CLOCK_DEFAULT_H
 
+#include "cfg_clock_common_fx_gx_mp1_c0.h"
+#include "kernel_defines.h"
+#include "macros/units.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/cpu/stm32/include/clk/cfg_clock_common_fx_gx_mp1_c0.h b/cpu/stm32/include/clk/cfg_clock_common_fx_gx_mp1_c0.h
@@ -23,6 +23,8 @@
 #ifndef CLK_CFG_CLOCK_COMMON_FX_GX_MP1_C0_H
 #define CLK_CFG_CLOCK_COMMON_FX_GX_MP1_C0_H
 
+#include "kernel_defines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/cpu/stm32/include/clk/cfg_clock_common_lx_u5_wx.h b/cpu/stm32/include/clk/cfg_clock_common_lx_u5_wx.h
@@ -23,6 +23,8 @@
 #ifndef CLK_CFG_CLOCK_COMMON_LX_U5_WX_H
 #define CLK_CFG_CLOCK_COMMON_LX_U5_WX_H
 
+#include "kernel_defines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/cpu/stm32/include/clk/clk_conf.h b/cpu/stm32/include/clk/clk_conf.h
@@ -19,20 +19,6 @@
 #ifndef CLK_CLK_CONF_H
 #define CLK_CLK_CONF_H
 
-#include "kernel_defines.h"
-#include "macros/units.h"
-
-#if defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F1) || \
-    defined(CPU_FAM_STM32F2) || defined(CPU_FAM_STM32F3) || \
-    defined(CPU_FAM_STM32F4) || defined(CPU_FAM_STM32F7) || \
-    defined(CPU_FAM_STM32G0) || defined(CPU_FAM_STM32G4) || \
-    defined(CPU_FAM_STM32MP1) || defined(CPU_FAM_STM32C0)
-#include "cfg_clock_common_fx_gx_mp1_c0.h"
-#else /* CPU_FAM_STM32L0 || CPU_FAM_STM32L1 || CPU_FAM_STM32L4 ||
-       * CPU_FAM_STM32L5 || CPU_FAM_STM32U5 || CPU_FAM_STM32WB */
-#include "cfg_clock_common_lx_u5_wx.h"
-#endif
-
 #if defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F1) || \
     defined(CPU_FAM_STM32F3)
 #include "f0f1f3/cfg_clock_default.h"

diff --git a/cpu/stm32/include/clk/f0f1f3/cfg_clock_default.h b/cpu/stm32/include/clk/f0f1f3/cfg_clock_default.h
@@ -26,6 +26,10 @@
 #ifndef CLK_F0F1F3_CFG_CLOCK_DEFAULT_H
 #define CLK_F0F1F3_CFG_CLOCK_DEFAULT_H
 
+#include "cfg_clock_common_fx_gx_mp1_c0.h"
+#include "kernel_defines.h"
+#include "macros/units.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/cpu/stm32/include/clk/f2f4f7/cfg_clock_default.h b/cpu/stm32/include/clk/f2f4f7/cfg_clock_default.h
@@ -19,6 +19,9 @@
 #ifndef CLK_F2F4F7_CFG_CLOCK_DEFAULT_H
 #define CLK_F2F4F7_CFG_CLOCK_DEFAULT_H
 
+#include "cfg_clock_common_fx_gx_mp1_c0.h"
+#include "kernel_defines.h"
+
 #if defined(CPU_FAM_STM32F2)
 #include "f2f4f7/cfg_clock_default_120.h"
 #elif defined(CPU_FAM_STM32F4)

diff --git a/cpu/stm32/include/clk/f2f4f7/cfg_clock_default_100.h b/cpu/stm32/include/clk/f2f4f7/cfg_clock_default_100.h
@@ -23,6 +23,9 @@
 #ifndef CLK_F2F4F7_CFG_CLOCK_DEFAULT_100_H
 #define CLK_F2F4F7_CFG_CLOCK_DEFAULT_100_H
 
+#include "kernel_defines.h"
+#include "macros/units.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/cpu/stm32/include/clk/f2f4f7/cfg_clock_default_120.h b/cpu/stm32/include/clk/f2f4f7/cfg_clock_default_120.h
@@ -23,6 +23,9 @@
 #ifndef CLK_F2F4F7_CFG_CLOCK_DEFAULT_120_H
 #define CLK_F2F4F7_CFG_CLOCK_DEFAULT_120_H
 
+#include "kernel_defines.h"
+#include "macros/units.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/cpu/stm32/include/clk/f2f4f7/cfg_clock_default_180.h b/cpu/stm32/include/clk/f2f4f7/cfg_clock_default_180.h
@@ -23,6 +23,9 @@
 #ifndef CLK_F2F4F7_CFG_CLOCK_DEFAULT_180_H
 #define CLK_F2F4F7_CFG_CLOCK_DEFAULT_180_H
 
+#include "kernel_defines.h"
+#include "macros/units.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/cpu/stm32/include/clk/f2f4f7/cfg_clock_default_216.h b/cpu/stm32/include/clk/f2f4f7/cfg_clock_default_216.h
@@ -23,6 +23,9 @@
 #ifndef CLK_F2F4F7_CFG_CLOCK_DEFAULT_216_H
 #define CLK_F2F4F7_CFG_CLOCK_DEFAULT_216_H
 
+#include "kernel_defines.h"
+#include "macros/units.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/cpu/stm32/include/clk/f2f4f7/cfg_clock_default_84.h b/cpu/stm32/include/clk/f2f4f7/cfg_clock_default_84.h
@@ -23,6 +23,9 @@
 #ifndef CLK_F2F4F7_CFG_CLOCK_DEFAULT_84_H
 #define CLK_F2F4F7_CFG_CLOCK_DEFAULT_84_H
 
+#include "kernel_defines.h"
+#include "macros/units.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/cpu/stm32/include/clk/g0g4/cfg_clock_default.h b/cpu/stm32/include/clk/g0g4/cfg_clock_default.h
@@ -23,6 +23,10 @@
 #ifndef CLK_G0G4_CFG_CLOCK_DEFAULT_H
 #define CLK_G0G4_CFG_CLOCK_DEFAULT_H
 
+#include "cfg_clock_common_fx_gx_mp1_c0.h"
+#include "kernel_defines.h"
+#include "macros/units.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/cpu/stm32/include/clk/l0l1/cfg_clock_default.h b/cpu/stm32/include/clk/l0l1/cfg_clock_default.h
@@ -19,6 +19,9 @@
 #ifndef CLK_L0L1_CFG_CLOCK_DEFAULT_H
 #define CLK_L0L1_CFG_CLOCK_DEFAULT_H
 
+#include "cfg_clock_common_lx_u5_wx.h"
+#include "kernel_defines.h"
+#include "macros/units.h"
 #include "periph_cpu.h"
 
 #ifdef __cplusplus

diff --git a/cpu/stm32/include/clk/l4l5wx/cfg_clock_default.h b/cpu/stm32/include/clk/l4l5wx/cfg_clock_default.h
@@ -21,6 +21,10 @@
 #ifndef CLK_L4L5WX_CFG_CLOCK_DEFAULT_H
 #define CLK_L4L5WX_CFG_CLOCK_DEFAULT_H
 
+#include "cfg_clock_common_lx_u5_wx.h"
+#include "kernel_defines.h"
+#include "macros/units.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/cpu/stm32/include/clk/mp1/cfg_clock_default.h b/cpu/stm32/include/clk/mp1/cfg_clock_default.h
@@ -19,6 +19,10 @@
 #ifndef CLK_MP1_CFG_CLOCK_DEFAULT_H
 #define CLK_MP1_CFG_CLOCK_DEFAULT_H
 
+#include "cfg_clock_common_fx_gx_mp1_c0.h"
+#include "kernel_defines.h"
+#include "macros/units.h"
+
 /**
  * @name    MP1 clock PLL settings (208MHz)
  * @{

diff --git a/cpu/stm32/include/clk/u5/cfg_clock_default.h b/cpu/stm32/include/clk/u5/cfg_clock_default.h
@@ -19,6 +19,10 @@
 #ifndef CLK_U5_CFG_CLOCK_DEFAULT_H
 #define CLK_U5_CFG_CLOCK_DEFAULT_H
 
+#include "cfg_clock_common_lx_u5_wx.h"
+#include "kernel_defines.h"
+#include "macros/units.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif