diff --git a/configs/stm32f429i-disco/extflash/setenv.sh b/configs/stm32f429i-disco/extflash/setenv.sh
index a11e9434ad1..275653e1a77 100644
--- a/configs/stm32f429i-disco/extflash/setenv.sh
+++ b/configs/stm32f429i-disco/extflash/setenv.sh
@@ -57,6 +57,7 @@ fi
 # the CodeSourcery toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
 export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
+#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
 
 # These are the Cygwin paths to the locations where I installed the Atollic
 # toolchain under windows.  You will also have to edit this if you install
diff --git a/configs/stm32f429i-disco/nsh/setenv.sh b/configs/stm32f429i-disco/nsh/setenv.sh
index a11e9434ad1..275653e1a77 100644
--- a/configs/stm32f429i-disco/nsh/setenv.sh
+++ b/configs/stm32f429i-disco/nsh/setenv.sh
@@ -57,6 +57,7 @@ fi
 # the CodeSourcery toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
 export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
+#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
 
 # These are the Cygwin paths to the locations where I installed the Atollic
 # toolchain under windows.  You will also have to edit this if you install
diff --git a/configs/stm32f429i-disco/src/Makefile b/configs/stm32f429i-disco/src/Makefile
index 9c6b04791a6..126dee35ed6 100644
--- a/configs/stm32f429i-disco/src/Makefile
+++ b/configs/stm32f429i-disco/src/Makefile
@@ -68,7 +68,7 @@ ifeq ($(CONFIG_STM32_FSMC),y)
 CSRCS += stm32_extmem.c
 endif
 
-ifeq ($(CONFIG_STM32_OTGFS2),y)
+ifeq ($(CONFIG_STM32_OTGFHS),y)
 CSRCS += stm32_usb.c
 endif
 
diff --git a/configs/stm32f429i-disco/src/stm32_boot.c b/configs/stm32f429i-disco/src/stm32_boot.c
index 6e21112c8b3..65909344798 100644
--- a/configs/stm32f429i-disco/src/stm32_boot.c
+++ b/configs/stm32f429i-disco/src/stm32_boot.c
@@ -88,7 +88,7 @@ void stm32_boardinitialize(void)
    * selected.
    */
 
-#ifdef CONFIG_STM32_OTGFS2
+#ifdef CONFIG_STM32_OTGHS
   if (stm32_usbinitialize)
     {
       stm32_usbinitialize();
diff --git a/configs/stm32f429i-disco/src/stm32_nsh.c b/configs/stm32f429i-disco/src/stm32_nsh.c
index 58e49d5f48a..c949ececa77 100644
--- a/configs/stm32f429i-disco/src/stm32_nsh.c
+++ b/configs/stm32f429i-disco/src/stm32_nsh.c
@@ -68,7 +68,7 @@
 #endif
 #endif
 
-#ifdef CONFIG_STM32_OTGFS2
+#ifdef CONFIG_STM32_OTGHS
 #  include "stm32_usbhost.h"
 #endif
 
@@ -87,7 +87,7 @@
 
 /* Can't support USB host or device features if USB OTG HS is not enabled */
 
-#ifndef CONFIG_STM32_OTGFS2
+#ifndef CONFIG_STM32_OTGHS
 #  undef HAVE_USBDEV
 #  undef HAVE_USBHOST
 #  undef HAVE_USBMONITOR
diff --git a/configs/stm32f429i-disco/src/stm32_usb.c b/configs/stm32f429i-disco/src/stm32_usb.c
index 6740bd3ace8..c37a69c5b7c 100644
--- a/configs/stm32f429i-disco/src/stm32_usb.c
+++ b/configs/stm32f429i-disco/src/stm32_usb.c
@@ -55,7 +55,7 @@
 #include "stm32_otgfs.h"
 #include "stm32f429i-disco.h"
 
-#ifdef CONFIG_STM32_OTGFS2
+#ifdef CONFIG_STM32_OTGHS
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -64,7 +64,7 @@
 #if defined(CONFIG_USBDEV) || defined(CONFIG_USBHOST)
 #  define HAVE_USB 1
 #else
-#  warning "CONFIG_STM32_OTGFS2 is enabled but neither CONFIG_USBDEV nor CONFIG_USBHOST"
+#  warning "CONFIG_STM32_OTGHS is enabled but neither CONFIG_USBDEV nor CONFIG_USBHOST"
 #  undef HAVE_USB
 #endif
 
@@ -148,7 +148,7 @@ void stm32_usbinitialize(void)
 
   /* Configure the OTG HS VBUS sensing GPIO, Power On, and Overcurrent GPIOs */
 
-#ifdef CONFIG_STM32_OTGFS2
+#ifdef CONFIG_STM32_OTGHS
   stm32_configgpio(GPIO_OTGHS_VBUS);
   stm32_configgpio(GPIO_OTGHS_PWRON);
   stm32_configgpio(GPIO_OTGHS_OVER);
@@ -288,5 +288,5 @@ void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 }
 #endif
 
-#endif /* CONFIG_STM32_OTGFS2 */
+#endif /* CONFIG_STM32_OTGHS */
 
diff --git a/configs/stm32f429i-disco/src/stm32f429i-disco.h b/configs/stm32f429i-disco/src/stm32f429i-disco.h
index 90a769c5341..68728d51b30 100644
--- a/configs/stm32f429i-disco/src/stm32f429i-disco.h
+++ b/configs/stm32f429i-disco/src/stm32f429i-disco.h
@@ -149,7 +149,7 @@ void weak_function stm32_spiinitialize(void);
  *
  ****************************************************************************************************/
 
-#ifdef CONFIG_STM32_OTGFS2
+#ifdef CONFIG_STM32_OTGHS
 void weak_function stm32_usbinitialize(void);
 #endif
 
@@ -162,7 +162,7 @@ void weak_function stm32_usbinitialize(void);
  *
  ****************************************************************************************************/
 
-#if defined(CONFIG_STM32_OTGFS2) && defined(CONFIG_USBHOST)
+#if defined(CONFIG_STM32_OTGHS) && defined(CONFIG_USBHOST)
 int stm32_usbhost_initialize(void);
 #endif
 
diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig
index 93eed3eb96f..e207130f6de 100644
--- a/configs/stm32f429i-disco/usbmsc/defconfig
+++ b/configs/stm32f429i-disco/usbmsc/defconfig
@@ -262,7 +262,6 @@ CONFIG_STM32_FSMC=y
 # CONFIG_STM32_LTDC is not set
 # CONFIG_STM32_OTGFS is not set
 CONFIG_STM32_OTGHS=y
-CONFIG_STM32_OTGHS_FS_MODE=y
 CONFIG_STM32_PWR=y
 # CONFIG_STM32_RNG is not set
 # CONFIG_STM32_SDIO is not set
@@ -298,7 +297,6 @@ CONFIG_STM32_USART1=y
 # CONFIG_STM32_IWDG is not set
 # CONFIG_STM32_WWDG is not set
 CONFIG_STM32_SPI=y
-CONFIG_STM32_OTGFS2=y
 
 #
 # Alternate Pin Mapping
diff --git a/configs/stm32f429i-disco/usbmsc/setenv.sh b/configs/stm32f429i-disco/usbmsc/setenv.sh
index a11e9434ad1..275653e1a77 100644
--- a/configs/stm32f429i-disco/usbmsc/setenv.sh
+++ b/configs/stm32f429i-disco/usbmsc/setenv.sh
@@ -57,6 +57,7 @@ fi
 # the CodeSourcery toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
 export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
+#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
 
 # These are the Cygwin paths to the locations where I installed the Atollic
 # toolchain under windows.  You will also have to edit this if you install
diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig
index 3a712602977..1c7f40e3359 100644
--- a/configs/stm32f429i-disco/usbnsh/defconfig
+++ b/configs/stm32f429i-disco/usbnsh/defconfig
@@ -259,7 +259,6 @@ CONFIG_STM32_FSMC=y
 # CONFIG_STM32_LTDC is not set
 # CONFIG_STM32_OTGFS is not set
 CONFIG_STM32_OTGHS=y
-CONFIG_STM32_OTGHS_FS_MODE=y
 CONFIG_STM32_PWR=y
 # CONFIG_STM32_RNG is not set
 # CONFIG_STM32_SDIO is not set
@@ -295,7 +294,6 @@ CONFIG_STM32_USART1=y
 # CONFIG_STM32_IWDG is not set
 # CONFIG_STM32_WWDG is not set
 CONFIG_STM32_SPI=y
-CONFIG_STM32_OTGFS2=y
 
 #
 # Alternate Pin Mapping
diff --git a/configs/stm32f429i-disco/usbnsh/setenv.sh b/configs/stm32f429i-disco/usbnsh/setenv.sh
index a11e9434ad1..275653e1a77 100644
--- a/configs/stm32f429i-disco/usbnsh/setenv.sh
+++ b/configs/stm32f429i-disco/usbnsh/setenv.sh
@@ -57,6 +57,7 @@ fi
 # the CodeSourcery toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
 export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
+#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
 
 # These are the Cygwin paths to the locations where I installed the Atollic
 # toolchain under windows.  You will also have to edit this if you install