Merge remote-tracking branch 'origin/master' into usbhub

configs/stm32f4discovery/src/stm32_bringup.c

@@ -154,5 +154,15 @@ int stm32_bringup(void)
     }
 #endif
 
+#ifdef HAVE_ELF
+  /* Initialize the ELF binary loader */
+
+  ret = elf_initialize();
+  if (ret < 0)
+    {
+      sdbg("ERROR: Initialization of the ELF loader failed: %d\n", ret);
+    }
+#endif
+
   return ret;
 }

configs/stm32f4discovery/src/stm32f4discovery.h

@@ -68,6 +68,7 @@
 #define HAVE_USBMONITOR 1
 #define HAVE_SDIO       1
 #define HAVE_RTC_DRIVER 1
+#define HAVE_ELF        1
 
 /* Can't support USB host or device features if USB OTG FS is not enabled */
 
@@ -140,6 +141,13 @@
 #  undef HAVE_RTC_DRIVER
 #endif
 
+/* ELF */
+
+#if defined(CONFIG_BINFMT_DISABLE) || !defined(CONFIG_ELF)
+#  undef HAVE_ELF
+#endif
+
+
 /* STM32F4 Discovery GPIOs **************************************************/
 /* LEDs */