diff --git a/arch/arm/src/stm32h7/stm32_rcc.h b/arch/arm/src/stm32h7/stm32_rcc.h
index 583121a5cdf..00972c64e95 100644
--- a/arch/arm/src/stm32h7/stm32_rcc.h
+++ b/arch/arm/src/stm32h7/stm32_rcc.h
@@ -151,6 +151,16 @@ static inline void stm32_mco2config(uint32_t source, uint32_t div)
 
 void stm32_clockconfig(void);
 
+/****************************************************************************
+ * Name: stm32_stdclockconfig
+ *
+ * Description:
+ *   Setup the system using the "standard" clock configuration
+ *
+ ****************************************************************************/
+
+void stm32_stdclockconfig(void);
+
 /****************************************************************************
  * Name: stm32_board_clockconfig
  *
diff --git a/arch/arm/src/stm32h7/stm32h7x3xx_rcc.c b/arch/arm/src/stm32h7/stm32h7x3xx_rcc.c
index 3646682e938..66799761092 100644
--- a/arch/arm/src/stm32h7/stm32h7x3xx_rcc.c
+++ b/arch/arm/src/stm32h7/stm32h7x3xx_rcc.c
@@ -557,6 +557,26 @@ static inline void rcc_enableapb4(void)
   putreg32(regval, STM32_RCC_APB4ENR);   /* Enable peripherals */
 }
 
+/****************************************************************************
+ * Name: rcc_enableperiphals
+ ****************************************************************************/
+
+static inline void rcc_enableperipherals(void)
+{
+  rcc_enableahb1();
+  rcc_enableahb2();
+  rcc_enableahb3();
+  rcc_enableahb4();
+  rcc_enableapb1();
+  rcc_enableapb2();
+  rcc_enableapb3();
+  rcc_enableapb4();
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
 /****************************************************************************
  * Name: stm32_stdclockconfig
  *
@@ -567,8 +587,7 @@ static inline void rcc_enableapb4(void)
  *   power clocking modes!
  ****************************************************************************/
 
-#ifndef CONFIG_STM32H7_CUSTOM_CLOCKCONFIG
-static void stm32_stdclockconfig(void)
+void stm32_stdclockconfig(void)
 {
   uint32_t regval;
   volatile int32_t timeout;
@@ -943,24 +962,3 @@ static void stm32_stdclockconfig(void)
 #endif
     }
 }
-#endif
-
-/****************************************************************************
- * Name: rcc_enableperiphals
- ****************************************************************************/
-
-static inline void rcc_enableperipherals(void)
-{
-  rcc_enableahb1();
-  rcc_enableahb2();
-  rcc_enableahb3();
-  rcc_enableahb4();
-  rcc_enableapb1();
-  rcc_enableapb2();
-  rcc_enableapb3();
-  rcc_enableapb4();
-}
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
diff --git a/arch/arm/src/stm32h7/stm32h7x7xx_rcc.c b/arch/arm/src/stm32h7/stm32h7x7xx_rcc.c
index 859997c6b1d..bf50455451c 100644
--- a/arch/arm/src/stm32h7/stm32h7x7xx_rcc.c
+++ b/arch/arm/src/stm32h7/stm32h7x7xx_rcc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/stm32h7/stm32h7x3xx_rcc.c
+ * arch/arm/src/stm32h7/stm32h7x7xx_rcc.c
  *
  *   Copyright (C) 2018, 2019 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -559,6 +559,26 @@ static inline void rcc_enableapb4(void)
   putreg32(regval, STM32_RCC_APB4ENR);   /* Enable peripherals */
 }
 
+/****************************************************************************
+ * Name: rcc_enableperiphals
+ ****************************************************************************/
+
+static inline void rcc_enableperipherals(void)
+{
+  rcc_enableahb1();
+  rcc_enableahb2();
+  rcc_enableahb3();
+  rcc_enableahb4();
+  rcc_enableapb1();
+  rcc_enableapb2();
+  rcc_enableapb3();
+  rcc_enableapb4();
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
 /****************************************************************************
  * Name: stm32_stdclockconfig
  *
@@ -569,8 +589,7 @@ static inline void rcc_enableapb4(void)
  *   power clocking modes!
  ****************************************************************************/
 
-#ifndef CONFIG_STM32H7_CUSTOM_CLOCKCONFIG
-static void stm32_stdclockconfig(void)
+void stm32_stdclockconfig(void)
 {
   uint32_t regval;
   volatile int32_t timeout;
@@ -933,24 +952,3 @@ static void stm32_stdclockconfig(void)
 #endif
     }
 }
-#endif
-
-/****************************************************************************
- * Name: rcc_enableperiphals
- ****************************************************************************/
-
-static inline void rcc_enableperipherals(void)
-{
-  rcc_enableahb1();
-  rcc_enableahb2();
-  rcc_enableahb3();
-  rcc_enableahb4();
-  rcc_enableapb1();
-  rcc_enableapb2();
-  rcc_enableapb3();
-  rcc_enableapb4();
-}
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/