diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt
index d1a55daa9d..e8f0ae166b 100644
--- a/configs/stm32f4discovery/README.txt
+++ b/configs/stm32f4discovery/README.txt
@@ -1007,6 +1007,10 @@ Where <subdir> is one of the following:
     3. By default, this project assumes that you are *NOT* using the DFU
        bootloader.
  
+    4. This configuration requires that you have the genromfs tool installed
+       on your system and that you have the full path to the installed genromfs
+       executable in PATH variable (see apps/examples/README.txt)
+
   ostest:
   ------
     This configuration directory, performs a simple OS test using
diff --git a/configs/stm32f4discovery/elf/Make.defs b/configs/stm32f4discovery/elf/Make.defs
index 7f5be08f06..c64102d174 100644
--- a/configs/stm32f4discovery/elf/Make.defs
+++ b/configs/stm32f4discovery/elf/Make.defs
@@ -160,6 +160,7 @@ LDNXFLATFLAGS = -e main -s 2048
 
 # ELF module definitions
 
+CELFFLAGS = $(CFLAGS) -mlong-calls
 LDELFFLAGS = -r -e main
 ifeq ($(WINTOOL),y)
   LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig
index dd5bd28298..6d72e4a9ee 100644
--- a/configs/stm32f4discovery/elf/defconfig
+++ b/configs/stm32f4discovery/elf/defconfig
@@ -179,7 +179,7 @@ CONFIG_STM32_USART2=y
 CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
-# CONFIG_STM32_CCMEXCLUDE is not set
+CONFIG_STM32_CCMEXCLUDE=y
 
 #
 # USB Host Configuration
@@ -251,7 +251,7 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_WAITPID is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
-CONFIG_USER_ENTRYPOINT="ostest_main"
+CONFIG_USER_ENTRYPOINT="elf_main"
 CONFIG_DISABLE_OS_API=y
 # CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
@@ -387,6 +387,7 @@ CONFIG_ELF_ALIGN_LOG2=2
 CONFIG_ELF_STACKSIZE=2048
 CONFIG_ELF_BUFFERSIZE=128
 CONFIG_ELF_BUFFERINCR=32
+# CONFIG_ELF_CONSTRUCTORS is not set
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 
 #
@@ -409,7 +410,7 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
-# CONFIG_HAVE_CXX is not set
+CONFIG_HAVE_CXX=y
 # CONFIG_HAVE_CXXINITIALIZE is not set
 # CONFIG_CXX_NEWLONG is not set