diff --git a/boards/arm/stm32h7/linum-stm32h753bi/src/linum-stm32h753bi.h b/boards/arm/stm32h7/linum-stm32h753bi/src/linum-stm32h753bi.h
index d0330cc10f4..99bf68190b2 100644
--- a/boards/arm/stm32h7/linum-stm32h753bi/src/linum-stm32h753bi.h
+++ b/boards/arm/stm32h7/linum-stm32h753bi/src/linum-stm32h753bi.h
@@ -69,7 +69,8 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y &&
+ *   CONFIG_NSH_ARCHINIT:
  *     Called from the NSH library
  *
  ****************************************************************************/
diff --git a/boards/arm/stm32h7/linum-stm32h753bi/src/stm32_boot.c b/boards/arm/stm32h7/linum-stm32h753bi/src/stm32_boot.c
index 08a3e9233e5..0b98bdf249b 100644
--- a/boards/arm/stm32h7/linum-stm32h753bi/src/stm32_boot.c
+++ b/boards/arm/stm32h7/linum-stm32h753bi/src/stm32_boot.c
@@ -72,12 +72,6 @@ void stm32_boardinitialize(void)
 #ifdef CONFIG_BOARD_LATE_INITIALIZE
 void board_late_initialize(void)
 {
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
-  /* Perform board bring-up here instead of from the
-   * board_app_initialize().
-   */
-
   stm32_bringup();
-#endif
 }
 #endif
diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h b/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h
index ac3a632094a..51fecd3c688 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h
+++ b/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h
@@ -236,7 +236,8 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y &&
+ *   CONFIG_NSH_ARCHINIT:
  *     Called from the NSH library
  *
  ****************************************************************************/
diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c
index e5db33a34a8..cfce50a85a5 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c
+++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c
@@ -86,12 +86,6 @@ void stm32_boardinitialize(void)
 #ifdef CONFIG_BOARD_LATE_INITIALIZE
 void board_late_initialize(void)
 {
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
-  /* Perform board bring-up here instead of from the
-   * board_app_initialize().
-   */
-
   stm32_bringup();
-#endif
 }
 #endif
diff --git a/boards/arm/stm32h7/nucleo-h743zi2/src/nucleo-h743zi2.h b/boards/arm/stm32h7/nucleo-h743zi2/src/nucleo-h743zi2.h
index 9dfaebd1991..f1f6c1d7d36 100644
--- a/boards/arm/stm32h7/nucleo-h743zi2/src/nucleo-h743zi2.h
+++ b/boards/arm/stm32h7/nucleo-h743zi2/src/nucleo-h743zi2.h
@@ -147,9 +147,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c
index eea8065eebe..1c2e866809b 100644
--- a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c
+++ b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c
@@ -80,12 +80,6 @@ void stm32_boardinitialize(void)
 #ifdef CONFIG_BOARD_LATE_INITIALIZE
 void board_late_initialize(void)
 {
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
-  /* Perform board bring-up here instead of from the
-   * board_app_initialize().
-   */
-
   stm32_bringup();
-#endif
 }
 #endif
diff --git a/boards/arm/stm32h7/nucleo-h745zi/src/nucleo-h745zi.h b/boards/arm/stm32h7/nucleo-h745zi/src/nucleo-h745zi.h
index 99623335a46..618a8f649b7 100644
--- a/boards/arm/stm32h7/nucleo-h745zi/src/nucleo-h745zi.h
+++ b/boards/arm/stm32h7/nucleo-h745zi/src/nucleo-h745zi.h
@@ -226,7 +226,8 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y &&
+ *   CONFIG_NSH_ARCHINIT:
  *     Called from the NSH library
  *
  ****************************************************************************/
diff --git a/boards/arm/stm32h7/nucleo-h745zi/src/stm32_boot.c b/boards/arm/stm32h7/nucleo-h745zi/src/stm32_boot.c
index e48738c609b..85a2e1a08a6 100644
--- a/boards/arm/stm32h7/nucleo-h745zi/src/stm32_boot.c
+++ b/boards/arm/stm32h7/nucleo-h745zi/src/stm32_boot.c
@@ -86,12 +86,6 @@ void stm32_boardinitialize(void)
 #ifdef CONFIG_BOARD_LATE_INITIALIZE
 void board_late_initialize(void)
 {
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
-  /* Perform board bring-up here instead of from the
-   * board_app_initialize().
-   */
-
   stm32_bringup();
-#endif
 }
 #endif
diff --git a/boards/arm/stm32h7/stm32h745i-disco/src/stm32_boot.c b/boards/arm/stm32h7/stm32h745i-disco/src/stm32_boot.c
index 41d8125f051..7ff2404c8e3 100644
--- a/boards/arm/stm32h7/stm32h745i-disco/src/stm32_boot.c
+++ b/boards/arm/stm32h7/stm32h745i-disco/src/stm32_boot.c
@@ -78,12 +78,6 @@ void stm32_boardinitialize(void)
 #ifdef CONFIG_BOARD_LATE_INITIALIZE
 void board_late_initialize(void)
 {
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
-  /* Perform board bring-up here instead of from the
-   * board_app_initialize().
-   */
-
   stm32_bringup();
-#endif
 }
 #endif
diff --git a/boards/arm/stm32h7/stm32h745i-disco/src/stm32h745i_disco.h b/boards/arm/stm32h7/stm32h745i-disco/src/stm32h745i_disco.h
index 4f0c618dc1e..9ccd5df96ca 100644
--- a/boards/arm/stm32h7/stm32h745i-disco/src/stm32h745i_disco.h
+++ b/boards/arm/stm32h7/stm32h745i-disco/src/stm32h745i_disco.h
@@ -169,9 +169,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c
index fef6b5eed0c..be74510602c 100644
--- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c
+++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c
@@ -86,12 +86,6 @@ void stm32_boardinitialize(void)
 #ifdef CONFIG_BOARD_LATE_INITIALIZE
 void board_late_initialize(void)
 {
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
-  /* Perform board bring-up here instead of from the
-   * board_app_initialize().
-   */
-
   stm32_bringup();
-#endif
 }
 #endif
diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32h747i-disco.h b/boards/arm/stm32h7/stm32h747i-disco/src/stm32h747i-disco.h
index dfa8a4d2204..622b62e24c9 100644
--- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32h747i-disco.h
+++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32h747i-disco.h
@@ -115,7 +115,8 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y &&
+ *   CONFIG_NSH_ARCHINIT:
  *     Called from the NSH library
  *
  ****************************************************************************/