diff --git a/configs/efm32-g8xx-stk/README.txt b/configs/efm32-g8xx-stk/README.txt
index bd0c549a4ed..523f4e20e24 100644
--- a/configs/efm32-g8xx-stk/README.txt
+++ b/configs/efm32-g8xx-stk/README.txt
@@ -139,14 +139,14 @@ Configurations
   If this is a Windows native build, then configure.bat should be used
   instead of configure.sh:
 
-    configure.bat STM32F4Discovery\<subdir>
+    configure.bat efm32-g8xx-stk\<subdir>
 
   Where <subdir> is one of the following:
 
   nsh:
   ---
     Configures the NuttShell (nsh) located at apps/examples/nsh.  The
-    Configuration enables the serial interfaces on USARTx.  Support for
+    Configuration enables the serial interfaces on UART0.  Support for
     builtin applications is enabled, but in the base configuration no
     builtin applications are selected (see NOTES below).
 
diff --git a/configs/efm32-g8xx-stk/src/efm32-g8xx-stk.h b/configs/efm32-g8xx-stk/src/efm32-g8xx-stk.h
index dd0aff5c011..0526cdac06e 100644
--- a/configs/efm32-g8xx-stk/src/efm32-g8xx-stk.h
+++ b/configs/efm32-g8xx-stk/src/efm32-g8xx-stk.h
@@ -75,4 +75,12 @@
  * Public Function Prototypes
  ****************************************************************************/
 
+/****************************************************************************
+ * Name: board_led_initialize
+ ****************************************************************************/
+
+#ifdef CONFIG_ARCH_LEDS
+void board_led_initialize(void);
+#endif
+
 #endif /* __CONFIGS_EFM32_DK3650_INCLUDE_BOARD_H */
diff --git a/configs/efm32-g8xx-stk/src/efm32_boot.c b/configs/efm32-g8xx-stk/src/efm32_boot.c
index b288be27b8d..bfb4022f8be 100644
--- a/configs/efm32-g8xx-stk/src/efm32_boot.c
+++ b/configs/efm32-g8xx-stk/src/efm32_boot.c
@@ -59,6 +59,11 @@
 
 void efm32_boardinitialize(void)
 {
+#ifdef CONFIG_ARCH_LEDS
+  /* Configure on-board LEDs if LED support has been selected. */
+
+  board_led_initialize();
+#endif
 }
 
 /****************************************************************************
diff --git a/configs/stm32f4discovery/src/stm32_boot.c b/configs/stm32f4discovery/src/stm32_boot.c
index d9b5f320b6d..413c580cdf7 100644
--- a/configs/stm32f4discovery/src/stm32_boot.c
+++ b/configs/stm32f4discovery/src/stm32_boot.c
@@ -70,33 +70,33 @@
 
 void stm32_boardinitialize(void)
 {
+#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
    * stm32_spiinitialize() has been brought into the link.
    */
 
-#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)
   if (stm32_spiinitialize)
     {
       stm32_spiinitialize();
     }
 #endif
 
+#ifdef CONFIG_STM32_OTGFS
   /* Initialize USB if the 1) OTG FS controller is in the configuration and 2)
    * disabled, and 3) the weak function stm32_usbinitialize() has been brought
-   * into the build. Presumeably either CONFIG_USBDEV or CONFIG_USBHOST is also
+   * into the build. Presumably either CONFIG_USBDEV or CONFIG_USBHOST is also
    * selected.
    */
 
-#ifdef CONFIG_STM32_OTGFS
   if (stm32_usbinitialize)
     {
       stm32_usbinitialize();
     }
 #endif
 
+#ifdef CONFIG_ARCH_LEDS
   /* Configure on-board LEDs if LED support has been selected. */
 
-#ifdef CONFIG_ARCH_LEDS
   board_led_initialize();
 #endif
 }