diff --git a/boards/arm/a1x/pcduino-a10/src/a1x_bringup.c b/boards/arm/a1x/pcduino-a10/src/a1x_bringup.c
index b7808d24fad..32a26665d73 100644
--- a/boards/arm/a1x/pcduino-a10/src/a1x_bringup.c
+++ b/boards/arm/a1x/pcduino-a10/src/a1x_bringup.c
@@ -55,9 +55,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int a1x_bringup(void)
diff --git a/boards/arm/a1x/pcduino-a10/src/pcduino_a10.h b/boards/arm/a1x/pcduino-a10/src/pcduino_a10.h
index f0fc48196df..390900e8803 100644
--- a/boards/arm/a1x/pcduino-a10/src/pcduino_a10.h
+++ b/boards/arm/a1x/pcduino-a10/src/pcduino_a10.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 a1x_bringup(void);
diff --git a/boards/arm/am335x/beaglebone-black/src/am335x_bringup.c b/boards/arm/am335x/beaglebone-black/src/am335x_bringup.c
index 721125a859b..d9d8afa3595 100644
--- a/boards/arm/am335x/beaglebone-black/src/am335x_bringup.c
+++ b/boards/arm/am335x/beaglebone-black/src/am335x_bringup.c
@@ -126,9 +126,6 @@ static void am335x_can_register(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int am335x_bringup(void)
diff --git a/boards/arm/am335x/beaglebone-black/src/beaglebone-black.h b/boards/arm/am335x/beaglebone-black/src/beaglebone-black.h
index 6ef2c1b4e7b..c3e9ef5f670 100644
--- a/boards/arm/am335x/beaglebone-black/src/beaglebone-black.h
+++ b/boards/arm/am335x/beaglebone-black/src/beaglebone-black.h
@@ -131,9 +131,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int am335x_bringup(void);
diff --git a/boards/arm/at32/at32f437-mini/src/at32_bringup.c b/boards/arm/at32/at32f437-mini/src/at32_bringup.c
index d1a43baead2..f3e8af69114 100644
--- a/boards/arm/at32/at32f437-mini/src/at32_bringup.c
+++ b/boards/arm/at32/at32f437-mini/src/at32_bringup.c
@@ -55,9 +55,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/boards/arm/at32/at32f437-mini/src/at32f437-mini.h b/boards/arm/at32/at32f437-mini/src/at32f437-mini.h
index 7c9bfc510a7..22b0a7a6b91 100644
--- a/boards/arm/at32/at32f437-mini/src/at32f437-mini.h
+++ b/boards/arm/at32/at32f437-mini/src/at32f437-mini.h
@@ -216,9 +216,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 at32_bringup(void);
diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c b/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c
index 9147b9bf75c..f15ac383c27 100644
--- a/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c
@@ -186,9 +186,6 @@ static void timer_initialize(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int cxd56_bringup(void)
diff --git a/boards/arm/cxd56xx/spresense/src/spresense.h b/boards/arm/cxd56xx/spresense/src/spresense.h
index ac4cbda9dab..2821a684b23 100644
--- a/boards/arm/cxd56xx/spresense/src/spresense.h
+++ b/boards/arm/cxd56xx/spresense/src/spresense.h
@@ -44,9 +44,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 cxd56_bringup(void);
diff --git a/boards/arm/eoss3/quickfeather/src/eoss3_bringup.c b/boards/arm/eoss3/quickfeather/src/eoss3_bringup.c
index 66c46152624..0d9076df3ec 100644
--- a/boards/arm/eoss3/quickfeather/src/eoss3_bringup.c
+++ b/boards/arm/eoss3/quickfeather/src/eoss3_bringup.c
@@ -47,9 +47,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int eoss3_bringup(void)
diff --git a/boards/arm/eoss3/quickfeather/src/quickfeather.h b/boards/arm/eoss3/quickfeather/src/quickfeather.h
index 5c3f3118a94..37bad4e65e4 100644
--- a/boards/arm/eoss3/quickfeather/src/quickfeather.h
+++ b/boards/arm/eoss3/quickfeather/src/quickfeather.h
@@ -70,9 +70,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 eoss3_bringup(void);
diff --git a/boards/arm/gd32f4/gd32f450zk-aiotbox/src/gd32f4xx_bringup.c b/boards/arm/gd32f4/gd32f450zk-aiotbox/src/gd32f4xx_bringup.c
index 5fb1a7903f1..f3900048413 100644
--- a/boards/arm/gd32f4/gd32f450zk-aiotbox/src/gd32f4xx_bringup.c
+++ b/boards/arm/gd32f4/gd32f450zk-aiotbox/src/gd32f4xx_bringup.c
@@ -69,9 +69,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library via boardctl()
- *
  ****************************************************************************/
 
 int gd32_bringup(void)
diff --git a/boards/arm/gd32f4/gd32f450zk-eval/src/gd32f4xx_bringup.c b/boards/arm/gd32f4/gd32f450zk-eval/src/gd32f4xx_bringup.c
index 95fff258623..37f4d7ba398 100644
--- a/boards/arm/gd32f4/gd32f450zk-eval/src/gd32f4xx_bringup.c
+++ b/boards/arm/gd32f4/gd32f450zk-eval/src/gd32f4xx_bringup.c
@@ -69,9 +69,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library via boardctl()
- *
  ****************************************************************************/
 
 int gd32_bringup(void)
diff --git a/boards/arm/gd32f4/gd32f470ik-eval/src/gd32f4xx_bringup.c b/boards/arm/gd32f4/gd32f470ik-eval/src/gd32f4xx_bringup.c
index d5db8aa8b0f..f4dc6aa577b 100644
--- a/boards/arm/gd32f4/gd32f470ik-eval/src/gd32f4xx_bringup.c
+++ b/boards/arm/gd32f4/gd32f470ik-eval/src/gd32f4xx_bringup.c
@@ -69,9 +69,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library via boardctl()
- *
  ****************************************************************************/
 
 int gd32_bringup(void)
diff --git a/boards/arm/gd32f4/gd32f470zk-aiotbox/src/gd32f4xx_bringup.c b/boards/arm/gd32f4/gd32f470zk-aiotbox/src/gd32f4xx_bringup.c
index dfcd56ca852..f35157fbd3b 100644
--- a/boards/arm/gd32f4/gd32f470zk-aiotbox/src/gd32f4xx_bringup.c
+++ b/boards/arm/gd32f4/gd32f470zk-aiotbox/src/gd32f4xx_bringup.c
@@ -69,9 +69,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library via boardctl()
- *
  ****************************************************************************/
 
 int gd32_bringup(void)
diff --git a/boards/arm/gd32f4/gd32f470zk-eval/src/gd32f4xx_bringup.c b/boards/arm/gd32f4/gd32f470zk-eval/src/gd32f4xx_bringup.c
index 46d53bcee94..5fdf08f535e 100644
--- a/boards/arm/gd32f4/gd32f470zk-eval/src/gd32f4xx_bringup.c
+++ b/boards/arm/gd32f4/gd32f470zk-eval/src/gd32f4xx_bringup.c
@@ -69,9 +69,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library via boardctl()
- *
  ****************************************************************************/
 
 int gd32_bringup(void)
diff --git a/boards/arm/kinetis/freedom-k28f/src/freedom-k28f.h b/boards/arm/kinetis/freedom-k28f/src/freedom-k28f.h
index 3e56ecf70f8..b50ff6700d8 100644
--- a/boards/arm/kinetis/freedom-k28f/src/freedom-k28f.h
+++ b/boards/arm/kinetis/freedom-k28f/src/freedom-k28f.h
@@ -226,9 +226,6 @@ extern struct i2c_master_s *g_i2c1_dev;
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int k28_bringup(void);
diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_bringup.c b/boards/arm/kinetis/freedom-k28f/src/k28_bringup.c
index 1b008b22f08..9dbbc7be88b 100644
--- a/boards/arm/kinetis/freedom-k28f/src/k28_bringup.c
+++ b/boards/arm/kinetis/freedom-k28f/src/k28_bringup.c
@@ -57,9 +57,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int k28_bringup(void)
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_bringup.c
index 03769286524..616cc160398 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_bringup.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_bringup.c
@@ -328,9 +328,6 @@ static int nsh_usbhostinitialize(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library via boardctl()
- *
  ****************************************************************************/
 
 int lpc4088_devkit_bringup(void)
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc4088-devkit.h b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc4088-devkit.h
index 336b5dab758..98852ea524b 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc4088-devkit.h
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc4088-devkit.h
@@ -168,9 +168,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library via boardctl()
- *
  ****************************************************************************/
 
 int lpc4088_devkit_bringup(void);
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_bringup.c
index 9ebbc2e4d57..dc1f11ca3b0 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_bringup.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_bringup.c
@@ -367,9 +367,6 @@ static int nsh_usbhostinitialize(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library via boardctl()
- *
  ****************************************************************************/
 
 int lpc4088_quickstart_bringup(void)
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc4088-quickstart.h b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc4088-quickstart.h
index 893e9fe8309..e50835e55e4 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc4088-quickstart.h
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc4088-quickstart.h
@@ -96,9 +96,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library via boardctl()
- *
  ****************************************************************************/
 
 int lpc4088_quickstart_bringup(void);
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_bringup.c
index 20e292d660f..a8cc46ef3a2 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_bringup.c
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_bringup.c
@@ -367,9 +367,6 @@ static int nsh_usbhostinitialize(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library via boardctl()
- *
  ****************************************************************************/
 
 int lx_cpu_bringup(void)
diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_bringup.c
index eba34abe754..995229d9763 100644
--- a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_bringup.c
+++ b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_bringup.c
@@ -303,9 +303,6 @@ static int nsh_usbhostinitialize(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int mcb1700_bringup(void)
diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/mcb1700.h b/boards/arm/lpc17xx_40xx/mcb1700/src/mcb1700.h
index f9b6a41e88f..002ef1618ac 100644
--- a/boards/arm/lpc17xx_40xx/mcb1700/src/mcb1700.h
+++ b/boards/arm/lpc17xx_40xx/mcb1700/src/mcb1700.h
@@ -66,9 +66,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 mcb1700_bringup(void);
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc1766stk.h b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc1766stk.h
index 925cccc6bdf..8a271200c6a 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc1766stk.h
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc1766stk.h
@@ -247,9 +247,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 lpc17_40_bringup(void);
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_bringup.c
index 24752b8381a..058d0b41c29 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_bringup.c
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_bringup.c
@@ -322,9 +322,6 @@ static int nsh_usbhostinitialize(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int lpc17_40_bringup(void)
diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_bringup.c
index 9e5bad37956..57691629333 100644
--- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_bringup.c
+++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_bringup.c
@@ -366,9 +366,6 @@ static int nsh_usbhostinitialize(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library via boardctl()
- *
  ****************************************************************************/
 
 int open1788_bringup(void)
diff --git a/boards/arm/lpc17xx_40xx/open1788/src/open1788.h b/boards/arm/lpc17xx_40xx/open1788/src/open1788.h
index 87dc8e58e5f..85906ca8b3d 100644
--- a/boards/arm/lpc17xx_40xx/open1788/src/open1788.h
+++ b/boards/arm/lpc17xx_40xx/open1788/src/open1788.h
@@ -168,9 +168,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library via boardctl()
- *
  ****************************************************************************/
 
 int open1788_bringup(void);
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c
index 9202dd6123d..75e2dd557a7 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c
@@ -93,9 +93,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int pnev5180b_bringup(void)
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/src/pnev5180b.h b/boards/arm/lpc17xx_40xx/pnev5180b/src/pnev5180b.h
index 5e3014459ca..04b465b88b0 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/src/pnev5180b.h
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/src/pnev5180b.h
@@ -81,9 +81,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int pnev5180b_bringup(void);
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_bringup.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_bringup.c
index 10e7fa4d9b8..fe6b78a5caf 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_bringup.c
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_bringup.c
@@ -65,9 +65,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int lpc54_bringup(void)
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h
index 54220730b94..19874df26cb 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h
@@ -310,9 +310,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int lpc54_bringup(void);
diff --git a/boards/arm/max326xx/max32660-evsys/src/max32660-evsys.h b/boards/arm/max326xx/max32660-evsys/src/max32660-evsys.h
index 6cdca111189..64600c4d28d 100644
--- a/boards/arm/max326xx/max32660-evsys/src/max32660-evsys.h
+++ b/boards/arm/max326xx/max32660-evsys/src/max32660-evsys.h
@@ -100,11 +100,6 @@
  *   If CONFIG_BOARD_LATE_INITIALIZE=y, then this function will be called
  *   from board_late_initialize().
  *
- *   If CONFIG_BOARD_LATE_INITIALIZE is not selected,
- *   but CONFIG_BOARDCTL=y
- *   then this function will *probably* be called from application logic via
- *   boardctl().
- *
  *   Otherwise, this function will not be called (which is usually a bad
  *   thing)
  *
diff --git a/boards/arm/max326xx/max32660-evsys/src/max326_bringup.c b/boards/arm/max326xx/max32660-evsys/src/max326_bringup.c
index 3207ad0df80..d96c11ce24a 100644
--- a/boards/arm/max326xx/max32660-evsys/src/max326_bringup.c
+++ b/boards/arm/max326xx/max32660-evsys/src/max326_bringup.c
@@ -58,11 +58,6 @@
  *   If CONFIG_BOARD_LATE_INITIALIZE=y, then this function will be called
  *   from board_late_initialize().
  *
- *   If CONFIG_BOARD_LATE_INITIALIZE is not selected,
- *   but CONFIG_BOARDCTL=y
- *   then this function will *probably* be called from application logic via
- *   boardctl().
- *
  *   Otherwise, this function will not be called (which is usually a bad
  *   thing)
  *
diff --git a/boards/arm/nrf52/arduino-nano-33ble-rev2/src/arduino-nano-33ble.h b/boards/arm/nrf52/arduino-nano-33ble-rev2/src/arduino-nano-33ble.h
index da7488c6ad9..fe45687deba 100644
--- a/boards/arm/nrf52/arduino-nano-33ble-rev2/src/arduino-nano-33ble.h
+++ b/boards/arm/nrf52/arduino-nano-33ble-rev2/src/arduino-nano-33ble.h
@@ -79,9 +79,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void);
diff --git a/boards/arm/nrf52/arduino-nano-33ble-rev2/src/nrf52_bringup.c b/boards/arm/nrf52/arduino-nano-33ble-rev2/src/nrf52_bringup.c
index 923e5232203..64c06d45da5 100644
--- a/boards/arm/nrf52/arduino-nano-33ble-rev2/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/arduino-nano-33ble-rev2/src/nrf52_bringup.c
@@ -105,9 +105,6 @@ static void nrf52_i2ctool(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void)
diff --git a/boards/arm/nrf52/arduino-nano-33ble/src/arduino-nano-33ble.h b/boards/arm/nrf52/arduino-nano-33ble/src/arduino-nano-33ble.h
index 3fb7b143954..4c80ad5eb87 100644
--- a/boards/arm/nrf52/arduino-nano-33ble/src/arduino-nano-33ble.h
+++ b/boards/arm/nrf52/arduino-nano-33ble/src/arduino-nano-33ble.h
@@ -79,9 +79,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void);
diff --git a/boards/arm/nrf52/arduino-nano-33ble/src/nrf52_bringup.c b/boards/arm/nrf52/arduino-nano-33ble/src/nrf52_bringup.c
index ea2ab133fb2..a19e675157c 100644
--- a/boards/arm/nrf52/arduino-nano-33ble/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/arduino-nano-33ble/src/nrf52_bringup.c
@@ -105,9 +105,6 @@ static void nrf52_i2ctool(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void)
diff --git a/boards/arm/nrf52/nrf52-feather/src/nrf52-feather.h b/boards/arm/nrf52/nrf52-feather/src/nrf52-feather.h
index 858c1d5045d..d6d30069eca 100644
--- a/boards/arm/nrf52/nrf52-feather/src/nrf52-feather.h
+++ b/boards/arm/nrf52/nrf52-feather/src/nrf52-feather.h
@@ -94,9 +94,6 @@ int nrf52_i2ctool(void);
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void);
diff --git a/boards/arm/nrf52/nrf52-feather/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52-feather/src/nrf52_bringup.c
index a7aa51fb4cf..8a43d32ece8 100644
--- a/boards/arm/nrf52/nrf52-feather/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/nrf52-feather/src/nrf52_bringup.c
@@ -52,9 +52,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void)
diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h b/boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h
index 4fe208367cb..1b325c5523e 100644
--- a/boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h
+++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h
@@ -99,9 +99,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void);
diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c
index db27ebc417e..8c7fc06d3cf 100644
--- a/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c
@@ -80,9 +80,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void)
diff --git a/boards/arm/nrf52/nrf52832-mdk/src/nrf52832-mdk.h b/boards/arm/nrf52/nrf52832-mdk/src/nrf52832-mdk.h
index 9f87514a7bd..4f5b8e50ab0 100644
--- a/boards/arm/nrf52/nrf52832-mdk/src/nrf52832-mdk.h
+++ b/boards/arm/nrf52/nrf52832-mdk/src/nrf52832-mdk.h
@@ -71,9 +71,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void);
diff --git a/boards/arm/nrf52/nrf52832-mdk/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52832-mdk/src/nrf52_bringup.c
index 2787b47d723..4764d0b0880 100644
--- a/boards/arm/nrf52/nrf52832-mdk/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/nrf52832-mdk/src/nrf52_bringup.c
@@ -58,9 +58,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void)
diff --git a/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52832-sparkfun.h b/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52832-sparkfun.h
index 45548ce6a90..d2ba94bce0c 100644
--- a/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52832-sparkfun.h
+++ b/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52832-sparkfun.h
@@ -69,9 +69,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void);
diff --git a/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_bringup.c
index ee4daf0ad85..3b2a52515ea 100644
--- a/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_bringup.c
@@ -50,9 +50,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void)
diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h b/boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h
index e7a9a4fe529..bbb3d58430c 100644
--- a/boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h
+++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h
@@ -99,9 +99,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void);
diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c
index cc617cfbbeb..a69090e174b 100644
--- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c
@@ -141,9 +141,6 @@ static void nrf52_i2ctool(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void)
diff --git a/boards/arm/nrf52/nrf52840-dongle/src/nrf52840-dongle.h b/boards/arm/nrf52/nrf52840-dongle/src/nrf52840-dongle.h
index 5ca378706dd..785aaf60cb2 100644
--- a/boards/arm/nrf52/nrf52840-dongle/src/nrf52840-dongle.h
+++ b/boards/arm/nrf52/nrf52840-dongle/src/nrf52840-dongle.h
@@ -89,9 +89,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void);
diff --git a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_bringup.c
index 10fe2872e42..fa3bdd4bb45 100644
--- a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_bringup.c
@@ -50,9 +50,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void)
diff --git a/boards/arm/nrf52/nrf9160-dk-nrf52/src/nrf52_bringup.c b/boards/arm/nrf52/nrf9160-dk-nrf52/src/nrf52_bringup.c
index 95b50900857..9f2cab4d939 100644
--- a/boards/arm/nrf52/nrf9160-dk-nrf52/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/nrf9160-dk-nrf52/src/nrf52_bringup.c
@@ -50,9 +50,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void)
diff --git a/boards/arm/nrf52/nrf9160-dk-nrf52/src/nrf9160-dk-nrf52.h b/boards/arm/nrf52/nrf9160-dk-nrf52/src/nrf9160-dk-nrf52.h
index 1a4cda4e3ba..e82659f56e1 100644
--- a/boards/arm/nrf52/nrf9160-dk-nrf52/src/nrf9160-dk-nrf52.h
+++ b/boards/arm/nrf52/nrf9160-dk-nrf52/src/nrf9160-dk-nrf52.h
@@ -71,9 +71,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void);
diff --git a/boards/arm/nrf52/thingy52/src/nrf52_bringup.c b/boards/arm/nrf52/thingy52/src/nrf52_bringup.c
index a6f92da5a7b..2aa293efee9 100644
--- a/boards/arm/nrf52/thingy52/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/thingy52/src/nrf52_bringup.c
@@ -114,9 +114,6 @@ static void nrf52_i2ctool(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void)
diff --git a/boards/arm/nrf52/thingy52/src/thingy52.h b/boards/arm/nrf52/thingy52/src/thingy52.h
index b00e0dffc30..db1dfd306e2 100644
--- a/boards/arm/nrf52/thingy52/src/thingy52.h
+++ b/boards/arm/nrf52/thingy52/src/thingy52.h
@@ -118,9 +118,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void);
diff --git a/boards/arm/nrf52/thingy91-nrf52/src/nrf52_bringup.c b/boards/arm/nrf52/thingy91-nrf52/src/nrf52_bringup.c
index c340213b24a..06de84ef9dd 100644
--- a/boards/arm/nrf52/thingy91-nrf52/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/thingy91-nrf52/src/nrf52_bringup.c
@@ -46,9 +46,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void)
diff --git a/boards/arm/nrf52/thingy91-nrf52/src/thingy91-nrf52.h b/boards/arm/nrf52/thingy91-nrf52/src/thingy91-nrf52.h
index 44e54a00674..b5768be3fd4 100644
--- a/boards/arm/nrf52/thingy91-nrf52/src/thingy91-nrf52.h
+++ b/boards/arm/nrf52/thingy91-nrf52/src/thingy91-nrf52.h
@@ -59,9 +59,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void);
diff --git a/boards/arm/nrf52/xiao-nrf52840/src/nrf52_bringup.c b/boards/arm/nrf52/xiao-nrf52840/src/nrf52_bringup.c
index 74a78640e6a..dc3c49b5258 100644
--- a/boards/arm/nrf52/xiao-nrf52840/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/xiao-nrf52840/src/nrf52_bringup.c
@@ -52,9 +52,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void)
diff --git a/boards/arm/nrf52/xiao-nrf52840/src/xiao-nrf52840.h b/boards/arm/nrf52/xiao-nrf52840/src/xiao-nrf52840.h
index 462d168d553..3f04020c833 100644
--- a/boards/arm/nrf52/xiao-nrf52840/src/xiao-nrf52840.h
+++ b/boards/arm/nrf52/xiao-nrf52840/src/xiao-nrf52840.h
@@ -114,9 +114,6 @@ int nrf52_gpio_initialize(void);
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf52_bringup(void);
diff --git a/boards/arm/nrf53/nrf5340-audio-dk/src/nrf5340-audio-dk.h b/boards/arm/nrf53/nrf5340-audio-dk/src/nrf5340-audio-dk.h
index 736c71ddd78..d0a822c0724 100644
--- a/boards/arm/nrf53/nrf5340-audio-dk/src/nrf5340-audio-dk.h
+++ b/boards/arm/nrf53/nrf5340-audio-dk/src/nrf5340-audio-dk.h
@@ -77,9 +77,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf53_bringup(void);
diff --git a/boards/arm/nrf53/nrf5340-audio-dk/src/nrf53_bringup.c b/boards/arm/nrf53/nrf5340-audio-dk/src/nrf53_bringup.c
index 966b91f4ebb..b1ce28a9693 100644
--- a/boards/arm/nrf53/nrf5340-audio-dk/src/nrf53_bringup.c
+++ b/boards/arm/nrf53/nrf5340-audio-dk/src/nrf53_bringup.c
@@ -46,9 +46,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf53_bringup(void)
diff --git a/boards/arm/nrf53/nrf5340-dk/src/nrf5340-dk.h b/boards/arm/nrf53/nrf5340-dk/src/nrf5340-dk.h
index 637d953f767..009ac42b5a4 100644
--- a/boards/arm/nrf53/nrf5340-dk/src/nrf5340-dk.h
+++ b/boards/arm/nrf53/nrf5340-dk/src/nrf5340-dk.h
@@ -106,9 +106,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf53_bringup(void);
diff --git a/boards/arm/nrf53/nrf5340-dk/src/nrf53_bringup.c b/boards/arm/nrf53/nrf5340-dk/src/nrf53_bringup.c
index ce25793893e..476796dc3b2 100644
--- a/boards/arm/nrf53/nrf5340-dk/src/nrf53_bringup.c
+++ b/boards/arm/nrf53/nrf5340-dk/src/nrf53_bringup.c
@@ -173,9 +173,6 @@ void rpmsg_serialinit(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf53_bringup(void)
diff --git a/boards/arm/nrf53/thingy53/src/nrf53_bringup.c b/boards/arm/nrf53/thingy53/src/nrf53_bringup.c
index 87dc786bfe9..51f16b01b56 100644
--- a/boards/arm/nrf53/thingy53/src/nrf53_bringup.c
+++ b/boards/arm/nrf53/thingy53/src/nrf53_bringup.c
@@ -160,9 +160,6 @@ void rpmsg_serialinit(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf53_bringup(void)
diff --git a/boards/arm/nrf53/thingy53/src/thingy53.h b/boards/arm/nrf53/thingy53/src/thingy53.h
index 53be6599518..4cae9e27118 100644
--- a/boards/arm/nrf53/thingy53/src/thingy53.h
+++ b/boards/arm/nrf53/thingy53/src/thingy53.h
@@ -156,9 +156,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf53_bringup(void);
diff --git a/boards/arm/nrf91/nrf9160-dk/src/nrf9160-dk.h b/boards/arm/nrf91/nrf9160-dk/src/nrf9160-dk.h
index 80c7295fb6a..3958c6343ea 100644
--- a/boards/arm/nrf91/nrf9160-dk/src/nrf9160-dk.h
+++ b/boards/arm/nrf91/nrf9160-dk/src/nrf9160-dk.h
@@ -87,9 +87,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf91_bringup(void);
diff --git a/boards/arm/nrf91/nrf9160-dk/src/nrf91_bringup.c b/boards/arm/nrf91/nrf9160-dk/src/nrf91_bringup.c
index 08d42c78485..dd3f7c61d85 100644
--- a/boards/arm/nrf91/nrf9160-dk/src/nrf91_bringup.c
+++ b/boards/arm/nrf91/nrf9160-dk/src/nrf91_bringup.c
@@ -101,9 +101,6 @@ void arm_netinitialize(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf91_bringup(void)
diff --git a/boards/arm/nrf91/thingy91/src/nrf91_bringup.c b/boards/arm/nrf91/thingy91/src/nrf91_bringup.c
index 2fbd7f6c40e..9c80e57eb44 100644
--- a/boards/arm/nrf91/thingy91/src/nrf91_bringup.c
+++ b/boards/arm/nrf91/thingy91/src/nrf91_bringup.c
@@ -81,9 +81,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf91_bringup(void)
diff --git a/boards/arm/nrf91/thingy91/src/thingy91.h b/boards/arm/nrf91/thingy91/src/thingy91.h
index 2a9a6be2b64..381e90736c2 100644
--- a/boards/arm/nrf91/thingy91/src/thingy91.h
+++ b/boards/arm/nrf91/thingy91/src/thingy91.h
@@ -117,9 +117,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int nrf91_bringup(void);
diff --git a/boards/arm/phy62xx/phy6222/src/bringup.c b/boards/arm/phy62xx/phy6222/src/bringup.c
index c1b9f17d72f..41f6777229e 100644
--- a/boards/arm/phy62xx/phy6222/src/bringup.c
+++ b/boards/arm/phy62xx/phy6222/src/bringup.c
@@ -63,10 +63,8 @@ extern int phyplus_timer_initialize(const char *devpath, int timer);
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
+
 #define PPLUS_MTD_START_OFFSET  0x60000  /* start from 384k offset */
 #define PPLUS_MTD_SIZE          0x20000  /* mtd size is 128k bytes */
 
diff --git a/boards/arm/phy62xx/phy6222/src/phy6222.h b/boards/arm/phy62xx/phy6222/src/phy6222.h
index f74825733ac..c348eae1b26 100644
--- a/boards/arm/phy62xx/phy6222/src/phy6222.h
+++ b/boards/arm/phy62xx/phy6222/src/phy6222.h
@@ -110,9 +110,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int phy62xx_bringup(void);
diff --git a/boards/arm/ra4/arduino-r4-minima/src/arduino-r4-minima.h b/boards/arm/ra4/arduino-r4-minima/src/arduino-r4-minima.h
index 8662aa4b305..8e501eb697a 100644
--- a/boards/arm/ra4/arduino-r4-minima/src/arduino-r4-minima.h
+++ b/boards/arm/ra4/arduino-r4-minima/src/arduino-r4-minima.h
@@ -60,9 +60,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 ra4m1_bringup(void);
diff --git a/boards/arm/ra4/xiao-ra4m1/src/xiao-ra4m1.h b/boards/arm/ra4/xiao-ra4m1/src/xiao-ra4m1.h
index d730c0ab299..edfb906511e 100644
--- a/boards/arm/ra4/xiao-ra4m1/src/xiao-ra4m1.h
+++ b/boards/arm/ra4/xiao-ra4m1/src/xiao-ra4m1.h
@@ -60,9 +60,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 ra4m1_bringup(void);
diff --git a/boards/arm/s32k1xx/rddrone-bms772/src/rddrone-bms772.h b/boards/arm/s32k1xx/rddrone-bms772/src/rddrone-bms772.h
index d79a60019ec..6978031a5e2 100644
--- a/boards/arm/s32k1xx/rddrone-bms772/src/rddrone-bms772.h
+++ b/boards/arm/s32k1xx/rddrone-bms772/src/rddrone-bms772.h
@@ -102,9 +102,6 @@ extern const struct peripheral_clock_config_s g_peripheral_clockconfig0[];
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k1xx_bringup(void);
diff --git a/boards/arm/s32k1xx/rddrone-bms772/src/s32k1xx_bringup.c b/boards/arm/s32k1xx/rddrone-bms772/src/s32k1xx_bringup.c
index 119c912bb7d..ed225049e04 100644
--- a/boards/arm/s32k1xx/rddrone-bms772/src/s32k1xx_bringup.c
+++ b/boards/arm/s32k1xx/rddrone-bms772/src/s32k1xx_bringup.c
@@ -81,9 +81,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k1xx_bringup(void)
diff --git a/boards/arm/s32k1xx/s32k118evb/src/s32k118evb.h b/boards/arm/s32k1xx/s32k118evb/src/s32k118evb.h
index f7fd0a0d9c2..4b48fb5545b 100644
--- a/boards/arm/s32k1xx/s32k118evb/src/s32k118evb.h
+++ b/boards/arm/s32k1xx/s32k118evb/src/s32k118evb.h
@@ -89,9 +89,6 @@ extern const struct peripheral_clock_config_s g_peripheral_clockconfig0[];
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k1xx_bringup(void);
diff --git a/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_bringup.c b/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_bringup.c
index bfcc5cf35ad..8232062ff48 100644
--- a/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_bringup.c
+++ b/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_bringup.c
@@ -65,9 +65,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k1xx_bringup(void)
diff --git a/boards/arm/s32k1xx/s32k144evb/src/s32k144evb.h b/boards/arm/s32k1xx/s32k144evb/src/s32k144evb.h
index 8c9161a3227..ab2bf1f51dc 100644
--- a/boards/arm/s32k1xx/s32k144evb/src/s32k144evb.h
+++ b/boards/arm/s32k1xx/s32k144evb/src/s32k144evb.h
@@ -89,9 +89,6 @@ extern const struct peripheral_clock_config_s g_peripheral_clockconfig0[];
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k1xx_bringup(void);
diff --git a/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_bringup.c b/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_bringup.c
index 8f23fe8a075..0790b16fed4 100644
--- a/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_bringup.c
+++ b/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_bringup.c
@@ -69,9 +69,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k1xx_bringup(void)
diff --git a/boards/arm/s32k1xx/s32k146evb/src/s32k146evb.h b/boards/arm/s32k1xx/s32k146evb/src/s32k146evb.h
index 125e9e07980..d0f6d24d9b0 100644
--- a/boards/arm/s32k1xx/s32k146evb/src/s32k146evb.h
+++ b/boards/arm/s32k1xx/s32k146evb/src/s32k146evb.h
@@ -89,9 +89,6 @@ extern const struct peripheral_clock_config_s g_peripheral_clockconfig0[];
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k1xx_bringup(void);
diff --git a/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_bringup.c b/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_bringup.c
index 300afc4a4ba..fb9b229c9c9 100644
--- a/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_bringup.c
+++ b/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_bringup.c
@@ -65,9 +65,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k1xx_bringup(void)
diff --git a/boards/arm/s32k1xx/s32k148evb/src/s32k148evb.h b/boards/arm/s32k1xx/s32k148evb/src/s32k148evb.h
index ddf8113e933..71bb833fd93 100644
--- a/boards/arm/s32k1xx/s32k148evb/src/s32k148evb.h
+++ b/boards/arm/s32k1xx/s32k148evb/src/s32k148evb.h
@@ -89,9 +89,6 @@ extern const struct peripheral_clock_config_s g_peripheral_clockconfig0[];
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k1xx_bringup(void);
diff --git a/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_bringup.c b/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_bringup.c
index 73f946f0b3b..6dbc001fa1f 100644
--- a/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_bringup.c
+++ b/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_bringup.c
@@ -73,9 +73,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k1xx_bringup(void)
diff --git a/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_bringup.c b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_bringup.c
index 4de010ff4c2..391490922a5 100644
--- a/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_bringup.c
+++ b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_bringup.c
@@ -71,9 +71,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k1xx_bringup(void)
diff --git a/boards/arm/s32k1xx/ucans32k146/src/ucans32k146.h b/boards/arm/s32k1xx/ucans32k146/src/ucans32k146.h
index 6a9d50529d1..06cdb05fe36 100644
--- a/boards/arm/s32k1xx/ucans32k146/src/ucans32k146.h
+++ b/boards/arm/s32k1xx/ucans32k146/src/ucans32k146.h
@@ -91,9 +91,6 @@ extern const struct peripheral_clock_config_s g_peripheral_clockconfig0[];
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k1xx_bringup(void);
diff --git a/boards/arm/s32k3xx/mr-canhubk3/src/mr-canhubk3.h b/boards/arm/s32k3xx/mr-canhubk3/src/mr-canhubk3.h
index b90384646d4..fcf789274bc 100644
--- a/boards/arm/s32k3xx/mr-canhubk3/src/mr-canhubk3.h
+++ b/boards/arm/s32k3xx/mr-canhubk3/src/mr-canhubk3.h
@@ -91,9 +91,6 @@ extern const struct peripheral_clock_config_s g_peripheral_clockconfig0[];
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k3xx_bringup(void);
diff --git a/boards/arm/s32k3xx/mr-canhubk3/src/s32k3xx_bringup.c b/boards/arm/s32k3xx/mr-canhubk3/src/s32k3xx_bringup.c
index 68e29cf070c..53b86053843 100644
--- a/boards/arm/s32k3xx/mr-canhubk3/src/s32k3xx_bringup.c
+++ b/boards/arm/s32k3xx/mr-canhubk3/src/s32k3xx_bringup.c
@@ -80,9 +80,6 @@ struct mtd_dev_s *g_mtd_fs;
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k3xx_bringup(void)
diff --git a/boards/arm/s32k3xx/s32k344evb/src/s32k344evb.h b/boards/arm/s32k3xx/s32k344evb/src/s32k344evb.h
index c72265c6a42..51daceb5a2a 100644
--- a/boards/arm/s32k3xx/s32k344evb/src/s32k344evb.h
+++ b/boards/arm/s32k3xx/s32k344evb/src/s32k344evb.h
@@ -99,9 +99,6 @@ extern const struct peripheral_clock_config_s g_peripheral_clockconfig0[];
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k3xx_bringup(void);
diff --git a/boards/arm/s32k3xx/s32k344evb/src/s32k3xx_bringup.c b/boards/arm/s32k3xx/s32k344evb/src/s32k3xx_bringup.c
index 27f2e69651d..cd44df1c75c 100644
--- a/boards/arm/s32k3xx/s32k344evb/src/s32k3xx_bringup.c
+++ b/boards/arm/s32k3xx/s32k344evb/src/s32k3xx_bringup.c
@@ -59,9 +59,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int s32k3xx_bringup(void)
diff --git a/boards/arm/sam34/arduino-due/src/arduino-due.h b/boards/arm/sam34/arduino-due/src/arduino-due.h
index 851aee1348d..d3e0219679d 100644
--- a/boards/arm/sam34/arduino-due/src/arduino-due.h
+++ b/boards/arm/sam34/arduino-due/src/arduino-due.h
@@ -348,9 +348,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 sam_bringup(void);
diff --git a/boards/arm/sam34/arduino-due/src/sam_bringup.c b/boards/arm/sam34/arduino-due/src/sam_bringup.c
index f8ab5ba24e5..7e0283ebfc1 100644
--- a/boards/arm/sam34/arduino-due/src/sam_bringup.c
+++ b/boards/arm/sam34/arduino-due/src/sam_bringup.c
@@ -82,9 +82,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 sam_bringup(void)
diff --git a/boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h b/boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h
index 29c43729b78..e6d383282c6 100644
--- a/boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h
+++ b/boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h
@@ -241,9 +241,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 sam_bringup(void);
diff --git a/boards/arm/sam34/flipnclick-sam3x/src/sam_bringup.c b/boards/arm/sam34/flipnclick-sam3x/src/sam_bringup.c
index f49f4d55c2b..763c85ca9b3 100644
--- a/boards/arm/sam34/flipnclick-sam3x/src/sam_bringup.c
+++ b/boards/arm/sam34/flipnclick-sam3x/src/sam_bringup.c
@@ -51,9 +51,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 sam_bringup(void)
diff --git a/boards/arm/samd2l2/arduino-m0/src/arduino_m0.h b/boards/arm/samd2l2/arduino-m0/src/arduino_m0.h
index f957c9a475a..a6efc7e8c0b 100644
--- a/boards/arm/samd2l2/arduino-m0/src/arduino_m0.h
+++ b/boards/arm/samd2l2/arduino-m0/src/arduino_m0.h
@@ -93,9 +93,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 sam_bringup(void);
diff --git a/boards/arm/samd2l2/circuit-express/src/circuit_express.h b/boards/arm/samd2l2/circuit-express/src/circuit_express.h
index 26a7baf6f75..1cb3a236a2c 100644
--- a/boards/arm/samd2l2/circuit-express/src/circuit_express.h
+++ b/boards/arm/samd2l2/circuit-express/src/circuit_express.h
@@ -93,9 +93,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 sam_bringup(void);
diff --git a/boards/arm/samd5e5/metro-m4/src/metro-m4.h b/boards/arm/samd5e5/metro-m4/src/metro-m4.h
index d7122553c79..1923eb7ee75 100644
--- a/boards/arm/samd5e5/metro-m4/src/metro-m4.h
+++ b/boards/arm/samd5e5/metro-m4/src/metro-m4.h
@@ -120,9 +120,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 sam_bringup(void);
diff --git a/boards/arm/samd5e5/metro-m4/src/sam_bringup.c b/boards/arm/samd5e5/metro-m4/src/sam_bringup.c
index d708b2b76fb..4cf16f4eeda 100644
--- a/boards/arm/samd5e5/metro-m4/src/sam_bringup.c
+++ b/boards/arm/samd5e5/metro-m4/src/sam_bringup.c
@@ -76,9 +76,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int sam_bringup(void)
diff --git a/boards/arm/samd5e5/same54-xplained-pro/src/sam_bringup.c b/boards/arm/samd5e5/same54-xplained-pro/src/sam_bringup.c
index 7eac2766d41..d9ce678af96 100644
--- a/boards/arm/samd5e5/same54-xplained-pro/src/sam_bringup.c
+++ b/boards/arm/samd5e5/same54-xplained-pro/src/sam_bringup.c
@@ -54,9 +54,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int sam_bringup(void)
diff --git a/boards/arm/samd5e5/same54-xplained-pro/src/same54-xplained-pro.h b/boards/arm/samd5e5/same54-xplained-pro/src/same54-xplained-pro.h
index b4a52218d36..40b70a587ea 100644
--- a/boards/arm/samd5e5/same54-xplained-pro/src/same54-xplained-pro.h
+++ b/boards/arm/samd5e5/same54-xplained-pro/src/same54-xplained-pro.h
@@ -93,9 +93,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 sam_bringup(void);
diff --git a/boards/arm/stm32/axoloti/src/axoloti.h b/boards/arm/stm32/axoloti/src/axoloti.h
index cddfe93496e..d6a2c7ac577 100644
--- a/boards/arm/stm32/axoloti/src/axoloti.h
+++ b/boards/arm/stm32/axoloti/src/axoloti.h
@@ -166,9 +166,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/stm32/axoloti/src/stm32_bringup.c b/boards/arm/stm32/axoloti/src/stm32_bringup.c
index 4e2e09a3cb1..0232a265bf9 100644
--- a/boards/arm/stm32/axoloti/src/stm32_bringup.c
+++ b/boards/arm/stm32/axoloti/src/stm32_bringup.c
@@ -66,9 +66,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/b-g431b-esc1/src/stm32_bringup.c b/boards/arm/stm32/b-g431b-esc1/src/stm32_bringup.c
index 058a54e63ed..3b5cf90e926 100644
--- a/boards/arm/stm32/b-g431b-esc1/src/stm32_bringup.c
+++ b/boards/arm/stm32/b-g431b-esc1/src/stm32_bringup.c
@@ -75,9 +75,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h b/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h
index 8ab6111fd66..206efc3a8ba 100644
--- a/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h
+++ b/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h
@@ -274,9 +274,6 @@ void weak_function stm32_spidev_initialize(void);
  *   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/stm32/clicker2-stm32/src/stm32_bringup.c b/boards/arm/stm32/clicker2-stm32/src/stm32_bringup.c
index 26570d4267e..3dd96d97b7e 100644
--- a/boards/arm/stm32/clicker2-stm32/src/stm32_bringup.c
+++ b/boards/arm/stm32/clicker2-stm32/src/stm32_bringup.c
@@ -70,9 +70,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/nucleo-f103rb/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f103rb/src/stm32_bringup.c
index 30de6813fa1..8ea6ec5e144 100644
--- a/boards/arm/stm32/nucleo-f103rb/src/stm32_bringup.c
+++ b/boards/arm/stm32/nucleo-f103rb/src/stm32_bringup.c
@@ -68,9 +68,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/nucleo-f302r8/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_bringup.c
index 99ecccf5a03..4a878d66e05 100644
--- a/boards/arm/stm32/nucleo-f302r8/src/stm32_bringup.c
+++ b/boards/arm/stm32/nucleo-f302r8/src/stm32_bringup.c
@@ -79,9 +79,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/nucleo-f401re/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f401re/src/stm32_bringup.c
index 75b7c40fb82..d768f5dc584 100644
--- a/boards/arm/stm32/nucleo-f401re/src/stm32_bringup.c
+++ b/boards/arm/stm32/nucleo-f401re/src/stm32_bringup.c
@@ -73,9 +73,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/nucleo-f410rb/src/nucleo-f410rb.h b/boards/arm/stm32/nucleo-f410rb/src/nucleo-f410rb.h
index b091b55be55..1ff343716d0 100644
--- a/boards/arm/stm32/nucleo-f410rb/src/nucleo-f410rb.h
+++ b/boards/arm/stm32/nucleo-f410rb/src/nucleo-f410rb.h
@@ -77,9 +77,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/stm32/nucleo-f410rb/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_bringup.c
index c6a66a861d9..043d8c543a8 100644
--- a/boards/arm/stm32/nucleo-f410rb/src/stm32_bringup.c
+++ b/boards/arm/stm32/nucleo-f410rb/src/stm32_bringup.c
@@ -49,9 +49,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/stm32/nucleo-f411re/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f411re/src/stm32_bringup.c
index d89f203370f..04836ee845a 100644
--- a/boards/arm/stm32/nucleo-f411re/src/stm32_bringup.c
+++ b/boards/arm/stm32/nucleo-f411re/src/stm32_bringup.c
@@ -73,9 +73,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/nucleo-f412zg/src/nucleo-f412zg.h b/boards/arm/stm32/nucleo-f412zg/src/nucleo-f412zg.h
index b45deb217cf..e0a4726994c 100644
--- a/boards/arm/stm32/nucleo-f412zg/src/nucleo-f412zg.h
+++ b/boards/arm/stm32/nucleo-f412zg/src/nucleo-f412zg.h
@@ -156,9 +156,6 @@ int stm32_usbhost_initialize(void);
  *   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/stm32/nucleo-f412zg/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f412zg/src/stm32_bringup.c
index b47d6400bf1..5b14c9c8f27 100644
--- a/boards/arm/stm32/nucleo-f412zg/src/stm32_bringup.c
+++ b/boards/arm/stm32/nucleo-f412zg/src/stm32_bringup.c
@@ -50,9 +50,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c
index 114ff1ca7c5..84d62e89f0b 100644
--- a/boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c
+++ b/boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c
@@ -76,9 +76,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/nucleo-g431kb/src/stm32_bringup.c b/boards/arm/stm32/nucleo-g431kb/src/stm32_bringup.c
index 6bb12235dfd..7def155d655 100644
--- a/boards/arm/stm32/nucleo-g431kb/src/stm32_bringup.c
+++ b/boards/arm/stm32/nucleo-g431kb/src/stm32_bringup.c
@@ -60,9 +60,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/nucleo-g431rb/src/stm32_bringup.c b/boards/arm/stm32/nucleo-g431rb/src/stm32_bringup.c
index 453c8eea319..5eabcf60798 100644
--- a/boards/arm/stm32/nucleo-g431rb/src/stm32_bringup.c
+++ b/boards/arm/stm32/nucleo-g431rb/src/stm32_bringup.c
@@ -69,9 +69,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/nucleo-g474re/src/nucleo-g474re.h b/boards/arm/stm32/nucleo-g474re/src/nucleo-g474re.h
index 70eb4dddebf..3609b90e7e5 100644
--- a/boards/arm/stm32/nucleo-g474re/src/nucleo-g474re.h
+++ b/boards/arm/stm32/nucleo-g474re/src/nucleo-g474re.h
@@ -76,9 +76,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/stm32/nucleo-g474re/src/stm32_bringup.c b/boards/arm/stm32/nucleo-g474re/src/stm32_bringup.c
index 8a5656f70da..bc3c6aa9007 100644
--- a/boards/arm/stm32/nucleo-g474re/src/stm32_bringup.c
+++ b/boards/arm/stm32/nucleo-g474re/src/stm32_bringup.c
@@ -58,9 +58,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/odrive36/src/stm32_bringup.c b/boards/arm/stm32/odrive36/src/stm32_bringup.c
index 0e47fb59a33..ab2bb6f29b8 100644
--- a/boards/arm/stm32/odrive36/src/stm32_bringup.c
+++ b/boards/arm/stm32/odrive36/src/stm32_bringup.c
@@ -53,9 +53,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h b/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h
index a19162a35ff..7d1d5064417 100644
--- a/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h
+++ b/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h
@@ -233,9 +233,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/stm32/olimex-stm32-e407/src/stm32_bringup.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c
index cbcb7ee282e..5636dad2618 100644
--- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c
+++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c
@@ -179,9 +179,6 @@ static void stm32_i2ctool(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h b/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h
index ef3133a85a3..8847489d520 100644
--- a/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h
+++ b/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h
@@ -224,9 +224,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/stm32/olimex-stm32-p407/src/stm32_bringup.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_bringup.c
index 1f4bb10606d..af02950de45 100644
--- a/boards/arm/stm32/olimex-stm32-p407/src/stm32_bringup.c
+++ b/boards/arm/stm32/olimex-stm32-p407/src/stm32_bringup.c
@@ -77,9 +77,6 @@ extern const int MODSYMS_NSYMBOLS_VAR;
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm3210e-eval.h b/boards/arm/stm32/stm3210e-eval/src/stm3210e-eval.h
index 856e9b86072..0f56d7a9328 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm3210e-eval.h
+++ b/boards/arm/stm32/stm3210e-eval/src/stm3210e-eval.h
@@ -175,9 +175,6 @@ extern const uint16_t g_commonconfig[NCOMMON_CONFIG];
  *   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/stm32/stm3210e-eval/src/stm32_bringup.c b/boards/arm/stm32/stm3210e-eval/src/stm32_bringup.c
index 3f990712ff6..3a6d49c8f43 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_bringup.c
@@ -174,9 +174,6 @@ static void stm32_i2ctool(void)
  *   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/stm32/stm3210e-eval/src/stm32_usbmsc.c b/boards/arm/stm32/stm3210e-eval/src/stm32_usbmsc.c
index 05bd61798b5..6abb8c388fe 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_usbmsc.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_usbmsc.c
@@ -74,9 +74,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/stm32/stm3240g-eval/src/stm3240g-eval.h b/boards/arm/stm32/stm3240g-eval/src/stm3240g-eval.h
index 8b7b7bc96a4..b607dc33408 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm3240g-eval.h
+++ b/boards/arm/stm32/stm3240g-eval/src/stm3240g-eval.h
@@ -225,9 +225,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/stm32/stm3240g-eval/src/stm32_bringup.c b/boards/arm/stm32/stm3240g-eval/src/stm32_bringup.c
index 5d9b9ace416..016041c9190 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_bringup.c
@@ -208,9 +208,6 @@ static void stm32_i2ctool(void)
  *   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/stm32/stm32f103-minimum/src/stm32_bringup.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c
index f39c58bac6a..518bffcec4a 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c
@@ -235,9 +235,6 @@ static int g_sensor_devno;
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c b/boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c
index b2760466664..b0fc88f9be7 100644
--- a/boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c
@@ -98,9 +98,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/stm32/stm32f3discovery/src/stm32f3discovery.h b/boards/arm/stm32/stm32f3discovery/src/stm32f3discovery.h
index 99de0fa2dc0..44464bcf3a8 100644
--- a/boards/arm/stm32/stm32f3discovery/src/stm32f3discovery.h
+++ b/boards/arm/stm32/stm32f3discovery/src/stm32f3discovery.h
@@ -146,9 +146,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/stm32/stm32f401rc-rs485/src/stm32_bringup.c b/boards/arm/stm32/stm32f401rc-rs485/src/stm32_bringup.c
index 5cdc7d61cc8..eaf5642cb8a 100644
--- a/boards/arm/stm32/stm32f401rc-rs485/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm32f401rc-rs485/src/stm32_bringup.c
@@ -167,9 +167,6 @@ static void stm32_i2ctool(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/stm32f411-minimum/src/stm32_bringup.c b/boards/arm/stm32/stm32f411-minimum/src/stm32_bringup.c
index dec1182ffbf..e81aad31989 100644
--- a/boards/arm/stm32/stm32f411-minimum/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm32f411-minimum/src/stm32_bringup.c
@@ -85,9 +85,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/stm32f411-minimum/src/stm32f411-minimum.h b/boards/arm/stm32/stm32f411-minimum/src/stm32f411-minimum.h
index a6364c945c8..38d62a738ac 100644
--- a/boards/arm/stm32/stm32f411-minimum/src/stm32f411-minimum.h
+++ b/boards/arm/stm32/stm32f411-minimum/src/stm32f411-minimum.h
@@ -251,9 +251,6 @@ int stm32_rgbled_setup(void);
  *   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/stm32/stm32f411e-disco/src/stm32_bringup.c b/boards/arm/stm32/stm32f411e-disco/src/stm32_bringup.c
index 57e60923bff..fe85d312f3e 100644
--- a/boards/arm/stm32/stm32f411e-disco/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm32f411e-disco/src/stm32_bringup.c
@@ -59,9 +59,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/stm32f411e-disco/src/stm32f411e-disco.h b/boards/arm/stm32/stm32f411e-disco/src/stm32f411e-disco.h
index 0fcb9b4bf1b..993efb33dd7 100644
--- a/boards/arm/stm32/stm32f411e-disco/src/stm32f411e-disco.h
+++ b/boards/arm/stm32/stm32f411e-disco/src/stm32f411e-disco.h
@@ -182,9 +182,6 @@ int stm32_usbhost_initialize(void);
  *   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/stm32/stm32f429i-disco/src/stm32_bringup.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_bringup.c
index 069a43a6c7d..a00da867c59 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_bringup.c
@@ -89,9 +89,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/stm32/stm32f429i-disco/src/stm32f429i-disco.h b/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h
index 06d6c155a3c..121f0380a73 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h
@@ -198,9 +198,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/stm32/stm32f4discovery/src/stm32_bringup.c b/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c
index 272cc5206ef..a5dae40aba6 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c
@@ -220,9 +220,6 @@ static void stm32_i2ctool(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h b/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h
index 4155bcf2569..ef99b4a2fa7 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h
@@ -447,9 +447,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/stm32/stm32ldiscovery/src/stm32_bringup.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_bringup.c
index 468f07c77fe..be3ff1616ed 100644
--- a/boards/arm/stm32/stm32ldiscovery/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_bringup.c
@@ -55,9 +55,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/stm32vldiscovery/src/stm32_bringup.c b/boards/arm/stm32/stm32vldiscovery/src/stm32_bringup.c
index b1c6bc0319d..bf078df319d 100644
--- a/boards/arm/stm32/stm32vldiscovery/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm32vldiscovery/src/stm32_bringup.c
@@ -56,9 +56,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/stm32vldiscovery/src/stm32vldiscovery.h b/boards/arm/stm32/stm32vldiscovery/src/stm32vldiscovery.h
index 03be539bb12..23898505690 100644
--- a/boards/arm/stm32/stm32vldiscovery/src/stm32vldiscovery.h
+++ b/boards/arm/stm32/stm32vldiscovery/src/stm32vldiscovery.h
@@ -54,9 +54,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/stm32/viewtool-stm32f107/src/stm32_bringup.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_bringup.c
index 1aa64cbe5d1..c9cfd7c6591 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_bringup.c
+++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_bringup.c
@@ -120,9 +120,6 @@ static int rtc_driver_initialize(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h b/boards/arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h
index 2a6dbe12d10..be6c8199aff 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h
+++ b/boards/arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h
@@ -366,9 +366,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/b-l072z-lrwan1.h b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/b-l072z-lrwan1.h
index acb00cc954a..04013570d18 100644
--- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/b-l072z-lrwan1.h
+++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/b-l072z-lrwan1.h
@@ -124,9 +124,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/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c
index d46ab38ba49..9cd2d49b180 100644
--- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c
+++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c
@@ -122,9 +122,6 @@ static void stm32_i2ctool(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f0l0g0/nucleo-c071rb/src/nucleo-c071rb.h b/boards/arm/stm32f0l0g0/nucleo-c071rb/src/nucleo-c071rb.h
index 43d17cc3d25..62e686e1c56 100644
--- a/boards/arm/stm32f0l0g0/nucleo-c071rb/src/nucleo-c071rb.h
+++ b/boards/arm/stm32f0l0g0/nucleo-c071rb/src/nucleo-c071rb.h
@@ -85,9 +85,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32f0l0g0/nucleo-c071rb/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-c071rb/src/stm32_bringup.c
index 2ca3cf0ec3e..2110d39018e 100644
--- a/boards/arm/stm32f0l0g0/nucleo-c071rb/src/stm32_bringup.c
+++ b/boards/arm/stm32f0l0g0/nucleo-c071rb/src/stm32_bringup.c
@@ -67,9 +67,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f0l0g0/nucleo-c092rc/src/nucleo-c092rc.h b/boards/arm/stm32f0l0g0/nucleo-c092rc/src/nucleo-c092rc.h
index 7ef33cbe054..c802a74b017 100644
--- a/boards/arm/stm32f0l0g0/nucleo-c092rc/src/nucleo-c092rc.h
+++ b/boards/arm/stm32f0l0g0/nucleo-c092rc/src/nucleo-c092rc.h
@@ -92,9 +92,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32f0l0g0/nucleo-c092rc/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-c092rc/src/stm32_bringup.c
index b51e3c42f45..14f9820f52d 100644
--- a/boards/arm/stm32f0l0g0/nucleo-c092rc/src/stm32_bringup.c
+++ b/boards/arm/stm32f0l0g0/nucleo-c092rc/src/stm32_bringup.c
@@ -67,9 +67,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/nucleo-f072rb.h b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/nucleo-f072rb.h
index 32ff12a1c54..6fa9242000a 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/nucleo-f072rb.h
+++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/nucleo-f072rb.h
@@ -101,9 +101,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_bringup.c
index d4508e7b418..b742e7e62ec 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_bringup.c
+++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_bringup.c
@@ -57,9 +57,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/nucleo-f091rc.h b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/nucleo-f091rc.h
index bdc8a5a6a57..d4798c5bd87 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/nucleo-f091rc.h
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/nucleo-f091rc.h
@@ -113,9 +113,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_bringup.c
index 78cb0fec63b..02697f3f888 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_bringup.c
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_bringup.c
@@ -46,9 +46,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/nucleo-g070rb.h b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/nucleo-g070rb.h
index a0c3d3ce56c..c48523c4184 100644
--- a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/nucleo-g070rb.h
+++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/nucleo-g070rb.h
@@ -156,9 +156,6 @@ int stm32_timer_driver_setup(const char *devpath, int timer);
  *   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/stm32f0l0g0/nucleo-g071rb/src/nucleo-g071rb.h b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/nucleo-g071rb.h
index a411c479a9d..32e9d86e5fb 100644
--- a/boards/arm/stm32f0l0g0/nucleo-g071rb/src/nucleo-g071rb.h
+++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/nucleo-g071rb.h
@@ -93,9 +93,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/stm32f0l0g0/nucleo-g071rb/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_bringup.c
index c6fdd0d0131..cea5f3eab4e 100644
--- a/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_bringup.c
+++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_bringup.c
@@ -63,9 +63,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f0l0g0/nucleo-g0b1re/src/nucleo-g0b1re.h b/boards/arm/stm32f0l0g0/nucleo-g0b1re/src/nucleo-g0b1re.h
index 9515a80b0ac..66318689a0f 100644
--- a/boards/arm/stm32f0l0g0/nucleo-g0b1re/src/nucleo-g0b1re.h
+++ b/boards/arm/stm32f0l0g0/nucleo-g0b1re/src/nucleo-g0b1re.h
@@ -82,9 +82,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/stm32f0l0g0/nucleo-g0b1re/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-g0b1re/src/stm32_bringup.c
index d39fe5d2e98..e9ca45a84d7 100644
--- a/boards/arm/stm32f0l0g0/nucleo-g0b1re/src/stm32_bringup.c
+++ b/boards/arm/stm32f0l0g0/nucleo-g0b1re/src/stm32_bringup.c
@@ -67,9 +67,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h
index f27da30c1e8..7e17a772c36 100644
--- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h
+++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h
@@ -127,9 +127,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/stm32f0l0g0/nucleo-l073rz/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_bringup.c
index f23f3e867bf..35e5ae85e28 100644
--- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_bringup.c
+++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_bringup.c
@@ -63,9 +63,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_bringup.c
index be0396e6606..5ad5089520c 100644
--- a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_bringup.c
+++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_bringup.c
@@ -45,9 +45,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32f051-discovery.h b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32f051-discovery.h
index 93767e28a81..42d17d21bc0 100644
--- a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32f051-discovery.h
+++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32f051-discovery.h
@@ -121,9 +121,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_bringup.c
index ac001b638b1..4302171b881 100644
--- a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_bringup.c
+++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_bringup.c
@@ -45,9 +45,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32f072-discovery.h b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32f072-discovery.h
index 5a0e0648012..f085bb693bd 100644
--- a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32f072-discovery.h
+++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32f072-discovery.h
@@ -125,9 +125,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32f0l0g0/stm32g071b-disco/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/stm32g071b-disco/src/stm32_bringup.c
index 457587905dd..c41a38d31a1 100644
--- a/boards/arm/stm32f0l0g0/stm32g071b-disco/src/stm32_bringup.c
+++ b/boards/arm/stm32f0l0g0/stm32g071b-disco/src/stm32_bringup.c
@@ -50,9 +50,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f0l0g0/stm32g071b-disco/src/stm32g071b-disco.h b/boards/arm/stm32f0l0g0/stm32g071b-disco/src/stm32g071b-disco.h
index be8830600ea..f8c27839f17 100644
--- a/boards/arm/stm32f0l0g0/stm32g071b-disco/src/stm32g071b-disco.h
+++ b/boards/arm/stm32f0l0g0/stm32g071b-disco/src/stm32g071b-disco.h
@@ -119,9 +119,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/stm32f0l0g0/stm32l0538-disco/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/stm32l0538-disco/src/stm32_bringup.c
index 9b2ab00f623..c4907ef7ac8 100644
--- a/boards/arm/stm32f0l0g0/stm32l0538-disco/src/stm32_bringup.c
+++ b/boards/arm/stm32f0l0g0/stm32l0538-disco/src/stm32_bringup.c
@@ -52,9 +52,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f0l0g0/stm32l0538-disco/src/stm32l0538-disco.h b/boards/arm/stm32f0l0g0/stm32l0538-disco/src/stm32l0538-disco.h
index e87c10e2faa..34b45f2a994 100644
--- a/boards/arm/stm32f0l0g0/stm32l0538-disco/src/stm32l0538-disco.h
+++ b/boards/arm/stm32f0l0g0/stm32l0538-disco/src/stm32l0538-disco.h
@@ -94,9 +94,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/stm32f7/nucleo-f722ze/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
index 1d1f223550e..7c848385d0c 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
@@ -73,9 +73,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
index 501cce5a1ed..39d379e5c8d 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
@@ -73,9 +73,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
index 85336447efe..4213f82a5a2 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
@@ -77,9 +77,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f7/steval-eth001v1/src/steval-eth001v1.h b/boards/arm/stm32f7/steval-eth001v1/src/steval-eth001v1.h
index feea2d87af8..22026d5156f 100644
--- a/boards/arm/stm32f7/steval-eth001v1/src/steval-eth001v1.h
+++ b/boards/arm/stm32f7/steval-eth001v1/src/steval-eth001v1.h
@@ -60,9 +60,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32f7/steval-eth001v1/src/stm32_bringup.c b/boards/arm/stm32f7/steval-eth001v1/src/stm32_bringup.c
index 569a777c2d6..1ef16e93ce0 100644
--- a/boards/arm/stm32f7/steval-eth001v1/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/steval-eth001v1/src/stm32_bringup.c
@@ -47,9 +47,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c
index 33f2452eacb..1ee2e0d07d3 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c
@@ -55,9 +55,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h b/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h
index 1eab2500bbd..1bbf837dd78 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h
+++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h
@@ -163,9 +163,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_bringup.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_bringup.c
index 85824d7ce17..1381be14815 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_bringup.c
@@ -49,9 +49,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h b/boards/arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h
index 922d9f89214..5c2ad841e97 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h
+++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h
@@ -110,9 +110,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/stm32f7/stm32f777zit6-meadow/src/stm32_bringup.c b/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_bringup.c
index 7e8dfcee143..f77b7812570 100644
--- a/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_bringup.c
@@ -116,9 +116,6 @@ static void stm32_i2ctool(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32f777zit6-meadow.h b/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32f777zit6-meadow.h
index 0d45e1e1d91..827959faa57 100644
--- a/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32f777zit6-meadow.h
+++ b/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32f777zit6-meadow.h
@@ -117,9 +117,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/stm32h5/nucleo-h563zi/src/nucleo-h563zi.h b/boards/arm/stm32h5/nucleo-h563zi/src/nucleo-h563zi.h
index 860dec6449f..0d30bde00d7 100644
--- a/boards/arm/stm32h5/nucleo-h563zi/src/nucleo-h563zi.h
+++ b/boards/arm/stm32h5/nucleo-h563zi/src/nucleo-h563zi.h
@@ -111,9 +111,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32h5/nucleo-h563zi/src/stm32_bringup.c b/boards/arm/stm32h5/nucleo-h563zi/src/stm32_bringup.c
index 382f2768615..1653b499626 100644
--- a/boards/arm/stm32h5/nucleo-h563zi/src/stm32_bringup.c
+++ b/boards/arm/stm32h5/nucleo-h563zi/src/stm32_bringup.c
@@ -55,9 +55,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32h7/openh743i/src/openh743i.h b/boards/arm/stm32h7/openh743i/src/openh743i.h
index 815d5454b12..1645ce01182 100644
--- a/boards/arm/stm32h7/openh743i/src/openh743i.h
+++ b/boards/arm/stm32h7/openh743i/src/openh743i.h
@@ -93,9 +93,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/openh743i/src/stm32_bringup.c b/boards/arm/stm32h7/openh743i/src/stm32_bringup.c
index 8d0abb21da5..1bf485416d9 100644
--- a/boards/arm/stm32h7/openh743i/src/stm32_bringup.c
+++ b/boards/arm/stm32h7/openh743i/src/stm32_bringup.c
@@ -61,8 +61,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y &&
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h b/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h
index ce452ff5019..b9f111e886a 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h
@@ -128,9 +128,6 @@ extern struct spi_dev_s *g_spi2;
  *   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/stm32l4/nucleo-l432kc/src/stm32_bringup.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_bringup.c
index 0898bcad054..d8dead5bc11 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_bringup.c
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_bringup.c
@@ -75,9 +75,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32l4/nucleo-l452re/src/nucleo-l452re.h b/boards/arm/stm32l4/nucleo-l452re/src/nucleo-l452re.h
index 316645155b5..4ab69149c5d 100644
--- a/boards/arm/stm32l4/nucleo-l452re/src/nucleo-l452re.h
+++ b/boards/arm/stm32l4/nucleo-l452re/src/nucleo-l452re.h
@@ -158,9 +158,6 @@ int stm32l4_dac_setup(void);
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c
index ff29aedc5a3..31eac2e1376 100644
--- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c
+++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c
@@ -62,9 +62,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/nucleo-l476rg.h b/boards/arm/stm32l4/nucleo-l476rg/src/nucleo-l476rg.h
index 3c3a02e763a..adf24d58b9a 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/src/nucleo-l476rg.h
+++ b/boards/arm/stm32l4/nucleo-l476rg/src/nucleo-l476rg.h
@@ -288,9 +288,6 @@ extern struct sdio_dev_s *g_sdio;
  *   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/stm32l4/nucleo-l476rg/src/stm32_bringup.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_bringup.c
index 3de7093eb88..9864ec4040a 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_bringup.c
+++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_bringup.c
@@ -143,9 +143,6 @@ static void stm32_i2ctool(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/nucleo-144.h b/boards/arm/stm32l4/nucleo-l496zg/src/nucleo-144.h
index be76478a032..e4e2a78aa0e 100644
--- a/boards/arm/stm32l4/nucleo-l496zg/src/nucleo-144.h
+++ b/boards/arm/stm32l4/nucleo-l496zg/src/nucleo-144.h
@@ -172,9 +172,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/stm32l4/nucleo-l496zg/src/stm32_bringup.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_bringup.c
index 05ff9e51bff..06a09421d54 100644
--- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_bringup.c
+++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_bringup.c
@@ -66,9 +66,6 @@ struct i2c_master_s *i2c4;
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32l4/steval-stlcs01v1/src/stm32_bringup.c b/boards/arm/stm32l4/steval-stlcs01v1/src/stm32_bringup.c
index 257f42a22af..d885272feb3 100644
--- a/boards/arm/stm32l4/steval-stlcs01v1/src/stm32_bringup.c
+++ b/boards/arm/stm32l4/steval-stlcs01v1/src/stm32_bringup.c
@@ -44,9 +44,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32l4_bringup(void)
diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h b/boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h
index c878df37690..31aae781ccc 100644
--- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h
+++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h
@@ -140,9 +140,6 @@ extern struct spi_dev_s *g_spi2;
  *   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/stm32l4/stm32l476vg-disco/src/stm32_bringup.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_bringup.c
index cb4229e9f0e..f96a416d761 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_bringup.c
+++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_bringup.c
@@ -92,9 +92,6 @@ struct mtd_dev_s *g_mtd_fs;
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32l476vg-disco.h b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32l476vg-disco.h
index a6c57add28e..a8e921a60d0 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32l476vg-disco.h
+++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32l476vg-disco.h
@@ -259,9 +259,6 @@ extern struct spi_dev_s *g_spi2;
  *   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/stm32l4/stm32l4r9ai-disco/src/stm32_bringup.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_bringup.c
index b5fc38e0d12..ae5c959cc34 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_bringup.c
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_bringup.c
@@ -86,9 +86,6 @@ static struct i2c_master_s *g_i2c3;
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h
index a07a51c0e62..b3e2fa0db7f 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h
@@ -208,9 +208,6 @@ extern struct spi_dev_s *g_spi2;
  *   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/stm32l5/nucleo-l552ze/src/nucleo-l552ze.h b/boards/arm/stm32l5/nucleo-l552ze/src/nucleo-l552ze.h
index adee840315e..847c837138c 100644
--- a/boards/arm/stm32l5/nucleo-l552ze/src/nucleo-l552ze.h
+++ b/boards/arm/stm32l5/nucleo-l552ze/src/nucleo-l552ze.h
@@ -111,9 +111,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32l5/nucleo-l552ze/src/stm32_bringup.c b/boards/arm/stm32l5/nucleo-l552ze/src/stm32_bringup.c
index 6a0b039c869..fb3172cab63 100644
--- a/boards/arm/stm32l5/nucleo-l552ze/src/stm32_bringup.c
+++ b/boards/arm/stm32l5/nucleo-l552ze/src/stm32_bringup.c
@@ -55,9 +55,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32l5/stm32l562e-dk/src/stm32_bringup.c b/boards/arm/stm32l5/stm32l562e-dk/src/stm32_bringup.c
index 8469075eddf..a9e8f7f489c 100644
--- a/boards/arm/stm32l5/stm32l562e-dk/src/stm32_bringup.c
+++ b/boards/arm/stm32l5/stm32l562e-dk/src/stm32_bringup.c
@@ -55,9 +55,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32l5/stm32l562e-dk/src/stm32l562e-dk.h b/boards/arm/stm32l5/stm32l562e-dk/src/stm32l562e-dk.h
index 2a28f9ae4c5..1352d9c3d8f 100644
--- a/boards/arm/stm32l5/stm32l562e-dk/src/stm32l562e-dk.h
+++ b/boards/arm/stm32l5/stm32l562e-dk/src/stm32l562e-dk.h
@@ -108,9 +108,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32u5/b-u585i-iot02a/src/b-u585i-iot02a.h b/boards/arm/stm32u5/b-u585i-iot02a/src/b-u585i-iot02a.h
index 3033b10537b..7e383e0bbf3 100644
--- a/boards/arm/stm32u5/b-u585i-iot02a/src/b-u585i-iot02a.h
+++ b/boards/arm/stm32u5/b-u585i-iot02a/src/b-u585i-iot02a.h
@@ -92,9 +92,6 @@ void stm32_spidev_initialize(void);
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_bringup.c b/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_bringup.c
index 059f688a88b..1c727cb7d97 100644
--- a/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_bringup.c
+++ b/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_bringup.c
@@ -58,9 +58,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/stm32u5/nucleo-u5a5zj-q/src/nucleo-u5a5zj-q.h b/boards/arm/stm32u5/nucleo-u5a5zj-q/src/nucleo-u5a5zj-q.h
index 37d24d67e84..2fa799df2c3 100644
--- a/boards/arm/stm32u5/nucleo-u5a5zj-q/src/nucleo-u5a5zj-q.h
+++ b/boards/arm/stm32u5/nucleo-u5a5zj-q/src/nucleo-u5a5zj-q.h
@@ -92,9 +92,6 @@ void stm32_spidev_initialize(void);
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void);
diff --git a/boards/arm/stm32u5/nucleo-u5a5zj-q/src/stm32_bringup.c b/boards/arm/stm32u5/nucleo-u5a5zj-q/src/stm32_bringup.c
index 74228ac5545..2d246c3377f 100644
--- a/boards/arm/stm32u5/nucleo-u5a5zj-q/src/stm32_bringup.c
+++ b/boards/arm/stm32u5/nucleo-u5a5zj-q/src/stm32_bringup.c
@@ -85,9 +85,6 @@ int up_rtc_initialize(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int stm32_bringup(void)
diff --git a/boards/arm/tiva/launchxl-cc1310/src/cc1310_bringup.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_bringup.c
index f73a7009fc2..d5589fd3d18 100644
--- a/boards/arm/tiva/launchxl-cc1310/src/cc1310_bringup.c
+++ b/boards/arm/tiva/launchxl-cc1310/src/cc1310_bringup.c
@@ -50,11 +50,6 @@
  *   If CONFIG_BOARD_LATE_INITIALIZE=y, then this function will be called
  *   from board_late_initialize().
  *
- *   If CONFIG_BOARD_LATE_INITIALIZE is not selected,
- *   but CONFIG_BOARDCTL=y
- *   then this function will *probably* be called from application logic via
- *   boardctl().
- *
  *   Otherwise, this function will not be called (which is usually a bad
  *   thing)
  *
diff --git a/boards/arm/tiva/launchxl-cc1310/src/launchxl-cc1310.h b/boards/arm/tiva/launchxl-cc1310/src/launchxl-cc1310.h
index 747e992246a..6fa8c8a0b19 100644
--- a/boards/arm/tiva/launchxl-cc1310/src/launchxl-cc1310.h
+++ b/boards/arm/tiva/launchxl-cc1310/src/launchxl-cc1310.h
@@ -80,11 +80,6 @@ extern const struct cc13xx_pinconfig_s g_gpio_sw2;
  *   If CONFIG_BOARD_LATE_INITIALIZE=y, then this function will be called
  *   from board_late_initialize().
  *
- *   If CONFIG_BOARD_LATE_INITIALIZE is not selected,
- *   but CONFIG_BOARDCTL=y
- *   then this function will *probably* be called from application logic via
- *   boardctl().
- *
  *   Otherwise, this function will not be called (which is usually a bad
  *   thing)
  *
diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_bringup.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_bringup.c
index f1b4516ed15..5e780b36ec1 100644
--- a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_bringup.c
+++ b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_bringup.c
@@ -50,11 +50,6 @@
  *   If CONFIG_BOARD_LATE_INITIALIZE=y, then this function will be called
  *   from board_late_initialize().
  *
- *   If CONFIG_BOARD_LATE_INITIALIZE is not selected,
- *   but CONFIG_BOARDCTL=y
- *   then this function will *probably* be called from application logic via
- *   boardctl().
- *
  *   Otherwise, this function will not be called (which is usually a bad
  *   thing)
  *
diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/launchxl-cc1312r1.h b/boards/arm/tiva/launchxl-cc1312r1/src/launchxl-cc1312r1.h
index 46653a76120..3eb3816dded 100644
--- a/boards/arm/tiva/launchxl-cc1312r1/src/launchxl-cc1312r1.h
+++ b/boards/arm/tiva/launchxl-cc1312r1/src/launchxl-cc1312r1.h
@@ -80,11 +80,6 @@ extern const struct cc13xx_pinconfig_s g_gpio_sw2;
  *   If CONFIG_BOARD_LATE_INITIALIZE=y, then this function will be called
  *   from board_late_initialize().
  *
- *   If CONFIG_BOARD_LATE_INITIALIZE is not selected,
- *   but CONFIG_BOARDCTL=y
- *   then this function will *probably* be called from application logic via
- *   boardctl().
- *
  *   Otherwise, this function will not be called (which is usually a bad
  *   thing)
  *
diff --git a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_bringup.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_bringup.c
index 6e71f5357d1..e47b515b304 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_bringup.c
+++ b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_bringup.c
@@ -363,9 +363,6 @@ static int nsh_usbdevinitialize(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int pic32mx_bringup(void)
diff --git a/boards/mips/pic32mx/pic32mx7mmb/src/pic32mx7mmb.h b/boards/mips/pic32mx/pic32mx7mmb/src/pic32mx7mmb.h
index 04bfde73c6a..8b7467460f3 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/src/pic32mx7mmb.h
+++ b/boards/mips/pic32mx/pic32mx7mmb/src/pic32mx7mmb.h
@@ -145,9 +145,6 @@ void pic32mx_led_initialize(void);
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int pic32mx_bringup(void);
diff --git a/boards/or1k/mor1kx/or1k/src/or1k.h b/boards/or1k/mor1kx/or1k/src/or1k.h
index bb28cdd5182..582aa633b67 100644
--- a/boards/or1k/mor1kx/or1k/src/or1k.h
+++ b/boards/or1k/mor1kx/or1k/src/or1k.h
@@ -36,9 +36,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int or1k_bringup(void);
diff --git a/boards/or1k/mor1kx/or1k/src/or1k_bringup.c b/boards/or1k/mor1kx/or1k/src/or1k_bringup.c
index bf40a6e3d51..1a526fb7bd3 100644
--- a/boards/or1k/mor1kx/or1k/src/or1k_bringup.c
+++ b/boards/or1k/mor1kx/or1k/src/or1k_bringup.c
@@ -58,9 +58,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int or1k_bringup(void)
diff --git a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c
index abe41bd2325..dd14b11db26 100644
--- a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c
+++ b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c
@@ -348,9 +348,6 @@ static int rtc_driver_initialize(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int rx65n_bringup(void)
diff --git a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_grrose.h b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_grrose.h
index 55391ef6d25..bad5ef7679b 100644
--- a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_grrose.h
+++ b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_grrose.h
@@ -54,9 +54,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int rx65n_bringup(void);
diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c
index 7d863a792f5..7ac8368f0e1 100644
--- a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c
+++ b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c
@@ -343,9 +343,6 @@ static int rtc_driver_initialize(void)
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int rx65n_bringup(void)
diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_rsk2mb.h b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_rsk2mb.h
index c3e69b36ac8..bd1aa202513 100644
--- a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_rsk2mb.h
+++ b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_rsk2mb.h
@@ -54,9 +54,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int rx65n_bringup(void);
diff --git a/boards/risc-v/esp32c3-legacy/esp32c3-legacy-devkit-rust-1/src/esp32c3_bringup.c b/boards/risc-v/esp32c3-legacy/esp32c3-legacy-devkit-rust-1/src/esp32c3_bringup.c
index fa2c03a7ab8..b66ce7d7f7c 100644
--- a/boards/risc-v/esp32c3-legacy/esp32c3-legacy-devkit-rust-1/src/esp32c3_bringup.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-legacy-devkit-rust-1/src/esp32c3_bringup.c
@@ -78,9 +78,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32c3_bringup(void)
diff --git a/boards/risc-v/esp32c3-legacy/esp32c3-legacy-devkit/src/esp32c3_bringup.c b/boards/risc-v/esp32c3-legacy/esp32c3-legacy-devkit/src/esp32c3_bringup.c
index 7a2a3b10364..3995042862b 100644
--- a/boards/risc-v/esp32c3-legacy/esp32c3-legacy-devkit/src/esp32c3_bringup.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-legacy-devkit/src/esp32c3_bringup.c
@@ -111,9 +111,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32c3_bringup(void)
diff --git a/boards/x86/qemu/qemu-i486/src/qemu_bringup.c b/boards/x86/qemu/qemu-i486/src/qemu_bringup.c
index 2bb9799c9c1..2f360ed170d 100644
--- a/boards/x86/qemu/qemu-i486/src/qemu_bringup.c
+++ b/boards/x86/qemu/qemu-i486/src/qemu_bringup.c
@@ -53,9 +53,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int qemu_bringup(void)
diff --git a/boards/xtensa/esp32/esp32-2432S028/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-2432S028/src/esp32_bringup.c
index f9f74ee02ae..2e7b1790ba0 100644
--- a/boards/xtensa/esp32/esp32-2432S028/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-2432S028/src/esp32_bringup.c
@@ -99,9 +99,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32_bringup(void)
diff --git a/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c
index 21ff6c9041e..6e7fd1d528e 100644
--- a/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c
@@ -128,9 +128,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32_bringup(void)
diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
index 579b29e03fd..3702360fee2 100644
--- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
@@ -216,9 +216,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32_bringup(void)
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c
index 8118a0c1ab5..118fdb8fb31 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c
@@ -100,9 +100,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32_bringup(void)
diff --git a/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c
index 5c98791f55c..1a5b3ab99c2 100644
--- a/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c
@@ -129,9 +129,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32_bringup(void)
diff --git a/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c
index 9d4d359720e..12c54a6857b 100644
--- a/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c
@@ -120,9 +120,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32_bringup(void)
diff --git a/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c
index 753ed516457..75157d9a887 100644
--- a/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c
@@ -141,9 +141,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32_bringup(void)
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c
index c10fb612559..ef6c0607093 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c
@@ -129,9 +129,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32_bringup(void)
diff --git a/boards/xtensa/esp32/heltec_wifi_lora32/src/esp32_bringup.c b/boards/xtensa/esp32/heltec_wifi_lora32/src/esp32_bringup.c
index 8be92ac40e6..10dfae80071 100644
--- a/boards/xtensa/esp32/heltec_wifi_lora32/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/heltec_wifi_lora32/src/esp32_bringup.c
@@ -57,9 +57,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32_bringup(void)
diff --git a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_bringup.c b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_bringup.c
index 1ef540108d9..06b417e0f3b 100644
--- a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_bringup.c
@@ -128,9 +128,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32_bringup(void)
diff --git a/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_bringup.c b/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_bringup.c
index 410296a7004..26dc7eaaf75 100644
--- a/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_bringup.c
@@ -156,9 +156,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32_bringup(void)
diff --git a/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_bringup.c b/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_bringup.c
index f6cd5e6fec4..5dace1e87e6 100644
--- a/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_bringup.c
@@ -128,9 +128,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32_bringup(void)
diff --git a/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_bringup.c b/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_bringup.c
index 1169b1e3e86..ad67e4cf531 100644
--- a/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_bringup.c
@@ -165,9 +165,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32_bringup(void)
diff --git a/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_bringup.c b/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_bringup.c
index 03d7618f1d6..3c2e36758ea 100644
--- a/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_bringup.c
+++ b/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_bringup.c
@@ -104,9 +104,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32s2_bringup(void)
diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c
index 728894bd34a..cb4a7a99e83 100644
--- a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c
+++ b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c
@@ -150,9 +150,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32s2_bringup(void)
diff --git a/boards/xtensa/esp32s2/franzininho-wifi/src/esp32s2_bringup.c b/boards/xtensa/esp32s2/franzininho-wifi/src/esp32s2_bringup.c
index 9f4e8da7748..a976eb5daf7 100644
--- a/boards/xtensa/esp32s2/franzininho-wifi/src/esp32s2_bringup.c
+++ b/boards/xtensa/esp32s2/franzininho-wifi/src/esp32s2_bringup.c
@@ -67,9 +67,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32s2_bringup(void)
diff --git a/boards/xtensa/esp32s3/esp32s3-8048S043/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-8048S043/src/esp32s3_bringup.c
index 55abe4b8ab7..cda504a0855 100644
--- a/boards/xtensa/esp32s3/esp32s3-8048S043/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-8048S043/src/esp32s3_bringup.c
@@ -107,9 +107,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32s3_bringup(void)
diff --git a/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_bringup.c
index 7ca694114e4..417fc378ab3 100644
--- a/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_bringup.c
@@ -101,9 +101,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32s3_bringup(void)
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c
index d2c76a45aa5..7be79bcc86f 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c
@@ -178,9 +178,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32s3_bringup(void)
diff --git a/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3_bringup.c
index 892f63a6e14..6d23724802d 100644
--- a/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3_bringup.c
@@ -101,9 +101,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32s3_bringup(void)
diff --git a/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c
index a480ff47998..e565f052e66 100644
--- a/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c
@@ -134,9 +134,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32s3_bringup(void)
diff --git a/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c
index 480413c9a1c..491edae5a24 100644
--- a/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c
@@ -105,9 +105,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32s3_bringup(void)
diff --git a/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3_bringup.c
index 64397edb865..fc705366437 100644
--- a/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3_bringup.c
@@ -62,9 +62,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32s3_bringup(void)
diff --git a/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3-meadow.h b/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3-meadow.h
index 48b48407047..1d430ffc8e3 100644
--- a/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3-meadow.h
+++ b/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3-meadow.h
@@ -55,9 +55,6 @@
  * Description:
  *   Perform architecture-specific initialization
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y :
- *     Called from board_late_initialize().
- *
  ****************************************************************************/
 
 int esp32s3_bringup(void);
diff --git a/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3_bringup.c
index 58469dfcc11..91a6c98ad0f 100644
--- a/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3_bringup.c
@@ -72,9 +72,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32s3_bringup(void)
diff --git a/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/esp32s3_bringup.c
index bed1c8aa76d..4287b88da9d 100644
--- a/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/esp32s3_bringup.c
@@ -172,9 +172,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32s3_bringup(void)
diff --git a/boards/xtensa/esp32s3/esp32s3-xiao/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-xiao/src/esp32s3_bringup.c
index 75e03c7cd57..9d6fe0abecd 100644
--- a/boards/xtensa/esp32s3/esp32s3-xiao/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-xiao/src/esp32s3_bringup.c
@@ -66,9 +66,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32s3_bringup(void)
diff --git a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3_bringup.c
index 628212f2e8a..fdde2d79bf8 100644
--- a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3_bringup.c
@@ -156,9 +156,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int esp32s3_bringup(void)
diff --git a/boards/z80/ez80/makerlisp/src/ez80_bringup.c b/boards/z80/ez80/makerlisp/src/ez80_bringup.c
index 46ea929d18d..139a09c2c99 100644
--- a/boards/z80/ez80/makerlisp/src/ez80_bringup.c
+++ b/boards/z80/ez80/makerlisp/src/ez80_bringup.c
@@ -46,9 +46,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int ez80_bringup(void)
diff --git a/boards/z80/ez80/makerlisp/src/makerlisp.h b/boards/z80/ez80/makerlisp/src/makerlisp.h
index ae3fe045c54..e65d6ce6c8d 100644
--- a/boards/z80/ez80/makerlisp/src/makerlisp.h
+++ b/boards/z80/ez80/makerlisp/src/makerlisp.h
@@ -98,9 +98,6 @@ extern "C"
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int ez80_bringup(void);
diff --git a/boards/z80/ez80/z20x/src/ez80_bringup.c b/boards/z80/ez80/z20x/src/ez80_bringup.c
index 62107944a2f..96990b42afe 100644
--- a/boards/z80/ez80/z20x/src/ez80_bringup.c
+++ b/boards/z80/ez80/z20x/src/ez80_bringup.c
@@ -46,9 +46,6 @@
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int ez80_bringup(void)
diff --git a/boards/z80/ez80/z20x/src/z20x.h b/boards/z80/ez80/z20x/src/z20x.h
index 8c7c1ae83e5..396cbe3078d 100644
--- a/boards/z80/ez80/z20x/src/z20x.h
+++ b/boards/z80/ez80/z20x/src/z20x.h
@@ -178,9 +178,6 @@ extern "C"
  *   CONFIG_BOARD_LATE_INITIALIZE=y :
  *     Called from board_late_initialize().
  *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
- *     Called from the NSH library
- *
  ****************************************************************************/
 
 int ez80_bringup(void);