diff --git a/arch/arm/src/armv7-m/up_mpu.c b/arch/arm/src/armv7-m/up_mpu.c
index 05aadda4b6b..3e802fddfdb 100644
--- a/arch/arm/src/armv7-m/up_mpu.c
+++ b/arch/arm/src/armv7-m/up_mpu.c
@@ -147,7 +147,7 @@ static inline uint32_t mpu_subregion_ms(size_t size, uint8_t l2size)
  *   Given (1) the offset to the beginning of data in the region and (2) the
  *   log2 size of the mapping to use, determine the minimal sub-region set
  *   to span that memory region sub-region set at the to be disabled at the
- *   higher end of the region
+ *   lower end of the region
  *
  * Assumption:
  *   l2size has the same properties as the return value from
diff --git a/configs/olimex-stm32-p407/README.txt b/configs/olimex-stm32-p407/README.txt
index 3f4d1390e76..386f9980173 100644
--- a/configs/olimex-stm32-p407/README.txt
+++ b/configs/olimex-stm32-p407/README.txt
@@ -285,6 +285,28 @@ Configuration sub-directories
 The <subdir> that is provided above as an argument to the tools/configure.sh
 must be is one of the following.
 
+  kelf:
+
+    This is a protected mode version of the apps/examples/elf test of
+    loadable ELF programs.  This version is unique because the ELF programs
+    are loaded into user space.
+
+    NOTES:
+    1. See build recommendations and instructions for combining the .hex
+       files under the knsh configuration.  These instructions are common
+       for all protected mode builds.
+
+    2. Unlike other versions of apps/examples/elf configurations, the test
+       ELF programs are not provided internally on a ROMFS or CROMFS file
+       system.  This is due to the fact that those file systems are built in
+       user space and there is not mechanism in the build system to easily
+       get them into the kernel space.
+
+       Instead, the programs must be copied to an SD card on your host PC.
+       The programs can be found at apps/examples/elf/tests/romfs.  All of
+       those files should be copied to the SD card and the SD card should be
+       in place when you reset/power-up the board.
+
   knsh:
 
     This is identical to the nsh configuration below except that NuttX
diff --git a/configs/olimex-stm32-p407/kelf/Make.defs b/configs/olimex-stm32-p407/kelf/Make.defs
new file mode 100644
index 00000000000..b6af03900c8
--- /dev/null
+++ b/configs/olimex-stm32-p407/kelf/Make.defs
@@ -0,0 +1,137 @@
+############################################################################
+# configs/olimex-stm32-p407/kelf/Make.defs
+#
+#   Copyright (C) 2018 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+include ${TOPDIR}/.config
+include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
+
+ifeq ($(WINTOOL),y)
+  # Windows-native toolchains
+  DIRLINK = $(TOPDIR)/tools/copydir.sh
+  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
+  MKDEP = $(TOPDIR)/tools/mkwindeps.sh
+  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
+  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
+  ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}"
+else
+  # Linux/Cygwin-native toolchain
+  MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
+  ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include
+  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx
+  ARCHSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld
+  ARCHSCRIPT += -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld
+endif
+
+CC = $(CROSSDEV)gcc
+CXX = $(CROSSDEV)g++
+CPP = $(CROSSDEV)gcc -E
+LD = $(CROSSDEV)ld
+STRIP = $(CROSSDEV)strip --strip-unneeded
+AR = $(ARCROSSDEV)ar rcs
+NM = $(ARCROSSDEV)nm
+OBJCOPY = $(CROSSDEV)objcopy
+OBJDUMP = $(CROSSDEV)objdump
+
+ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
+ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  ARCHOPTIMIZATION = -g
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+endif
+
+ARCHCFLAGS = -fno-builtin
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fcheck-new -fno-rtti
+ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
+ARCHWARNINGSXX = -Wall -Wshadow -Wundef
+ARCHDEFINES =
+ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
+
+CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
+CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
+
+# NXFLAT module definitions
+
+NXFLATLDFLAGS1 = -r -d -warn-common
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)$(DELIM)binfmt$(DELIM)libnxflat$(DELIM)gnu-nxflat-pcrel.ld -no-check-sections
+LDNXFLATFLAGS = -e main -s 2048
+
+# ELF module definitions
+
+CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
+CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
+
+LDELFFLAGS = -r -e main
+ifeq ($(WINTOOL),y)
+  LDELFFLAGS += -T "${shell cygpath -w  $(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld}"
+else
+  LDELFFLAGS += -T  $(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld
+endif
+
+# File extensions
+
+ASMEXT = .S
+OBJEXT = .o
+LIBEXT = .a
+EXEEXT =
+
+# Linker flags
+
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
+  LDFLAGS += -nostartfiles -nodefaultlibs
+endif
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  LDFLAGS += -g
+endif
+
+# Host tools
+
+HOSTCC = gcc
+HOSTINCLUDES = -I.
+HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
+HOSTLDFLAGS =
+ifeq ($(CONFIG_HOST_WINDOWS),y)
+  HOSTEXEEXT = .exe
+else
+  HOSTEXEEXT =
+endif
diff --git a/configs/olimex-stm32-p407/kelf/defconfig b/configs/olimex-stm32-p407/kelf/defconfig
new file mode 100644
index 00000000000..baf47b71750
--- /dev/null
+++ b/configs/olimex-stm32-p407/kelf/defconfig
@@ -0,0 +1,61 @@
+# CONFIG_ARCH_FPU is not set
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="olimex-stm32-p407"
+CONFIG_ARCH_BOARD_OLIMEX_STM32P407=y
+CONFIG_ARCH_CHIP_STM32=y
+CONFIG_ARCH_CHIP_STM32F407ZG=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARMV7M_USEBASEPRI=y
+CONFIG_ARM_MPU=y
+CONFIG_BINFMT_CONSTRUCTORS=y
+CONFIG_BINFMT_EXEPATH=y
+CONFIG_BOARD_INITIALIZE=y
+CONFIG_BOARD_INITTHREAD=y
+CONFIG_BOARD_LOOPSPERMSEC=16717
+CONFIG_BUILD_PROTECTED=y
+CONFIG_DEV_LOWCONSOLE=y
+CONFIG_ELF=y
+CONFIG_ELF_STACKSIZE=4096
+CONFIG_EXAMPLES_ELF=y
+CONFIG_EXAMPLES_ELF_DEVPATH="/dev/sda"
+CONFIG_EXAMPLES_ELF_FSREMOVEABLE=y
+CONFIG_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FS_FAT=y
+CONFIG_HAVE_CXX=y
+CONFIG_INTELHEX_BINARY=y
+CONFIG_MAX_TASKS=16
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_MM_KERNEL_HEAPSIZE=16384
+CONFIG_MM_REGIONS=2
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NUTTX_USERSPACE=0x08020000
+CONFIG_PASS1_BUILDIR="configs/olimex-stm32-p407/kernel"
+CONFIG_PATH_INITIAL="/mnt/vfat"
+CONFIG_PREALLOC_MQ_MSGS=4
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_PREALLOC_WDOGS=4
+CONFIG_RAM_SIZE=114688
+CONFIG_RAM_START=0x20000000
+CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_STARTHOOK=y
+CONFIG_SCHED_WAITPID=y
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_START_DAY=4
+CONFIG_START_MONTH=8
+CONFIG_STM32_JTAG_SW_ENABLE=y
+CONFIG_STM32_OTGFS=y
+CONFIG_STM32_RNG=y
+CONFIG_STM32_SDIO=y
+CONFIG_STM32_USART3=y
+CONFIG_SYMTAB_ORDEREDBYNAME=y
+CONFIG_SYS_RESERVED=8
+CONFIG_USART3_SERIAL_CONSOLE=y
+CONFIG_USBHOST=y
+CONFIG_USBHOST_ISOC_DISABLE=y
+CONFIG_USBHOST_MSC=y
+CONFIG_USERMAIN_STACKSIZE=4096
+CONFIG_USER_ENTRYPOINT="elf_main"
+CONFIG_WDOG_INTRESERVE=0
diff --git a/configs/olimex-stm32-p407/knsh/defconfig b/configs/olimex-stm32-p407/knsh/defconfig
index 36ae84d545f..454b21099fb 100644
--- a/configs/olimex-stm32-p407/knsh/defconfig
+++ b/configs/olimex-stm32-p407/knsh/defconfig
@@ -6,7 +6,6 @@ CONFIG_ARCH_CHIP_STM32=y
 CONFIG_ARCH_CHIP_STM32F407ZG=y
 CONFIG_ARCH_IRQBUTTONS=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 CONFIG_ARM_MPU=y
 CONFIG_BOARD_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=16717
@@ -21,6 +20,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
 CONFIG_MAX_WDOGPARMS=2
+CONFIG_MM_KERNEL_HEAPSIZE=16384
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
 CONFIG_NSH_DISABLE_DD=y
diff --git a/configs/olimex-stm32-p407/nsh/defconfig b/configs/olimex-stm32-p407/nsh/defconfig
index a7d088b2cbb..b79f3e41fe8 100644
--- a/configs/olimex-stm32-p407/nsh/defconfig
+++ b/configs/olimex-stm32-p407/nsh/defconfig
@@ -6,7 +6,6 @@ CONFIG_ARCH_CHIP_STM32=y
 CONFIG_ARCH_CHIP_STM32F407ZG=y
 CONFIG_ARCH_IRQBUTTONS=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 CONFIG_BOARD_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=16717
 CONFIG_BUILTIN=y
diff --git a/configs/olimex-stm32-p407/scripts/memory.ld b/configs/olimex-stm32-p407/scripts/memory.ld
index 3a118668b73..5bed711430f 100644
--- a/configs/olimex-stm32-p407/scripts/memory.ld
+++ b/configs/olimex-stm32-p407/scripts/memory.ld
@@ -45,43 +45,56 @@
  * the 0x0800:0000 address range.
  *
  * For MPU support, the kernel-mode NuttX section is assumed to be 128Kb of
- * FLASH and 4Kb of SRAM.  That is an excessive amount for the kernel which
- * should fit into 64KB and, of course, can be optimized as needed (See
- * also configs/stm32f4discovery/scripts/kernel-space.ld).  Allowing the
- * additional does permit addition debug instrumentation to be added to the
- * kernel space without overflowing the partition.
+ * FLASH and 8Kb of SRAM.  (See configs/stm32f4discovery/scripts/kernel-space.ld).
+ * Allowing additional memory permitis configuring debug instrumentation to
+ * be added to the kernel space without overflowing the partition.  This could
+ * just as easily be set to 256Kb or even 512Kb.
  *
  * Alignment of the user space FLASH partition is also a critical factor:
  * The user space FLASH partition will be spanned with a single region of
  * size 2**n bytes.  The alignment of the user-space region must be the same.
- * As a consequence, as the user-space increases in size, the alignmment
+ * As a consequence, as the user-space increases in size, the alignment
  * requirement also increases.
  *
  * This alignment requirement means that the largest user space FLASH region
  * you can have will be 512KB at it would have to be positioned at
- * 0x08800000.  If you change this address, don't forget to change the
- * CONFIG_NUTTX_USERSPACE configuration setting to match and to modify
- * the check in kernel/userspace.c.
+ * 0x08800000 (it cannot be positioned at 0x0800000 because vectors power-up
+ * reset vectors are places at the beginning of that range).  If you change
+ * this address, don't forget to change the CONFIG_NUTTX_USERSPACE
+ * configuration setting to match and to modify the check in kernel/userspace.c.
  *
- * For the same reasons, the maximum size of the SRAM mapping is limited to
- * 4KB.  Both of these alignment limitations could be reduced by using
- * multiple regions to map the FLASH/SDRAM range or perhaps with some
- * clever use of subregions.
+ * With 112Kb of SRAM a 64Kb user heap would seem possible but it is not in
+ * the current organization of SRAM memory (that could be changed with a
+ * little effort).  The current ordering of SRAM is:  (1) kernel .bss/.data,
+ * (2) user .bss/.data, (3) kernel heap (determined by CONFIG_MM_KERNEL_HEAPSIZE),
+ * and (4) the user heap.  The maximum size of the user space heap is then
+ * limited to 32Kb beginning at address 0x20008000.
+ *
+ * Both of these alignment limitations could be reduced by using multiple
+ * regions to map the FLASH/SDRAM range or perhaps with some clever use of
+ * subregions or with mutliple MPU regions per memory region.
+ *
+ * NOTE: The MPU is used in a mode where mappings are not required for
+ * kernel addresses and, hence, there are not alignment issues for those
+ * case.  Only the user address spaces suffer from alignment requirements.
+ * However, in order to exploit this fact, we would staill need to change
+ * the ordering of memory regions in SRAM.
  *
  * A detailed memory map for the 112KB SRAM region is as follows:
  *
- *   0x20000 0000:  Kernel .data region.  Typical size: 0.1KB
- *   ------- ----   Kernel .bss  region.  Typical size: 1.8KB
- *   0x20000 0800:  Kernel IDLE thread stack (approximate).  Size is
- *                  determined by CONFIG_IDLETHREAD_STACKSIZE and
- *                  adjustments for alignment.  Typical is 1KB.
- *   ------- ----   Padded to 4KB
- *   0x20000 1000:  User .data region.  Size is variable.
- *   ------- ----   User .bss region  Size is variable.
- *   0x20000 2000:  Beginning of kernel heap.  Size determined by
- *                  CONFIG_MM_KERNEL_HEAPSIZE.
- *   ------- ----   Beginning of user heap.  Can vary with other settings.
- *   0x20001 c000:  End+1 of CPU RAM
+ *   0x2000 0000:  Kernel .data region.  Typical size: 0.1KB
+ *   ------ ----   Kernel .bss  region.  Typical size: 1.8KB
+ *   0x2000 0800:  Kernel IDLE thread stack (approximate).  Size is
+ *                 determined by CONFIG_IDLETHREAD_STACKSIZE and
+ *                 adjustments for alignment.  Typical is 1KB.
+ *   ------ ----   Padded to 8KB
+ *   0x2000 2000:  User .data region.  Size is variable.
+ *   ------ ----   User .bss region  Size is variable.
+ *   0x2000 4000:  Beginning of kernel heap.  Size determined by
+ *                 CONFIG_MM_KERNEL_HEAPSIZE which must be set to 16Kb.
+ *   0x2000 8000:  Beginning of 32Kb user heap.
+ *   0x2001 0000:  The remainder of SRAM is, unfortunately, wasted.
+ *   0x2001 c000:  End+1 of CPU RAM
  */
 
 MEMORY
@@ -94,7 +107,7 @@ MEMORY
 
     /* 112Kb of contiguous SRAM */
 
-    ksram (rwx)      : ORIGIN = 0x20000000, LENGTH = 4K
-    usram (rwx)      : ORIGIN = 0x20001000, LENGTH = 4K
-    xsram (rwx)      : ORIGIN = 0x20002000, LENGTH = 104K
+    ksram (rwx)      : ORIGIN = 0x20000000, LENGTH = 8K
+    usram (rwx)      : ORIGIN = 0x20002000, LENGTH = 8K
+    xsram (rwx)      : ORIGIN = 0x20008000, LENGTH = 96K
 }
diff --git a/configs/olimex-stm32-p407/src/Makefile b/configs/olimex-stm32-p407/src/Makefile
index 6c580d3f096..a19f5f58aa1 100644
--- a/configs/olimex-stm32-p407/src/Makefile
+++ b/configs/olimex-stm32-p407/src/Makefile
@@ -48,7 +48,6 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS +=  stm32_buttons.c
 endif
 
-
 ifeq ($(CONFIG_STM32_FSMC),y)
 CSRCS += stm32_sram.c
 endif
diff --git a/configs/olimex-stm32-p407/src/olimex-stm32-p407.h b/configs/olimex-stm32-p407/src/olimex-stm32-p407.h
index 1c6d4b93e6c..3f33c72d1be 100644
--- a/configs/olimex-stm32-p407/src/olimex-stm32-p407.h
+++ b/configs/olimex-stm32-p407/src/olimex-stm32-p407.h
@@ -61,6 +61,7 @@
 #define HAVE_USBDEV     1
 #define HAVE_USBHOST    1
 #define HAVE_USBMONITOR 1
+#define HAVE_ELF        1
 
 /* Can't support MMC/SD features if mountpoints are disabled or if SDIO support
  * is not enabled.
@@ -124,6 +125,11 @@
 #  undef HAVE_USBMONITOR
 #endif
 
+/* ELF */
+
+#if defined(CONFIG_BINFMT_DISABLE) || !defined(CONFIG_ELF)
+#  undef HAVE_ELF
+#endif
 
 /* Olimex-STM32-P407 GPIOs **************************************************/
 /* LEDs */
diff --git a/configs/olimex-stm32-p407/src/stm32_boot.c b/configs/olimex-stm32-p407/src/stm32_boot.c
index 173da2f8e34..7b82254291e 100644
--- a/configs/olimex-stm32-p407/src/stm32_boot.c
+++ b/configs/olimex-stm32-p407/src/stm32_boot.c
@@ -72,14 +72,11 @@ void stm32_boardinitialize(void)
 #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_usb_configure() 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.
    */
 
-  if (stm32_usb_configure)
-    {
-      stm32_usb_configure();
-    }
+  stm32_usb_configure();
 #endif
 
   /* Configure on-board LEDs if LED support has been selected. */
diff --git a/configs/olimex-stm32-p407/src/stm32_bringup.c b/configs/olimex-stm32-p407/src/stm32_bringup.c
index 2529cbd87a4..05ba7aae06a 100644
--- a/configs/olimex-stm32-p407/src/stm32_bringup.c
+++ b/configs/olimex-stm32-p407/src/stm32_bringup.c
@@ -48,6 +48,7 @@
 #include <nuttx/board.h>
 #include <nuttx/mmcsd.h>
 #include <nuttx/input/buttons.h>
+#include <nuttx/binfmt/elf.h>
 
 #ifdef CONFIG_USBMONITOR
 #  include <nuttx/usb/usbmonitor.h>
@@ -95,6 +96,17 @@ int stm32_bringup(void)
     }
 #endif
 
+#ifdef HAVE_ELF
+  /* Initialize the ELF binary loader */
+
+  ret = elf_initialize();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: Initialization of the ELF loader failed: %d\n",
+             ret);
+    }
+#endif
+
 #ifdef HAVE_MMCSD
   /* Mount the SDIO-based MMC/SD block driver */
   /* First, get an instance of the SDIO interface */
diff --git a/configs/stm32f4discovery/kostest/Make.defs b/configs/stm32f4discovery/kostest/Make.defs
index ba5175d000d..960b4c0892b 100644
--- a/configs/stm32f4discovery/kostest/Make.defs
+++ b/configs/stm32f4discovery/kostest/Make.defs
@@ -39,12 +39,16 @@ include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolch
 
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
+  DIRLINK = $(TOPDIR)/tools/copydir.sh
+  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
+  MKDEP = $(TOPDIR)/tools/mkwindeps.sh
   ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
   ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
   ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
   ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}"
 else
   # Linux/Cygwin-native toolchain
+  MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
   ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include
   ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx
   ARCHSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld
@@ -86,15 +90,21 @@ CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
 CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
+# NXFLAT module definitions
+
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)$(DELIM)binfmt$(DELIM)libnxflat$(DELIM)gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
+# File extensions
+
 ASMEXT = .S
 OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
+# Linker flags
+
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
@@ -102,6 +112,7 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   LDFLAGS += -g
 endif
 
+# Host tools
 
 HOSTCC = gcc
 HOSTINCLUDES = -I.
@@ -112,14 +123,3 @@ ifeq ($(CONFIG_HOST_WINDOWS),y)
 else
   HOSTEXEEXT =
 endif
-
-ifeq ($(WINTOOL),y)
-  # Windows-native host tools
-  DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
-  DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
-  MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh
-else
-  # Linux/Cygwin-native host tools
-  MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT)
-endif
-
diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig
index f72adc4ca63..47861e2a29c 100644
--- a/configs/stm32f4discovery/kostest/defconfig
+++ b/configs/stm32f4discovery/kostest/defconfig
@@ -5,7 +5,6 @@ CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y
 CONFIG_ARCH_CHIP_STM32=y
 CONFIG_ARCH_CHIP_STM32F407VG=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 CONFIG_ARM_MPU=y
 CONFIG_BOARD_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=16717
diff --git a/include/nuttx/usb/usbhost_trace.h b/include/nuttx/usb/usbhost_trace.h
index f71b7c90b80..ce8270dc990 100644
--- a/include/nuttx/usb/usbhost_trace.h
+++ b/include/nuttx/usb/usbhost_trace.h
@@ -61,7 +61,7 @@
 
 #if defined(CONFIG_USBHOST_TRACE) || defined(CONFIG_DEBUG_USB)
 #  define HAVE_USBHOST_TRACE 1
-#  if defined(CONFIG_USBHOST_TRACE_VERBOSE) || defined(CONFIG_DEBUG_INFO)
+#  if defined(CONFIG_USBHOST_TRACE_VERBOSE) || defined(CONFIG_DEBUG_USB_INFO)
 #    define HAVE_USBHOST_TRACE_VERBOSE 1
 #  endif
 #endif