sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gregory Nutt 2015-05-01 15:38:48 -06:00
commit d66eb8b23c
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configs/stm32f4discovery/src/stm32_bringup.c
View File

@ -154,5 +154,15 @@ int stm32_bringup(void)
} }
#endif #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; return ret;
} }

8
configs/stm32f4discovery/src/stm32f4discovery.h
View File

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