diff --git a/configs/pcduino-a10/nsh/setenv.sh b/configs/pcduino-a10/nsh/setenv.sh
index 90ffc1815e5..cfde48e376d 100755
--- a/configs/pcduino-a10/nsh/setenv.sh
+++ b/configs/pcduino-a10/nsh/setenv.sh
@@ -68,7 +68,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_Code
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH varialble
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/configs/sama5d3x-ek/demo/setenv.sh b/configs/sama5d3x-ek/demo/setenv.sh
index 67d01fc39ec..8061119a04e 100755
--- a/configs/sama5d3x-ek/demo/setenv.sh
+++ b/configs/sama5d3x-ek/demo/setenv.sh
@@ -68,7 +68,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_Code
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH varialble
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/configs/sama5d3x-ek/hello/setenv.sh b/configs/sama5d3x-ek/hello/setenv.sh
index 61d85830e02..3f8d78f8de8 100755
--- a/configs/sama5d3x-ek/hello/setenv.sh
+++ b/configs/sama5d3x-ek/hello/setenv.sh
@@ -68,7 +68,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_Code
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH varialble
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/configs/sama5d3x-ek/norboot/setenv.sh b/configs/sama5d3x-ek/norboot/setenv.sh
index 5e2742547af..bf2e5c0fe06 100755
--- a/configs/sama5d3x-ek/norboot/setenv.sh
+++ b/configs/sama5d3x-ek/norboot/setenv.sh
@@ -68,7 +68,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_Code
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH varialble
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/configs/sama5d3x-ek/nsh/setenv.sh b/configs/sama5d3x-ek/nsh/setenv.sh
index 5145f93a030..ae74c56dbb1 100755
--- a/configs/sama5d3x-ek/nsh/setenv.sh
+++ b/configs/sama5d3x-ek/nsh/setenv.sh
@@ -68,7 +68,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_Code
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH varialble
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/configs/sama5d3x-ek/nx/setenv.sh b/configs/sama5d3x-ek/nx/setenv.sh
index 830126b00e9..7642014bf71 100755
--- a/configs/sama5d3x-ek/nx/setenv.sh
+++ b/configs/sama5d3x-ek/nx/setenv.sh
@@ -68,7 +68,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_Code
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH varialble
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/configs/sama5d3x-ek/nxwm/setenv.sh b/configs/sama5d3x-ek/nxwm/setenv.sh
index 4446aace462..d14cbedf942 100755
--- a/configs/sama5d3x-ek/nxwm/setenv.sh
+++ b/configs/sama5d3x-ek/nxwm/setenv.sh
@@ -68,7 +68,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_Code
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH varialble
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/configs/sama5d3x-ek/ostest/setenv.sh b/configs/sama5d3x-ek/ostest/setenv.sh
index 9b2028586a6..da8ac634941 100755
--- a/configs/sama5d3x-ek/ostest/setenv.sh
+++ b/configs/sama5d3x-ek/ostest/setenv.sh
@@ -68,7 +68,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_Code
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH varialble
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/configs/sama5d3x-ek/ov2640/setenv.sh b/configs/sama5d3x-ek/ov2640/setenv.sh
index a73c27b7a77..f19f1b92100 100755
--- a/configs/sama5d3x-ek/ov2640/setenv.sh
+++ b/configs/sama5d3x-ek/ov2640/setenv.sh
@@ -68,7 +68,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_Code
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH varialble
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"