diff --git a/configs/stm3240g-eval/src/stm3240g-eval.h b/configs/stm3240g-eval/src/stm3240g-eval.h
index 60dc788acad..70008e2977f 100644
--- a/configs/stm3240g-eval/src/stm3240g-eval.h
+++ b/configs/stm3240g-eval/src/stm3240g-eval.h
@@ -252,7 +252,7 @@ int stm32_usbhost_initialize(void);
  ****************************************************************************************************/
 
 #ifdef CONFIG_ARCH_LEDS
-void stm32_autoled_initialize(void);
+void stm32_led_initialize(void);
 #endif
 
 /****************************************************************************************************
diff --git a/configs/stm3240g-eval/src/stm32_autoleds.c b/configs/stm3240g-eval/src/stm32_autoleds.c
index 027050c7542..410e9447954 100644
--- a/configs/stm3240g-eval/src/stm32_autoleds.c
+++ b/configs/stm3240g-eval/src/stm32_autoleds.c
@@ -224,10 +224,10 @@ static void led_setonoff(unsigned int bits)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32_autoled_initialize
+ * Name: stm32_led_initialize
  ****************************************************************************/
 
-void stm32_autoled_initialize(void)
+void stm32_led_initialize(void)
 {
    /* Configure LED1-4 GPIOs for output */
 
diff --git a/configs/stm3240g-eval/src/stm32_boot.c b/configs/stm3240g-eval/src/stm32_boot.c
index bbf5bc53312..f1dd2a6b278 100644
--- a/configs/stm3240g-eval/src/stm32_boot.c
+++ b/configs/stm3240g-eval/src/stm32_boot.c
@@ -155,12 +155,12 @@ static int board_initthread(int argc, char *argv[])
 {
   int ret;
 
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
   /* Perform NSH initialization here instead of from the NSH.  This
    * alternative NSH initialization is necessary when NSH is ran in user-space
    * but the initialization function must run in kernel space.
    */
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
   ret = board_app_initialize();
   if (ret < 0)
     {
@@ -168,9 +168,9 @@ static int board_initthread(int argc, char *argv[])
     }
 #endif
 
+#ifdef HAVE_NXSTART
   /* Initialize the NX server */
 
-#ifdef HAVE_NXSTART
   ret = nx_start();
   if (ret < 0)
     {
@@ -178,9 +178,9 @@ static int board_initthread(int argc, char *argv[])
     }
 #endif
 
+#ifdef HAVE_TCINIT
   /* Initialize the touchscreen */
 
-#ifdef HAVE_TCINIT
   ret = board_tsc_setup(CONFIG_NXWM_TOUCHSCREEN_DEVNO);
   if (ret < 0)
     {
@@ -208,40 +208,40 @@ static int board_initthread(int argc, char *argv[])
 
 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_FSMC
   /* If the FSMC is enabled, then enable SRAM access */
 
-#ifdef CONFIG_STM32_FSMC
   stm32_selectsram();
 #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
    * the weak function stm32_usbinitialize() has been brought into the build.
    * Presumeably 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
-  stm32_autoled_initialize();
+  stm32_led_initialize();
 #endif
 }