diff --git a/boards/arm/a1x/pcduino-a10/src/a1x_leds.c b/boards/arm/a1x/pcduino-a10/src/a1x_leds.c
index 6f3c1a645d6..e0b0e9f46be 100644
--- a/boards/arm/a1x/pcduino-a10/src/a1x_leds.c
+++ b/boards/arm/a1x/pcduino-a10/src/a1x_leds.c
@@ -217,9 +217,11 @@ void board_autoled_off(int led)
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Initialization already performed in a1x_led_initialize */
+
+  return BOARD_NLEDS;
 }
 
 void board_userled(int led, bool ledon)
diff --git a/boards/arm/am335x/beaglebone-black/src/am335x_leds.c b/boards/arm/am335x/beaglebone-black/src/am335x_leds.c
index f8aab78cb49..2f3bb346c78 100644
--- a/boards/arm/am335x/beaglebone-black/src/am335x_leds.c
+++ b/boards/arm/am335x/beaglebone-black/src/am335x_leds.c
@@ -219,9 +219,11 @@ void board_autoled_off(int led)
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Initialization already performed in am335x_led_initialize */
+
+  return BOARD_NLEDS;
 }
 
 void board_userled(int led, bool ledon)
diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_userleds.c b/boards/arm/cxd56xx/spresense/src/cxd56_userleds.c
index ffe05b3e17e..47142f0c4e4 100644
--- a/boards/arm/cxd56xx/spresense/src/cxd56_userleds.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_userleds.c
@@ -66,12 +66,13 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   cxd56_gpio_config(GPIO_LED1, false);
   cxd56_gpio_config(GPIO_LED2, false);
   cxd56_gpio_config(GPIO_LED3, false);
   cxd56_gpio_config(GPIO_LED4, false);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c
index e04da6bfe38..e9e66d1ddd1 100644
--- a/boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c
+++ b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c
@@ -175,7 +175,7 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED0-4 GPIOs for output */
 
@@ -183,6 +183,7 @@ void board_userled_initialize(void)
   efm32_configgpio(GPIO_LED1);
   efm32_configgpio(GPIO_LED2);
   efm32_configgpio(GPIO_LED3);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/efm32/efm32gg-stk3700/src/efm32_userleds.c b/boards/arm/efm32/efm32gg-stk3700/src/efm32_userleds.c
index 9847d792ab8..662d8df329d 100644
--- a/boards/arm/efm32/efm32gg-stk3700/src/efm32_userleds.c
+++ b/boards/arm/efm32/efm32gg-stk3700/src/efm32_userleds.c
@@ -74,12 +74,13 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED PIOs for output */
 
   efm32_configgpio(GPIO_LED0);
   efm32_configgpio(GPIO_LED1);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/imx6/sabre-6quad/src/imx_userleds.c b/boards/arm/imx6/sabre-6quad/src/imx_userleds.c
index 13ef31793d6..f45428b426b 100644
--- a/boards/arm/imx6/sabre-6quad/src/imx_userleds.c
+++ b/boards/arm/imx6/sabre-6quad/src/imx_userleds.c
@@ -55,11 +55,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED PIOs for output */
 
   imx_config_gpio(GPIO_LED);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_userleds.c b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_userleds.c
index ada5513eb7c..280d7723808 100644
--- a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_userleds.c
+++ b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_userleds.c
@@ -68,11 +68,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED GPIO for output */
 
   imxrt_config_gpio(GPIO_USERLED);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_userleds.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_userleds.c
index 70018898f19..0f24022ef0c 100644
--- a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_userleds.c
+++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_userleds.c
@@ -69,11 +69,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED GPIO for output */
 
   imxrt_config_gpio(GPIO_LED);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_userleds.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_userleds.c
index 6ceea974086..207859efb27 100644
--- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_userleds.c
+++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_userleds.c
@@ -69,11 +69,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED GPIO for output */
 
   imxrt_config_gpio(GPIO_LED);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_userleds.c b/boards/arm/kinetis/freedom-k28f/src/k28_userleds.c
index e890c18f24c..1e22fe61415 100644
--- a/boards/arm/kinetis/freedom-k28f/src/k28_userleds.c
+++ b/boards/arm/kinetis/freedom-k28f/src/k28_userleds.c
@@ -61,11 +61,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   kinetis_pinconfig(GPIO_LED_R);
   kinetis_pinconfig(GPIO_LED_G);
   kinetis_pinconfig(GPIO_LED_B);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/freedom-k64f/src/k64_userleds.c b/boards/arm/kinetis/freedom-k64f/src/k64_userleds.c
index 6c857af3493..e1012098f87 100644
--- a/boards/arm/kinetis/freedom-k64f/src/k64_userleds.c
+++ b/boards/arm/kinetis/freedom-k64f/src/k64_userleds.c
@@ -60,11 +60,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   kinetis_pinconfig(GPIO_LED_R);
   kinetis_pinconfig(GPIO_LED_G);
   kinetis_pinconfig(GPIO_LED_B);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_userleds.c b/boards/arm/kinetis/freedom-k66f/src/k66_userleds.c
index bab3fee78ef..b53c0ebaf45 100644
--- a/boards/arm/kinetis/freedom-k66f/src/k66_userleds.c
+++ b/boards/arm/kinetis/freedom-k66f/src/k66_userleds.c
@@ -61,11 +61,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   kinetis_pinconfig(GPIO_LED_R);
   kinetis_pinconfig(GPIO_LED_G);
   kinetis_pinconfig(GPIO_LED_B);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/teensy-3.x/src/k20_userleds.c b/boards/arm/kinetis/teensy-3.x/src/k20_userleds.c
index 0841715fcb6..a7904724e73 100644
--- a/boards/arm/kinetis/teensy-3.x/src/k20_userleds.c
+++ b/boards/arm/kinetis/teensy-3.x/src/k20_userleds.c
@@ -55,9 +55,10 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   kinetis_pinconfig(GPIO_LED);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_userleds.c
index 302d97d07c2..837b1e0ef4c 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_userleds.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_userleds.c
@@ -87,12 +87,13 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-4 GPIOs for output */
 
   lpc17_40_configgpio(GPIO_LED1);
   lpc17_40_configgpio(GPIO_LED2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_userleds.c
index 0d4dd25f648..674dd177525 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_userleds.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_userleds.c
@@ -87,7 +87,7 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-4 GPIOs for output */
 
@@ -95,6 +95,7 @@ void board_userled_initialize(void)
   lpc17_40_configgpio(GPIO_LED2);
   lpc17_40_configgpio(GPIO_LED3);
   lpc17_40_configgpio(GPIO_LED4);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_userleds.c
index 8b1c692a295..f38120b4523 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_userleds.c
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_userleds.c
@@ -86,12 +86,13 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-2 GPIOs for output */
 
   lpc17_40_configgpio(GPIO_LED1);
   lpc17_40_configgpio(GPIO_LED2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_leds.c
index d695b2b7de8..7a3e704dc83 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_leds.c
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_leds.c
@@ -87,7 +87,7 @@ static bool g_uninitialized = true;
  ****************************************************************************/
 
 #ifndef CONFIG_ARCH_LEDS
-void board_userled_initialize(void) /* Name when invoked externally */
+uint32_t board_userled_initialize(void) /* Name when invoked externally */
 #else
 void board_autoled_initialize(void) /* Name when invoked via lpc17_40_boot.c */
 #endif
@@ -100,6 +100,9 @@ void board_autoled_initialize(void) /* Name when invoked via lpc17_40_boot.c */
   lpc17_40_configgpio(LPC1766STK_LED2);
 
   led_dumpgpio("board_*led_initialize() Exit");
+#ifndef CONFIG_ARCH_LEDS
+  return BOARD_NLEDS;
+#endif
 }
 
 /****************************************************************************
diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_userleds.c
index 18500f6f4ce..d04048929c8 100644
--- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_userleds.c
+++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_userleds.c
@@ -87,7 +87,7 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-4 GPIOs for output */
 
@@ -95,6 +95,7 @@ void board_userled_initialize(void)
   lpc17_40_configgpio(GPIO_LED2);
   lpc17_40_configgpio(GPIO_LED3);
   lpc17_40_configgpio(GPIO_LED4);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c
index 6a1c4ebe123..7812f5c1838 100644
--- a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c
+++ b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c
@@ -173,9 +173,11 @@ void board_autoled_off(int led)
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* All initialization performed in board_autoled_initialize() */
+
+  return BOARD_NLEDS;
 }
 
 void board_userled(int led, bool ledon)
diff --git a/boards/arm/lpc43xx/bambino-200e/include/board.h b/boards/arm/lpc43xx/bambino-200e/include/board.h
index a2af6e0c882..2fa04cb7447 100644
--- a/boards/arm/lpc43xx/bambino-200e/include/board.h
+++ b/boards/arm/lpc43xx/bambino-200e/include/board.h
@@ -305,7 +305,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c
index 378eb706e4b..40c9389fc8e 100644
--- a/boards/arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c
+++ b/boards/arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c
@@ -83,7 +83,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_userleds.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_userleds.c
index bdd394d4a4b..01686726286 100644
--- a/boards/arm/lpc43xx/bambino-200e/src/lpc43_userleds.c
+++ b/boards/arm/lpc43xx/bambino-200e/src/lpc43_userleds.c
@@ -95,7 +95,7 @@ static void led_dumppins(FAR const char *msg)
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure all LED GPIO lines */
 
@@ -110,6 +110,7 @@ void board_userled_initialize(void)
   lpc43_gpio_config(GPIO_LED2);
 
   led_dumppins("board_userled_initialize() Exit");
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/include/board.h b/boards/arm/lpc43xx/lpc4330-xplorer/include/board.h
index 81d3e32cf94..85ba4dd8c35 100644
--- a/boards/arm/lpc43xx/lpc4330-xplorer/include/board.h
+++ b/boards/arm/lpc43xx/lpc4330-xplorer/include/board.h
@@ -292,7 +292,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c
index ef1d2ad4067..ef4d4c327ab 100644
--- a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c
+++ b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c
@@ -82,7 +82,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c
index 400d6808dcc..a0902f1d920 100644
--- a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c
+++ b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c
@@ -94,7 +94,7 @@ static void led_dumppins(FAR const char *msg)
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure all LED GPIO lines */
 
@@ -109,6 +109,7 @@ void board_userled_initialize(void)
   lpc43_gpio_config(GPIO_LED2);
 
   led_dumppins("board_userled_initialize() Exit");
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/lpc43xx/lpc4337-ws/README.txt b/boards/arm/lpc43xx/lpc4337-ws/README.txt
index c641f11b593..72604786ca5 100644
--- a/boards/arm/lpc43xx/lpc4337-ws/README.txt
+++ b/boards/arm/lpc43xx/lpc4337-ws/README.txt
@@ -339,7 +339,7 @@ LED and Pushbuttons
   control of the application.  The following interfaces are then available
   for application control of the LEDs:
 
-    void board_userled_initialize(void);
+    uint32_t board_userled_initialize(void);
     void board_userled(int led, bool ledon);
     void board_userled_all(uint8_t ledset);
 
diff --git a/boards/arm/lpc43xx/lpc4337-ws/include/board.h b/boards/arm/lpc43xx/lpc4337-ws/include/board.h
index fdb5f6ada30..e59db0c6cb0 100644
--- a/boards/arm/lpc43xx/lpc4337-ws/include/board.h
+++ b/boards/arm/lpc43xx/lpc4337-ws/include/board.h
@@ -275,7 +275,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
diff --git a/boards/arm/lpc43xx/lpc4357-evb/README.txt b/boards/arm/lpc43xx/lpc4357-evb/README.txt
index 4778ad9a55e..33d8653c850 100644
--- a/boards/arm/lpc43xx/lpc4357-evb/README.txt
+++ b/boards/arm/lpc43xx/lpc4357-evb/README.txt
@@ -336,7 +336,7 @@ LED and Pushbuttons
   control of the application.  The following interfaces are then available
   for application control of the LEDs:
 
-    void board_userled_initialize(void);
+    uint32_t board_userled_initialize(void);
     void board_userled(int led, bool ledon);
     void board_userled_all(uint8_t ledset);
 
diff --git a/boards/arm/lpc43xx/lpc4357-evb/include/board.h b/boards/arm/lpc43xx/lpc4357-evb/include/board.h
index 4f5f8be3bc3..97d78612b9f 100644
--- a/boards/arm/lpc43xx/lpc4357-evb/include/board.h
+++ b/boards/arm/lpc43xx/lpc4357-evb/include/board.h
@@ -247,7 +247,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
diff --git a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c
index 8346ae35c67..208b6bafa9b 100644
--- a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c
+++ b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c
@@ -74,7 +74,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
@@ -105,7 +105,7 @@ static void led_dumppins(FAR const char *msg)
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED pin as a GPIO outputs */
 
@@ -117,6 +117,7 @@ void board_userled_initialize(void)
   lpc43_gpio_config(GPIO_LED);
 
   led_dumppins("board_userled_initialize() Exit");
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/lpc43xx/lpc4370-link2/README.txt b/boards/arm/lpc43xx/lpc4370-link2/README.txt
index 23df05f143f..9e1b2ca1d26 100644
--- a/boards/arm/lpc43xx/lpc4370-link2/README.txt
+++ b/boards/arm/lpc43xx/lpc4370-link2/README.txt
@@ -339,7 +339,7 @@ LED and Pushbuttons
   control of the application.  The following interfaces are then available
   for application control of the LEDs:
 
-    void board_userled_initialize(void);
+    uint32_t board_userled_initialize(void);
     void board_userled(int led, bool ledon);
     void board_userled_all(uint8_t ledset);
 
diff --git a/boards/arm/lpc43xx/lpc4370-link2/include/board.h b/boards/arm/lpc43xx/lpc4370-link2/include/board.h
index ef6dfadb2e9..0eabf5a3491 100644
--- a/boards/arm/lpc43xx/lpc4370-link2/include/board.h
+++ b/boards/arm/lpc43xx/lpc4370-link2/include/board.h
@@ -270,7 +270,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c
index 2f3417379b6..eb332e05ec4 100644
--- a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c
+++ b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c
@@ -79,7 +79,7 @@ static void led_dumppins(FAR const char *msg)
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED pin as a GPIO outputs */
 
@@ -91,6 +91,7 @@ void board_userled_initialize(void)
   lpc43_gpio_config(GPIO_LED);
 
   led_dumppins("board_userled_initialize() Exit");
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_userleds.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_userleds.c
index 67017ea4099..510e26ae994 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_userleds.c
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_userleds.c
@@ -62,7 +62,7 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
 #ifndef CONFIG_ARCH_LEDS
   /* Configure LED GPIOs for output */
@@ -71,6 +71,7 @@ void board_userled_initialize(void)
   lpc54_gpio_config(GPIO_LED_D11);
   lpc54_gpio_config(GPIO_LED_D12);
 #endif
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/max326xx/max32660-evsys/src/max326_userleds.c b/boards/arm/max326xx/max32660-evsys/src/max326_userleds.c
index e61461eec3c..a71fd29c526 100644
--- a/boards/arm/max326xx/max32660-evsys/src/max326_userleds.c
+++ b/boards/arm/max326xx/max32660-evsys/src/max326_userleds.c
@@ -56,11 +56,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED PIOs for output */
 
   max326_gpio_config(GPIO_LED);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/nrf52/nrf52-feather/README.txt b/boards/arm/nrf52/nrf52-feather/README.txt
index eac93fec65c..904ca4ebe8f 100644
--- a/boards/arm/nrf52/nrf52-feather/README.txt
+++ b/boards/arm/nrf52/nrf52-feather/README.txt
@@ -91,6 +91,6 @@ Where <subdir> is one of the following:
   control of the application.  The following interfaces are then available
   for application control of the LEDs:
 
-    void board_userled_initialize(void);
+    uint32_t board_userled_initialize(void);
     void board_userled(int led, bool ledon);
     void board_userled_all(uint8_t ledset);
diff --git a/boards/arm/nrf52/nrf52-feather/include/board.h b/boards/arm/nrf52/nrf52-feather/include/board.h
index 06c88d1fca6..4a7837af5c6 100644
--- a/boards/arm/nrf52/nrf52-feather/include/board.h
+++ b/boards/arm/nrf52/nrf52-feather/include/board.h
@@ -88,7 +88,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
diff --git a/boards/arm/nrf52/nrf52-feather/src/nrf52_userleds.c b/boards/arm/nrf52/nrf52-feather/src/nrf52_userleds.c
index fd20514c4c7..351d7bb5332 100644
--- a/boards/arm/nrf52/nrf52-feather/src/nrf52_userleds.c
+++ b/boards/arm/nrf52/nrf52-feather/src/nrf52_userleds.c
@@ -63,7 +63,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
@@ -109,7 +109,7 @@ static void led_dumppins(FAR const char *msg)
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   int i;
 
@@ -125,6 +125,7 @@ void board_userled_initialize(void)
     }
 
   led_dumppins("board_userled_initialize() Exit");
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/nrf52/nrf52832-dk/README.txt b/boards/arm/nrf52/nrf52832-dk/README.txt
index 38fc4d455a1..b166a9b9bf7 100644
--- a/boards/arm/nrf52/nrf52832-dk/README.txt
+++ b/boards/arm/nrf52/nrf52832-dk/README.txt
@@ -102,6 +102,6 @@ Where <subdir> is one of the following:
   control of the application.  The following interfaces are then available
   for application control of the LEDs:
 
-    void board_userled_initialize(void);
+    uint32_t board_userled_initialize(void);
     void board_userled(int led, bool ledon);
     void board_userled_all(uint8_t ledset);
diff --git a/boards/arm/nrf52/nrf52832-dk/include/board.h b/boards/arm/nrf52/nrf52832-dk/include/board.h
index cb51a94a73c..f7fb5677ae2 100644
--- a/boards/arm/nrf52/nrf52832-dk/include/board.h
+++ b/boards/arm/nrf52/nrf52832-dk/include/board.h
@@ -92,7 +92,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52_userleds.c b/boards/arm/nrf52/nrf52832-dk/src/nrf52_userleds.c
index 8ec3564a5af..6b0e1fa1cab 100644
--- a/boards/arm/nrf52/nrf52832-dk/src/nrf52_userleds.c
+++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52_userleds.c
@@ -63,7 +63,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
@@ -115,7 +115,7 @@ static void led_dumppins(FAR const char *msg)
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   int i;
 
@@ -131,6 +131,7 @@ void board_userled_initialize(void)
     }
 
   led_dumppins("board_userled_initialize() Exit");
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/nrf52/nrf52840-dk/include/board.h b/boards/arm/nrf52/nrf52840-dk/include/board.h
index c873dfecd72..425d93b6b2a 100644
--- a/boards/arm/nrf52/nrf52840-dk/include/board.h
+++ b/boards/arm/nrf52/nrf52840-dk/include/board.h
@@ -92,7 +92,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_userleds.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_userleds.c
index e3a7d866fb6..68e0fa8f8ae 100644
--- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_userleds.c
+++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_userleds.c
@@ -63,7 +63,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
@@ -115,7 +115,7 @@ static void led_dumppins(FAR const char *msg)
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   int i;
 
@@ -131,6 +131,7 @@ void board_userled_initialize(void)
     }
 
   led_dumppins("board_userled_initialize() Exit");
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/nrf52/nrf52840-dongle/include/board.h b/boards/arm/nrf52/nrf52840-dongle/include/board.h
index b31fdc005d1..5c22d7f9473 100644
--- a/boards/arm/nrf52/nrf52840-dongle/include/board.h
+++ b/boards/arm/nrf52/nrf52840-dongle/include/board.h
@@ -86,7 +86,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
diff --git a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_userleds.c b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_userleds.c
index 457a96ca104..0d319a5f0b9 100644
--- a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_userleds.c
+++ b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_userleds.c
@@ -63,7 +63,7 @@
  * control of the application.  The following interfaces are then available
  * for application control of the LEDs:
  *
- *  void board_userled_initialize(void);
+ *  uint32_t board_userled_initialize(void);
  *  void board_userled(int led, bool ledon);
  *  void board_userled_all(uint8_t ledset);
  */
@@ -115,7 +115,7 @@ static void led_dumppins(FAR const char *msg)
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   int i;
 
@@ -131,6 +131,7 @@ void board_userled_initialize(void)
     }
 
   led_dumppins("board_userled_initialize() Exit");
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_userleds.c b/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_userleds.c
index a866a0afdd4..f9702021b20 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_userleds.c
+++ b/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_userleds.c
@@ -63,13 +63,14 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED GPIOs for output */
 
   s32k1xx_pinconfig(GPIO_LED_R);
   s32k1xx_pinconfig(GPIO_LED_G);
   s32k1xx_pinconfig(GPIO_LED_B);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c b/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c
index 1f0a425ab3e..f871a37efcf 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c
+++ b/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c
@@ -63,13 +63,14 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED GPIOs for output */
 
   s32k1xx_pinconfig(GPIO_LED_R);
   s32k1xx_pinconfig(GPIO_LED_G);
   s32k1xx_pinconfig(GPIO_LED_B);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_userleds.c b/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_userleds.c
index ee4b752e462..19da03c0729 100644
--- a/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_userleds.c
+++ b/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_userleds.c
@@ -63,13 +63,14 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED GPIOs for output */
 
   s32k1xx_pinconfig(GPIO_LED_R);
   s32k1xx_pinconfig(GPIO_LED_G);
   s32k1xx_pinconfig(GPIO_LED_B);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_userleds.c b/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_userleds.c
index a0b630015bd..760130aa35f 100644
--- a/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_userleds.c
+++ b/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_userleds.c
@@ -63,13 +63,14 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED GPIOs for output */
 
   s32k1xx_pinconfig(GPIO_LED_R);
   s32k1xx_pinconfig(GPIO_LED_G);
   s32k1xx_pinconfig(GPIO_LED_B);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_userleds.c b/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_userleds.c
index ea853a27411..25f931902d2 100644
--- a/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_userleds.c
+++ b/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_userleds.c
@@ -63,13 +63,14 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED GPIOs for output */
 
   s32k1xx_pinconfig(GPIO_LED_R);
   s32k1xx_pinconfig(GPIO_LED_G);
   s32k1xx_pinconfig(GPIO_LED_B);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_userleds.c b/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_userleds.c
index 2bc0101e1a2..26cc6c4e71f 100644
--- a/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_userleds.c
+++ b/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_userleds.c
@@ -63,13 +63,14 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED GPIOs for output */
 
   s32k1xx_pinconfig(GPIO_LED_R);
   s32k1xx_pinconfig(GPIO_LED_G);
   s32k1xx_pinconfig(GPIO_LED_B);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/sam34/arduino-due/src/sam_userleds.c b/boards/arm/sam34/arduino-due/src/sam_userleds.c
index f9cee77eaef..90ec5622ed1 100644
--- a/boards/arm/sam34/arduino-due/src/sam_userleds.c
+++ b/boards/arm/sam34/arduino-due/src/sam_userleds.c
@@ -59,13 +59,14 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-2 GPIOs for output */
 
   sam_configgpio(GPIO_LED_L);
   sam_configgpio(GPIO_LED_RX);
   sam_configgpio(GPIO_LED_TX);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/sam34/flipnclick-sam3x/src/sam_userleds.c b/boards/arm/sam34/flipnclick-sam3x/src/sam_userleds.c
index af852d4eb7a..aca62e62aac 100644
--- a/boards/arm/sam34/flipnclick-sam3x/src/sam_userleds.c
+++ b/boards/arm/sam34/flipnclick-sam3x/src/sam_userleds.c
@@ -74,7 +74,7 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
 #ifndef CONFIG_ARCH_LEDS
   /* Configure LED GPIOs for output */
@@ -85,6 +85,7 @@ void board_userled_initialize(void)
   sam_configgpio(GPIO_LED_C);
   sam_configgpio(GPIO_LED_D);
 #endif
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/sam34/sam4l-xplained/src/sam_userleds.c b/boards/arm/sam34/sam4l-xplained/src/sam_userleds.c
index f38d9a6eef5..6c28190d5e4 100644
--- a/boards/arm/sam34/sam4l-xplained/src/sam_userleds.c
+++ b/boards/arm/sam34/sam4l-xplained/src/sam_userleds.c
@@ -77,9 +77,10 @@
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   sam_configgpio(GPIO_LED0);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/sam_userleds.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_userleds.c
index 0e8d013b4d0..1da8e97dc0b 100644
--- a/boards/arm/sam34/sam4s-xplained-pro/src/sam_userleds.c
+++ b/boards/arm/sam34/sam4s-xplained-pro/src/sam_userleds.c
@@ -60,11 +60,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure D301 GPIO for output */
 
   sam_configgpio(GPIO_D301);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/sam34/sam4s-xplained/src/sam_userleds.c b/boards/arm/sam34/sam4s-xplained/src/sam_userleds.c
index ebf95fa8463..dbbb99ab1ae 100644
--- a/boards/arm/sam34/sam4s-xplained/src/sam_userleds.c
+++ b/boards/arm/sam34/sam4s-xplained/src/sam_userleds.c
@@ -59,12 +59,13 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure D9-2 GPIOs for output */
 
   sam_configgpio(GPIO_D9);
   sam_configgpio(GPIO_D10);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_userleds.c b/boards/arm/sama5/sama5d2-xult/src/sam_userleds.c
index 8da36928c1f..9732022d076 100644
--- a/boards/arm/sama5/sama5d2-xult/src/sam_userleds.c
+++ b/boards/arm/sama5/sama5d2-xult/src/sam_userleds.c
@@ -55,7 +55,7 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED PIOs for output */
 
@@ -63,6 +63,7 @@ void board_userled_initialize(void)
   sam_configpio(PIO_LED_GREEN);
 #endif
   sam_configpio(PIO_LED_BLUE);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_userleds.c b/boards/arm/sama5/sama5d3-xplained/src/sam_userleds.c
index 7b0d14258fc..10d0107b87f 100644
--- a/boards/arm/sama5/sama5d3-xplained/src/sam_userleds.c
+++ b/boards/arm/sama5/sama5d3-xplained/src/sam_userleds.c
@@ -71,12 +71,13 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED PIOs for output */
 
   sam_configpio(PIO_BLUE);
   sam_configpio(PIO_RED);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_userleds.c b/boards/arm/sama5/sama5d3x-ek/src/sam_userleds.c
index 533233643d3..7ac36316836 100644
--- a/boards/arm/sama5/sama5d3x-ek/src/sam_userleds.c
+++ b/boards/arm/sama5/sama5d3x-ek/src/sam_userleds.c
@@ -71,7 +71,7 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED PIOs for output */
 
@@ -79,6 +79,7 @@ void board_userled_initialize(void)
 #ifndef CONFIG_SAMA5D3xEK_NOREDLED
   sam_configpio(PIO_RED);
 #endif
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_userleds.c b/boards/arm/sama5/sama5d4-ek/src/sam_userleds.c
index ae5e4d1a101..2a1e3e874c2 100644
--- a/boards/arm/sama5/sama5d4-ek/src/sam_userleds.c
+++ b/boards/arm/sama5/sama5d4-ek/src/sam_userleds.c
@@ -78,12 +78,13 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED PIOs for output */
 
   sam_configpio(PIO_LED_USER);
   sam_configpio(PIO_LED_POWER);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/samd2l2/arduino-m0/src/sam_userleds.c b/boards/arm/samd2l2/arduino-m0/src/sam_userleds.c
index 7cae4a3bd35..c208c6db54c 100644
--- a/boards/arm/samd2l2/arduino-m0/src/sam_userleds.c
+++ b/boards/arm/samd2l2/arduino-m0/src/sam_userleds.c
@@ -75,9 +75,10 @@
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   sam_configport(PORT_STATUS_LED);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/samd2l2/samd20-xplained/src/sam_userleds.c b/boards/arm/samd2l2/samd20-xplained/src/sam_userleds.c
index 409095ad297..5e4eb3f1fd4 100644
--- a/boards/arm/samd2l2/samd20-xplained/src/sam_userleds.c
+++ b/boards/arm/samd2l2/samd20-xplained/src/sam_userleds.c
@@ -78,9 +78,10 @@
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   sam_configport(PORT_STATUS_LED);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/samd2l2/samd21-xplained/src/sam_userleds.c b/boards/arm/samd2l2/samd21-xplained/src/sam_userleds.c
index 7429bb4e2eb..3a110451dce 100644
--- a/boards/arm/samd2l2/samd21-xplained/src/sam_userleds.c
+++ b/boards/arm/samd2l2/samd21-xplained/src/sam_userleds.c
@@ -78,9 +78,10 @@
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   sam_configport(PORT_STATUS_LED);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/samd2l2/saml21-xplained/src/sam_userleds.c b/boards/arm/samd2l2/saml21-xplained/src/sam_userleds.c
index d12608384d7..98c0c0b15a0 100644
--- a/boards/arm/samd2l2/saml21-xplained/src/sam_userleds.c
+++ b/boards/arm/samd2l2/saml21-xplained/src/sam_userleds.c
@@ -78,9 +78,10 @@
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   sam_configport(PORT_STATUS_LED);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/samd5e5/metro-m4/src/sam_userleds.c b/boards/arm/samd5e5/metro-m4/src/sam_userleds.c
index 96050ca0d0a..87ffdbe6642 100644
--- a/boards/arm/samd5e5/metro-m4/src/sam_userleds.c
+++ b/boards/arm/samd5e5/metro-m4/src/sam_userleds.c
@@ -182,9 +182,10 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   sam_portconfig(PORT_STATUS_LED);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/samd5e5/same54-xplained-pro/src/sam_userleds.c b/boards/arm/samd5e5/same54-xplained-pro/src/sam_userleds.c
index 3b956b6d1d5..383bc6eb8c8 100644
--- a/boards/arm/samd5e5/same54-xplained-pro/src/sam_userleds.c
+++ b/boards/arm/samd5e5/same54-xplained-pro/src/sam_userleds.c
@@ -179,9 +179,10 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
-  (void)sam_portconfig(PORT_STATUS_LED);
+  sam_portconfig(PORT_STATUS_LED);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/samv7/same70-xplained/src/sam_userleds.c b/boards/arm/samv7/same70-xplained/src/sam_userleds.c
index ca9e18327bf..d677665de4a 100644
--- a/boards/arm/samv7/same70-xplained/src/sam_userleds.c
+++ b/boards/arm/samv7/same70-xplained/src/sam_userleds.c
@@ -64,11 +64,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED PIOs for output */
 
   sam_configgpio(GPIO_LED0);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/samv7/samv71-xult/src/sam_userleds.c b/boards/arm/samv7/samv71-xult/src/sam_userleds.c
index d631a20a80a..7fd6304125f 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_userleds.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_userleds.c
@@ -64,12 +64,13 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED GPIOs for output */
 
   sam_configgpio(GPIO_LED0);
   sam_configgpio(GPIO_LED1);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/axoloti/src/stm32_userleds.c b/boards/arm/stm32/axoloti/src/stm32_userleds.c
index c27d5617834..0c8f29dec7e 100644
--- a/boards/arm/stm32/axoloti/src/stm32_userleds.c
+++ b/boards/arm/stm32/axoloti/src/stm32_userleds.c
@@ -75,12 +75,13 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-2 GPIOs for output */
 
   stm32_configgpio(GPIO_LED1);
   stm32_configgpio(GPIO_LED2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/b-g474e-dpow1/src/stm32_userleds.c b/boards/arm/stm32/b-g474e-dpow1/src/stm32_userleds.c
index 2e4d40b6d5a..697eabd5f41 100644
--- a/boards/arm/stm32/b-g474e-dpow1/src/stm32_userleds.c
+++ b/boards/arm/stm32/b-g474e-dpow1/src/stm32_userleds.c
@@ -48,7 +48,7 @@
  *   defined.
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED GPIOs for output */
 
@@ -56,6 +56,7 @@ void board_userled_initialize(void)
   stm32_configgpio(GPIO_LED2);
   stm32_configgpio(GPIO_LED3);
   stm32_configgpio(GPIO_LED4);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/clicker2-stm32/src/stm32_userleds.c b/boards/arm/stm32/clicker2-stm32/src/stm32_userleds.c
index 49abd6e0acb..db2857c57cf 100644
--- a/boards/arm/stm32/clicker2-stm32/src/stm32_userleds.c
+++ b/boards/arm/stm32/clicker2-stm32/src/stm32_userleds.c
@@ -52,12 +52,13 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-2 GPIOs for output */
 
   stm32_configgpio(GPIO_LED1);
   stm32_configgpio(GPIO_LED2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/cloudctrl/src/stm32_userleds.c b/boards/arm/stm32/cloudctrl/src/stm32_userleds.c
index 881c86c966c..d43c703bbbb 100644
--- a/boards/arm/stm32/cloudctrl/src/stm32_userleds.c
+++ b/boards/arm/stm32/cloudctrl/src/stm32_userleds.c
@@ -72,7 +72,7 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
    /* Configure LED1-3 GPIOs for output */
 
@@ -80,6 +80,7 @@ void board_userled_initialize(void)
    stm32_configgpio(GPIO_LED2);
    stm32_configgpio(GPIO_LED3);
    stm32_configgpio(GPIO_LED4);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c b/boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c
index dc71267c765..abfaf7b0857 100644
--- a/boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c
+++ b/boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c
@@ -71,13 +71,14 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
    /* Configure LED1-4 GPIOs for output */
 
    stm32_configgpio(GPIO_LED1);
    stm32_configgpio(GPIO_LED2);
    stm32_configgpio(GPIO_LED3);
+  return 3;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f103rb/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f103rb/src/stm32_userleds.c
index 4558ed3f9cc..df1c51f9e7d 100644
--- a/boards/arm/stm32/nucleo-f103rb/src/stm32_userleds.c
+++ b/boards/arm/stm32/nucleo-f103rb/src/stm32_userleds.c
@@ -58,11 +58,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1 GPIO for output */
 
   stm32_configgpio(GPIO_LED1);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f207zg/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_userleds.c
index d6b3228a554..4caa275ec2c 100644
--- a/boards/arm/stm32/nucleo-f207zg/src/stm32_userleds.c
+++ b/boards/arm/stm32/nucleo-f207zg/src/stm32_userleds.c
@@ -86,7 +86,7 @@ static const uint32_t g_ledcfg[BOARD_NLEDS] =
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   int i;
 
@@ -96,6 +96,8 @@ void board_userled_initialize(void)
     {
       stm32_configgpio(g_ledcfg[i]);
     }
+
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f302r8/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_userleds.c
index 3ab8287c08f..e3f38a8ed45 100644
--- a/boards/arm/stm32/nucleo-f302r8/src/stm32_userleds.c
+++ b/boards/arm/stm32/nucleo-f302r8/src/stm32_userleds.c
@@ -58,11 +58,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1 GPIO for output */
 
   stm32_configgpio(GPIO_LED1);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f303re/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f303re/src/stm32_userleds.c
index 1137d860897..f250416260d 100644
--- a/boards/arm/stm32/nucleo-f303re/src/stm32_userleds.c
+++ b/boards/arm/stm32/nucleo-f303re/src/stm32_userleds.c
@@ -60,11 +60,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1 GPIO for output */
 
   stm32_configgpio(GPIO_LED1);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f303ze/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f303ze/src/stm32_userleds.c
index d5334ff5fe1..f5bf3cb6fc7 100644
--- a/boards/arm/stm32/nucleo-f303ze/src/stm32_userleds.c
+++ b/boards/arm/stm32/nucleo-f303ze/src/stm32_userleds.c
@@ -86,7 +86,7 @@ static const uint32_t g_ledcfg[BOARD_NLEDS] =
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   int i;
 
@@ -96,6 +96,8 @@ void board_userled_initialize(void)
     {
       stm32_configgpio(g_ledcfg[i]);
     }
+
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f410rb/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_userleds.c
index c0df9778d52..bf23b08bf84 100644
--- a/boards/arm/stm32/nucleo-f410rb/src/stm32_userleds.c
+++ b/boards/arm/stm32/nucleo-f410rb/src/stm32_userleds.c
@@ -168,11 +168,12 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LD2 GPIO for output */
 
   stm32_configgpio(GPIO_LD2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f429zi/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f429zi/src/stm32_userleds.c
index 0d5acd2ba5d..4ea1a5bce7a 100644
--- a/boards/arm/stm32/nucleo-f429zi/src/stm32_userleds.c
+++ b/boards/arm/stm32/nucleo-f429zi/src/stm32_userleds.c
@@ -71,7 +71,7 @@ static const uint32_t g_ledcfg[BOARD_NLEDS] =
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   int i;
 
@@ -81,6 +81,8 @@ void board_userled_initialize(void)
     {
       stm32_configgpio(g_ledcfg[i]);
     }
+
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f446re/src/stm32_userleds.c
index 80019cefc50..a3a510c4013 100644
--- a/boards/arm/stm32/nucleo-f446re/src/stm32_userleds.c
+++ b/boards/arm/stm32/nucleo-f446re/src/stm32_userleds.c
@@ -168,11 +168,12 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LD2 GPIO for output */
 
   stm32_configgpio(GPIO_LD2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c
index c18c51d3b3e..ad7bbfe4f3c 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c
@@ -169,11 +169,12 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LD2 GPIO for output */
 
   stm32_configgpio(GPIO_LD2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-l152re/src/stm32_userleds.c b/boards/arm/stm32/nucleo-l152re/src/stm32_userleds.c
index 2944b50e49a..af2611a24a1 100644
--- a/boards/arm/stm32/nucleo-l152re/src/stm32_userleds.c
+++ b/boards/arm/stm32/nucleo-l152re/src/stm32_userleds.c
@@ -58,11 +58,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1 GPIO for output */
 
   stm32_configgpio(GPIO_LED1);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_userleds.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_userleds.c
index 4528255aae5..b74fbe6c8e7 100644
--- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_userleds.c
+++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_userleds.c
@@ -75,11 +75,12 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
    /* Configure LED1-4 GPIOs for output */
 
    stm32_configgpio(GPIO_LED_STATUS);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/olimex-stm32-h405/src/stm32_userleds.c b/boards/arm/stm32/olimex-stm32-h405/src/stm32_userleds.c
index bc8252e30d8..de10bfb2be7 100644
--- a/boards/arm/stm32/olimex-stm32-h405/src/stm32_userleds.c
+++ b/boards/arm/stm32/olimex-stm32-h405/src/stm32_userleds.c
@@ -66,11 +66,12 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
    /* Configure LED1-4 GPIOs for output */
 
    stm32_configgpio(GPIO_LED_STATUS);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/olimex-stm32-h407/src/stm32_userleds.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_userleds.c
index 80832074be4..ff318afadc3 100644
--- a/boards/arm/stm32/olimex-stm32-h407/src/stm32_userleds.c
+++ b/boards/arm/stm32/olimex-stm32-h407/src/stm32_userleds.c
@@ -71,11 +71,12 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
    /* Configure LED1-4 GPIOs for output */
 
    stm32_configgpio(GPIO_LED_STATUS);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/olimex-stm32-p207/src/stm32_userleds.c b/boards/arm/stm32/olimex-stm32-p207/src/stm32_userleds.c
index 4a9c95536c5..1aa388462f0 100644
--- a/boards/arm/stm32/olimex-stm32-p207/src/stm32_userleds.c
+++ b/boards/arm/stm32/olimex-stm32-p207/src/stm32_userleds.c
@@ -78,7 +78,7 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
    /* Configure LED1-4 GPIOs for output */
 
@@ -86,6 +86,7 @@ void board_userled_initialize(void)
    stm32_configgpio(GPIO_LED2);
    stm32_configgpio(GPIO_LED3);
    stm32_configgpio(GPIO_LED4);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/olimex-stm32-p407/src/stm32_userleds.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_userleds.c
index 9a30afcc997..171e06d3909 100644
--- a/boards/arm/stm32/olimex-stm32-p407/src/stm32_userleds.c
+++ b/boards/arm/stm32/olimex-stm32-p407/src/stm32_userleds.c
@@ -78,7 +78,7 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
    /* Configure LED1-4 GPIOs for output */
 
@@ -86,6 +86,7 @@ void board_userled_initialize(void)
    stm32_configgpio(GPIO_LED2);
    stm32_configgpio(GPIO_LED3);
    stm32_configgpio(GPIO_LED4);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/olimexino-stm32/src/olimexino-stm32.h b/boards/arm/stm32/olimexino-stm32/src/olimexino-stm32.h
index b1518ed3103..8a079ecfb3e 100644
--- a/boards/arm/stm32/olimexino-stm32/src/olimexino-stm32.h
+++ b/boards/arm/stm32/olimexino-stm32/src/olimexino-stm32.h
@@ -197,7 +197,7 @@ void stm32_usb_set_pwr_callback(xcpt_t pwr_changed_handler);
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_LEDS
-void stm32_led_initialize(void);
+uint32_t stm32_led_initialize(void);
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32/olimexino-stm32/src/stm32_leds.c b/boards/arm/stm32/olimexino-stm32/src/stm32_leds.c
index 6e5a66c7ab5..f7dae108338 100644
--- a/boards/arm/stm32/olimexino-stm32/src/stm32_leds.c
+++ b/boards/arm/stm32/olimexino-stm32/src/stm32_leds.c
@@ -83,9 +83,9 @@ static bool g_initialized = false;
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_LEDS
-void stm32_led_initialize(void)
+uint32_t stm32_led_initialize(void)
 #else
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 #endif
 {
   /* Configure all LED GPIO lines */
@@ -96,6 +96,7 @@ void board_userled_initialize(void)
   stm32_configgpio(GPIO_LED_GREEN);
 
   led_dumpgpio("board_*led_initialize() Exit");
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/omnibusf4/src/stm32_userleds.c b/boards/arm/stm32/omnibusf4/src/stm32_userleds.c
index 287283da760..facd13f2271 100644
--- a/boards/arm/stm32/omnibusf4/src/stm32_userleds.c
+++ b/boards/arm/stm32/omnibusf4/src/stm32_userleds.c
@@ -184,12 +184,14 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   for (unsigned wled = 0; wled < BOARD_NLEDS; wled++)
     {
       stm32_configgpio(g_ledcfg[wled]);
     }
+
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/photon/src/stm32_userleds.c b/boards/arm/stm32/photon/src/stm32_userleds.c
index 775bddc7b69..6c0bbce19cb 100644
--- a/boards/arm/stm32/photon/src/stm32_userleds.c
+++ b/boards/arm/stm32/photon/src/stm32_userleds.c
@@ -55,11 +55,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure Photon LED gpio as output */
 
   stm32_configgpio(GPIO_LED1);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/shenzhou/src/stm32_userleds.c b/boards/arm/stm32/shenzhou/src/stm32_userleds.c
index fe89975fcf4..97a4ea84588 100644
--- a/boards/arm/stm32/shenzhou/src/stm32_userleds.c
+++ b/boards/arm/stm32/shenzhou/src/stm32_userleds.c
@@ -71,7 +71,7 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-4 GPIOs for output */
 
@@ -79,6 +79,7 @@ void board_userled_initialize(void)
   stm32_configgpio(GPIO_LED2);
   stm32_configgpio(GPIO_LED3);
   stm32_configgpio(GPIO_LED4);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_userleds.c b/boards/arm/stm32/stm3220g-eval/src/stm32_userleds.c
index ba7f0b9abbe..63f83afd116 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_userleds.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_userleds.c
@@ -71,7 +71,7 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-4 GPIOs for output */
 
@@ -79,6 +79,7 @@ void board_userled_initialize(void)
   stm32_configgpio(GPIO_LED2);
   stm32_configgpio(GPIO_LED3);
   stm32_configgpio(GPIO_LED4);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_userleds.c b/boards/arm/stm32/stm3240g-eval/src/stm32_userleds.c
index 39d2ab9ef98..df629be4789 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_userleds.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_userleds.c
@@ -71,7 +71,7 @@ static uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-4 GPIOs for output */
 
@@ -79,6 +79,7 @@ void board_userled_initialize(void)
   stm32_configgpio(GPIO_LED2);
   stm32_configgpio(GPIO_LED3);
   stm32_configgpio(GPIO_LED4);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm32butterfly2/src/stm32_leds.c b/boards/arm/stm32/stm32butterfly2/src/stm32_leds.c
index dd3059425c4..02a5cfc04cd 100644
--- a/boards/arm/stm32/stm32butterfly2/src/stm32_leds.c
+++ b/boards/arm/stm32/stm32butterfly2/src/stm32_leds.c
@@ -214,9 +214,11 @@ void board_autoled_off(int led)
  *   this function is empty.
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Already initialized by stm32_led_initialize. */
+
+  return BOARD_NLEDS;
 }
 
 /*****************************************************************************
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_userleds.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_userleds.c
index 51eab241e10..29ea278ff3e 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_userleds.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_userleds.c
@@ -69,7 +69,7 @@ static const uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   int i;
 
@@ -79,6 +79,8 @@ void board_userled_initialize(void)
     {
       stm32_configgpio(g_ledcfg[i]);
     }
+
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32_userleds.c b/boards/arm/stm32/stm32f3discovery/src/stm32_userleds.c
index 4f427a8f0ca..06ca5322bc7 100644
--- a/boards/arm/stm32/stm32f3discovery/src/stm32_userleds.c
+++ b/boards/arm/stm32/stm32f3discovery/src/stm32_userleds.c
@@ -70,7 +70,7 @@ static const uint32_t g_ledcfg[BOARD_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   int i;
 
@@ -80,6 +80,8 @@ void board_userled_initialize(void)
     {
       stm32_configgpio(g_ledcfg[i]);
     }
+
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_userleds.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_userleds.c
index 429c6cc85a4..202bc190a8b 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_userleds.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_userleds.c
@@ -179,12 +179,13 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
    /* Configure LED1-4 GPIOs for output */
 
    stm32_configgpio(GPIO_LED1);
    stm32_configgpio(GPIO_LED2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_userleds.c b/boards/arm/stm32/stm32f4discovery/src/stm32_userleds.c
index cf01fea42b0..bf75046c3a0 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_userleds.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_userleds.c
@@ -181,7 +181,7 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
    /* Configure LED1-4 GPIOs for output */
 
@@ -189,6 +189,7 @@ void board_userled_initialize(void)
    stm32_configgpio(GPIO_LED2);
    stm32_configgpio(GPIO_LED3);
    stm32_configgpio(GPIO_LED4);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_userleds.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_userleds.c
index 71bc164d960..d2d5d0ea852 100644
--- a/boards/arm/stm32/stm32ldiscovery/src/stm32_userleds.c
+++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_userleds.c
@@ -59,12 +59,13 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-2 GPIOs for output */
 
   stm32_configgpio(GPIO_LED1);
   stm32_configgpio(GPIO_LED2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_leds.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_leds.c
index 1ec79ee0d8a..7dbb1dd4902 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_leds.c
+++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_leds.c
@@ -244,9 +244,11 @@ void board_autoled_off(int led)
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Already initialized by stm32_led_initialize */
+
+  return BOARD_NLEDS;
 }
 
 void board_userled(int led, bool ledon)
diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c
index 985cbcc6b4c..7e1162f1b29 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c
+++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c
@@ -168,11 +168,12 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LD2 GPIO for output */
 
   stm32_configgpio(GPIO_LD2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c
index 1f0c656a0ee..efca09f70ca 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c
@@ -168,11 +168,12 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LD2 GPIO for output */
 
   stm32_configgpio(GPIO_LD2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_userleds.c b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_userleds.c
index a6fd1e0e1e0..36c751f1a00 100644
--- a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_userleds.c
+++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_userleds.c
@@ -60,12 +60,13 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-2 GPIOs for output */
 
   stm32_configgpio(GPIO_LED1);
   stm32_configgpio(GPIO_LED2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_userleds.c b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_userleds.c
index af916c41990..9704ae3b7a5 100644
--- a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_userleds.c
+++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_userleds.c
@@ -60,7 +60,7 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-2 GPIOs for output */
 
@@ -68,6 +68,7 @@ void board_userled_initialize(void)
   stm32_configgpio(GPIO_LED2);
   stm32_configgpio(GPIO_LED3);
   stm32_configgpio(GPIO_LED4);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c b/boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c
index 9968f3cdd55..abd60ab090b 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c
+++ b/boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c
@@ -88,7 +88,7 @@ static const uint32_t g_ledcfg[BOARD_NLEDS] =
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   int i;
 
@@ -98,6 +98,8 @@ void board_userled_initialize(void)
     {
       stm32_configgpio(g_ledcfg[i]);
     }
+
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_userleds.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_userleds.c
index 961cff29ce2..e93d22d742a 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_userleds.c
+++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_userleds.c
@@ -62,9 +62,10 @@
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   stm32_configgpio(GPIO_LD1);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_userleds.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_userleds.c
index 92fc9770ab9..1cbd137c824 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_userleds.c
+++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_userleds.c
@@ -62,9 +62,10 @@
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   stm32_configgpio(GPIO_LD3);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_userleds.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_userleds.c
index cb49d792a24..d6db8b6b6ca 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_userleds.c
+++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_userleds.c
@@ -86,7 +86,7 @@ static const uint32_t g_ledcfg[BOARD_NLEDS] =
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   int i;
 
@@ -96,6 +96,8 @@ void board_userled_initialize(void)
     {
       stm32_configgpio(g_ledcfg[i]);
     }
+
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_userleds.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_userleds.c
index 1170fb09f33..643d9e0b259 100644
--- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_userleds.c
+++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_userleds.c
@@ -87,7 +87,7 @@ static const uint32_t g_ledcfg[BOARD_NLEDS] =
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   int i;
 
@@ -97,6 +97,8 @@ void board_userled_initialize(void)
     {
       stm32_configgpio(g_ledcfg[i]);
     }
+
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_userleds.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_userleds.c
index a1e34f9a377..4dca88f786c 100644
--- a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_userleds.c
+++ b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_userleds.c
@@ -55,12 +55,13 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED gpio as output */
 
   stm32l4_configgpio(GPIO_LED1);
   stm32l4_configgpio(GPIO_LED2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c
index deabb9cdbb3..495d777fb34 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c
@@ -168,11 +168,12 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LD3 GPIO for output */
 
   stm32l4_configgpio(GPIO_LD3);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_userleds.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_userleds.c
index 0995d313bcc..637dc6c681d 100644
--- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_userleds.c
+++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_userleds.c
@@ -169,11 +169,12 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LD2 GPIO for output */
 
   stm32l4_configgpio(GPIO_LD2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c
index f473801edcb..ffc07629678 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c
+++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c
@@ -168,11 +168,12 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LD2 GPIO for output */
 
   stm32l4_configgpio(GPIO_LD2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_userleds.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_userleds.c
index 30d76dd137c..9bb0ac969cd 100644
--- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_userleds.c
+++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_userleds.c
@@ -88,7 +88,7 @@ static const uint32_t g_ledcfg[BOARD_NLEDS] =
  *
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   int i;
 
@@ -98,6 +98,8 @@ void board_userled_initialize(void)
     {
       stm32l4_configgpio(g_ledcfg[i]);
     }
+
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_userleds.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_userleds.c
index 7730285471a..8a99e5de354 100644
--- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_userleds.c
+++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_userleds.c
@@ -56,7 +56,7 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
 #ifndef CONFIG_ARCH_LEDS
   /* Configure LED GPIOs for output */
@@ -65,6 +65,7 @@ void board_userled_initialize(void)
   stm32l4_configgpio(GPIO_LED_GREEN);
   stm32l4_configgpio(GPIO_LED_WHITE);
 #endif
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_userleds.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_userleds.c
index 5b672c42b8c..6736faeca06 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_userleds.c
+++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_userleds.c
@@ -175,12 +175,13 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LD4,5 GPIO for output */
 
   stm32l4_configgpio(GPIO_LED_RED);
   stm32l4_configgpio(GPIO_LED_GRN);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c
index ddc02f686a0..17a35329fbe 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c
@@ -176,12 +176,13 @@ static int led_pm_prepare(struct pm_callback_s *cb, int domain,
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LD4,5 GPIO for output */
 
   stm32l4_configgpio(GPIO_LED_RED);
   stm32l4_configgpio(GPIO_LED_GRN);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/tiva/dk-tm4c129x/src/tm4c_userleds.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_userleds.c
index b37270667f7..ac3ca13e645 100644
--- a/boards/arm/tiva/dk-tm4c129x/src/tm4c_userleds.c
+++ b/boards/arm/tiva/dk-tm4c129x/src/tm4c_userleds.c
@@ -70,13 +70,14 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED PIOs for output */
 
   tiva_configgpio(GPIO_LED_R);
   tiva_configgpio(GPIO_LED_G);
   tiva_configgpio(GPIO_LED_B);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/tiva/launchxl-cc1310/src/cc1310_userleds.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_userleds.c
index 1806ca1a0a8..65f0b1d67fa 100644
--- a/boards/arm/tiva/launchxl-cc1310/src/cc1310_userleds.c
+++ b/boards/arm/tiva/launchxl-cc1310/src/cc1310_userleds.c
@@ -56,10 +56,11 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   tiva_configgpio(&g_gpio_gled);
   tiva_configgpio(&g_gpio_rled);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_userleds.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_userleds.c
index fccc834ed44..083386a176f 100644
--- a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_userleds.c
+++ b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_userleds.c
@@ -56,10 +56,11 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   tiva_configgpio(&g_gpio_gled);
   tiva_configgpio(&g_gpio_rled);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_userleds.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_userleds.c
index 5b5a22936c6..ae1b82b9a7f 100644
--- a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_userleds.c
+++ b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_userleds.c
@@ -71,7 +71,7 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED PIOs for output */
 
@@ -79,6 +79,7 @@ void board_userled_initialize(void)
   tiva_configgpio(GPIO_LED_D2);
   tiva_configgpio(GPIO_LED_D3);
   tiva_configgpio(GPIO_LED_D4);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/tms570/launchxl-tms57004/src/tms570_userleds.c b/boards/arm/tms570/launchxl-tms57004/src/tms570_userleds.c
index 01c12d60677..edbc25c5f9e 100644
--- a/boards/arm/tms570/launchxl-tms57004/src/tms570_userleds.c
+++ b/boards/arm/tms570/launchxl-tms57004/src/tms570_userleds.c
@@ -73,11 +73,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED PIOs for output */
 
   tms570_configgio(GIO_LED_D11);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_userleds.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_userleds.c
index 2ee1f480976..20416c7a5b3 100644
--- a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_userleds.c
+++ b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_userleds.c
@@ -73,11 +73,12 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED PIOs for output */
 
   tms570_configgio(GIO_LED_D11);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/xmc4/xmc4500-relax/src/xmc4_userleds.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_userleds.c
index 050c0604677..9412576664e 100644
--- a/boards/arm/xmc4/xmc4500-relax/src/xmc4_userleds.c
+++ b/boards/arm/xmc4/xmc4500-relax/src/xmc4_userleds.c
@@ -53,12 +53,13 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-2 GPIOs for output */
 
   xmc4_gpio_config(GPIO_LED1);
   xmc4_gpio_config(GPIO_LED2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/arm/xmc4/xmc4700-relax/src/xmc4_userleds.c b/boards/arm/xmc4/xmc4700-relax/src/xmc4_userleds.c
index 0d023b616a6..91e20f50d8f 100644
--- a/boards/arm/xmc4/xmc4700-relax/src/xmc4_userleds.c
+++ b/boards/arm/xmc4/xmc4700-relax/src/xmc4_userleds.c
@@ -38,12 +38,13 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure LED1-2 GPIOs for output */
 
   xmc4_gpio_config(GPIO_LED1);
   xmc4_gpio_config(GPIO_LED2);
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/mips/pic32mx/mirtoo/src/pic32_leds.c b/boards/mips/pic32mx/mirtoo/src/pic32_leds.c
index 1c45175b8ee..2f15a1dfb33 100644
--- a/boards/mips/pic32mx/mirtoo/src/pic32_leds.c
+++ b/boards/mips/pic32mx/mirtoo/src/pic32_leds.c
@@ -179,12 +179,13 @@ static void pic32mx_setleds(FAR const struct led_setting_s *setting)
  ****************************************************************************/
 
 #ifndef CONFIG_ARCH_LEDS
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure output pins */
 
   pic32mx_configgpio(GPIO_LED_0);
   pic32mx_configgpio(GPIO_LED_1);
+  return 2;
 }
 #endif
 
diff --git a/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_leds.c b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_leds.c
index 6ed21cda020..cd22b86101a 100644
--- a/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_leds.c
+++ b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_leds.c
@@ -189,13 +189,14 @@ static void pic32mx_setleds(FAR const struct led_setting_s *setting)
  ****************************************************************************/
 
 #ifndef CONFIG_ARCH_LEDS
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure output pins */
 
   pic32mx_configgpio(GPIO_LED_1);
   pic32mx_configgpio(GPIO_LED_2);
   pic32mx_configgpio(GPIO_LED_3);
+  return 3;
 }
 #endif
 
diff --git a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_leds.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_leds.c
index 69be3cf2b21..5c5e5af9300 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_leds.c
+++ b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_leds.c
@@ -194,13 +194,14 @@ static void pic32mx_setleds(FAR const struct led_setting_s *setting)
  ****************************************************************************/
 
 #ifndef CONFIG_ARCH_LEDS
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure output pins */
 
   pic32mx_configgpio(GPIO_LED_0);
   pic32mx_configgpio(GPIO_LED_1);
   pic32mx_configgpio(GPIO_LED_2);
+  return 3;
 }
 #endif
 
diff --git a/boards/mips/pic32mx/ubw32/src/pic32_leds.c b/boards/mips/pic32mx/ubw32/src/pic32_leds.c
index c4468832050..ac7e9b656d3 100644
--- a/boards/mips/pic32mx/ubw32/src/pic32_leds.c
+++ b/boards/mips/pic32mx/ubw32/src/pic32_leds.c
@@ -190,13 +190,14 @@ static void pic32mx_setleds(FAR const struct led_setting_s *setting)
  ****************************************************************************/
 
 #ifndef CONFIG_ARCH_LEDS
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure output pins */
 
   pic32mx_configgpio(GPIO_LED_1);
   pic32mx_configgpio(GPIO_LED_2);
   pic32mx_configgpio(GPIO_LED_3);
+  return 3;
 }
 #endif
 
diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_userleds.c b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_userleds.c
index edfdef0f23b..91ca62e558b 100644
--- a/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_userleds.c
+++ b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_userleds.c
@@ -76,7 +76,7 @@
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
 #ifndef CONFIG_ARCH_LEDS
   /* Configure LED GPIOs for output */
@@ -87,6 +87,7 @@ void board_userled_initialize(void)
   pic32mz_configgpio(GPIO_LED_C);
   pic32mz_configgpio(GPIO_LED_D);
 #endif
+  return BOARD_NLEDS;
 }
 
 /****************************************************************************
diff --git a/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_userleds.c b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_userleds.c
index b3d8375436e..d4c639c0f2d 100644
--- a/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_userleds.c
+++ b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_userleds.c
@@ -89,13 +89,14 @@ static const pinset_t g_ledpincfg[PIC32MZ_STARTERKIT_NLEDS] =
  * Name: board_userled_initialize
  ****************************************************************************/
 
-void board_userled_initialize(void)
+uint32_t board_userled_initialize(void)
 {
   /* Configure output pins */
 
   pic32mz_configgpio(GPIO_LED_1);
   pic32mz_configgpio(GPIO_LED_2);
   pic32mz_configgpio(GPIO_LED_3);
+  return 3;
 }
 
 /****************************************************************************
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index aa0f5730b23..f19796ec912 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -26,13 +26,6 @@ config USERLED_LOWER
 
 		1. The board implementation must provide the LED
 		   interfaces as defined in include/nuttx/board.h
-		2. The board.h header file must provide the definition
-		   BOARD_NLEDS, and
-		3. The board.h header file must not include any other
-		   header files that are not accessible in this context
-		   (such as those in arch/<arch>/src/<chip>) UNLESS those
-		   inclusions are conditioned on __KERNEL__.  button_lower.c
-		   will undefine __KERNEL__ before included board.h.
 
 		If your board does not meet these requirements, then the
 		userled_lower.c file can still be copied to your your
diff --git a/drivers/leds/userled_lower.c b/drivers/leds/userled_lower.c
index 74643fa80ac..70e8b12d7ce 100644
--- a/drivers/leds/userled_lower.c
+++ b/drivers/leds/userled_lower.c
@@ -46,9 +46,6 @@
 #include <nuttx/board.h>
 #include <nuttx/leds/userled.h>
 
-#undef __KERNEL__
-#include <arch/board/board.h>
-
 #if CONFIG_USERLED_LOWER
 
 /****************************************************************************
@@ -66,6 +63,8 @@ static void userled_ledset(FAR const struct userled_lowerhalf_s *lower,
  * Private Data
  ****************************************************************************/
 
+static uint32_t g_lednum;
+
 /* This is the user LED lower half driver interface */
 
 static const struct userled_lowerhalf_s g_userled_lower =
@@ -90,8 +89,8 @@ static const struct userled_lowerhalf_s g_userled_lower =
 static userled_set_t
 userled_supported(FAR const struct userled_lowerhalf_s *lower)
 {
-  ledinfo("BOARD_NLEDS: %02x\n", BOARD_NLEDS);
-  return (userled_set_t)((1 << BOARD_NLEDS) - 1);
+  ledinfo("BOARD_NLEDS: %02x\n", g_lednum);
+  return (userled_set_t)((1 << g_lednum) - 1);
 }
 
 /****************************************************************************
@@ -137,7 +136,7 @@ static void userled_ledset(FAR const struct userled_lowerhalf_s *lower,
 
 int userled_lower_initialize(FAR const char *devname)
 {
-  board_userled_initialize();
+  g_lednum = board_userled_initialize();
   return userled_register(devname, &g_userled_lower);
 }
 
diff --git a/include/nuttx/board.h b/include/nuttx/board.h
index de7f5cdc083..d6617084524 100644
--- a/include/nuttx/board.h
+++ b/include/nuttx/board.h
@@ -548,10 +548,12 @@ void board_autoled_off(int led);
  *   used by the NuttX LED logic exclusively and may not be available for
  *   use by user logic if CONFIG_ARCH_LEDS=y.
  *
+ *   NOTE: The LED number is returned.
+ *
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_HAVE_LEDS
-void board_userled_initialize(void);
+uint32_t board_userled_initialize(void);
 #endif
 
 /****************************************************************************