diff --git a/configs/c5471evm/httpd/setenv.sh b/configs/c5471evm/httpd/setenv.sh
index e9ab8023a6d..0266456ffda 100755
--- a/configs/c5471evm/httpd/setenv.sh
+++ b/configs/c5471evm/httpd/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/c5471evm/nettest/setenv.sh b/configs/c5471evm/nettest/setenv.sh
index 67bcbc1f68e..403b923332e 100755
--- a/configs/c5471evm/nettest/setenv.sh
+++ b/configs/c5471evm/nettest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/c5471evm/nsh/setenv.sh b/configs/c5471evm/nsh/setenv.sh
index 0693ede0ac2..d5be870e636 100755
--- a/configs/c5471evm/nsh/setenv.sh
+++ b/configs/c5471evm/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/c5471evm/ostest/setenv.sh b/configs/c5471evm/ostest/setenv.sh
index e48437a4191..bfe9d48c204 100755
--- a/configs/c5471evm/ostest/setenv.sh
+++ b/configs/c5471evm/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/compal_e88/nsh_highram/setenv.sh b/configs/compal_e88/nsh_highram/setenv.sh
index 0693ede0ac2..d5be870e636 100644
--- a/configs/compal_e88/nsh_highram/setenv.sh
+++ b/configs/compal_e88/nsh_highram/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/compal_e99/nsh_compalram/setenv.sh b/configs/compal_e99/nsh_compalram/setenv.sh
index 0693ede0ac2..d5be870e636 100644
--- a/configs/compal_e99/nsh_compalram/setenv.sh
+++ b/configs/compal_e99/nsh_compalram/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/compal_e99/nsh_highram/setenv.sh b/configs/compal_e99/nsh_highram/setenv.sh
index 0693ede0ac2..d5be870e636 100644
--- a/configs/compal_e99/nsh_highram/setenv.sh
+++ b/configs/compal_e99/nsh_highram/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/demo9s12ne64/ostest/setenv.sh b/configs/demo9s12ne64/ostest/setenv.sh
index 8f47650ca5e..b78b638a30f 100755
--- a/configs/demo9s12ne64/ostest/setenv.sh
+++ b/configs/demo9s12ne64/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_m9s12x/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_m9s12x/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/eagle100/httpd/setenv.sh b/configs/eagle100/httpd/setenv.sh
index e17655b0a36..9022695a4d3 100755
--- a/configs/eagle100/httpd/setenv.sh
+++ b/configs/eagle100/httpd/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/eagle100/nettest/setenv.sh b/configs/eagle100/nettest/setenv.sh
index ce89c68aac6..f03beff85a2 100755
--- a/configs/eagle100/nettest/setenv.sh
+++ b/configs/eagle100/nettest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/eagle100/nsh/setenv.sh b/configs/eagle100/nsh/setenv.sh
index 93396cb736b..c64bfed542c 100755
--- a/configs/eagle100/nsh/setenv.sh
+++ b/configs/eagle100/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/eagle100/nxflat/setenv.sh b/configs/eagle100/nxflat/setenv.sh
index 39afe386f7e..2335de19076 100755
--- a/configs/eagle100/nxflat/setenv.sh
+++ b/configs/eagle100/nxflat/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/eagle100/ostest/setenv.sh b/configs/eagle100/ostest/setenv.sh
index c3c1f581dbd..843f4283a7a 100755
--- a/configs/eagle100/ostest/setenv.sh
+++ b/configs/eagle100/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/eagle100/thttpd/setenv.sh b/configs/eagle100/thttpd/setenv.sh
index 4dc148e65a9..1217e85fe77 100755
--- a/configs/eagle100/thttpd/setenv.sh
+++ b/configs/eagle100/thttpd/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/ekk-lm3s9b96/nsh/setenv.sh b/configs/ekk-lm3s9b96/nsh/setenv.sh
index 568615fa315..6e591e0dd75 100755
--- a/configs/ekk-lm3s9b96/nsh/setenv.sh
+++ b/configs/ekk-lm3s9b96/nsh/setenv.sh
@@ -51,7 +51,7 @@ fi
 # TOOLCHAIN_BIN must be defined to the full path to the location where you
 # have installed the toolchain of your choice.  Modify the following:
 
-export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Andd add the toolchain path to the PATH variable
 
diff --git a/configs/ekk-lm3s9b96/ostest/setenv.sh b/configs/ekk-lm3s9b96/ostest/setenv.sh
index a5e320cf65e..d98c6cc40c1 100755
--- a/configs/ekk-lm3s9b96/ostest/setenv.sh
+++ b/configs/ekk-lm3s9b96/ostest/setenv.sh
@@ -51,7 +51,7 @@ fi
 # TOOLCHAIN_BIN must be defined to the full path to the location where you
 # have installed the toolchain of your choice.  Modify the following:
 
-export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Andd add the toolchain path to the PATH variable
 
diff --git a/configs/hymini-stm32v/buttons/setenv.sh b/configs/hymini-stm32v/buttons/setenv.sh
index df0dba31803..b62f59c96fb 100755
--- a/configs/hymini-stm32v/buttons/setenv.sh
+++ b/configs/hymini-stm32v/buttons/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/hymini-stm32v/nsh/setenv.sh b/configs/hymini-stm32v/nsh/setenv.sh
index a0371cdce40..6298970589b 100755
--- a/configs/hymini-stm32v/nsh/setenv.sh
+++ b/configs/hymini-stm32v/nsh/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/hymini-stm32v/nxlines/setenv.sh b/configs/hymini-stm32v/nxlines/setenv.sh
index 53ccb2d0f2c..2027fbac91f 100755
--- a/configs/hymini-stm32v/nxlines/setenv.sh
+++ b/configs/hymini-stm32v/nxlines/setenv.sh
@@ -47,7 +47,7 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/hymini-stm32v/usbserial/setenv.sh b/configs/hymini-stm32v/usbserial/setenv.sh
index 6b324148d26..a334f1c3c5c 100755
--- a/configs/hymini-stm32v/usbserial/setenv.sh
+++ b/configs/hymini-stm32v/usbserial/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/hymini-stm32v/usbstorage/setenv.sh b/configs/hymini-stm32v/usbstorage/setenv.sh
index a0371cdce40..6298970589b 100755
--- a/configs/hymini-stm32v/usbstorage/setenv.sh
+++ b/configs/hymini-stm32v/usbstorage/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/lincoln60/nsh/setenv.sh b/configs/lincoln60/nsh/setenv.sh
index ef3ca7f676f..ffa6420b92a 100755
--- a/configs/lincoln60/nsh/setenv.sh
+++ b/configs/lincoln60/nsh/setenv.sh
@@ -50,7 +50,7 @@ fi
 # TOOLCHAIN_BIN must be defined to the full path to the location where you
 # have installed the toolchain of your choice.  Modify the following:
 
-export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Andd add the toolchain path to the PATH variable
 
diff --git a/configs/lincoln60/ostest/setenv.sh b/configs/lincoln60/ostest/setenv.sh
index 19c43760fcd..c0bf7c70534 100755
--- a/configs/lincoln60/ostest/setenv.sh
+++ b/configs/lincoln60/ostest/setenv.sh
@@ -50,7 +50,7 @@ fi
 # TOOLCHAIN_BIN must be defined to the full path to the location where you
 # have installed the toolchain of your choice.  Modify the following:
 
-export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Andd add the toolchain path to the PATH variable
 
diff --git a/configs/lm3s6432-s2e/nsh/setenv.sh b/configs/lm3s6432-s2e/nsh/setenv.sh
index 3cd011f121e..5abb6085a2d 100644
--- a/configs/lm3s6432-s2e/nsh/setenv.sh
+++ b/configs/lm3s6432-s2e/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/lm3s6432-s2e/ostest/setenv.sh b/configs/lm3s6432-s2e/ostest/setenv.sh
index 2cccdc70e6d..d680306a23c 100644
--- a/configs/lm3s6432-s2e/ostest/setenv.sh
+++ b/configs/lm3s6432-s2e/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/lm3s6965-ek/nsh/setenv.sh b/configs/lm3s6965-ek/nsh/setenv.sh
index 0b9389f49e5..0636f2fed36 100755
--- a/configs/lm3s6965-ek/nsh/setenv.sh
+++ b/configs/lm3s6965-ek/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/lm3s6965-ek/nx/setenv.sh b/configs/lm3s6965-ek/nx/setenv.sh
index a364c201727..3edb2710efc 100755
--- a/configs/lm3s6965-ek/nx/setenv.sh
+++ b/configs/lm3s6965-ek/nx/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/lm3s6965-ek/ostest/setenv.sh b/configs/lm3s6965-ek/ostest/setenv.sh
index 6e907ae7a61..686a617016b 100755
--- a/configs/lm3s6965-ek/ostest/setenv.sh
+++ b/configs/lm3s6965-ek/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/lm3s8962-ek/nsh/setenv.sh b/configs/lm3s8962-ek/nsh/setenv.sh
index 4ed5385b639..511552d94b4 100755
--- a/configs/lm3s8962-ek/nsh/setenv.sh
+++ b/configs/lm3s8962-ek/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/lm3s8962-ek/nx/setenv.sh b/configs/lm3s8962-ek/nx/setenv.sh
index 4c76fd73692..a3672508360 100755
--- a/configs/lm3s8962-ek/nx/setenv.sh
+++ b/configs/lm3s8962-ek/nx/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/lm3s8962-ek/ostest/setenv.sh b/configs/lm3s8962-ek/ostest/setenv.sh
index b5ee8be3142..6bd49b6fa07 100755
--- a/configs/lm3s8962-ek/ostest/setenv.sh
+++ b/configs/lm3s8962-ek/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/lpcxpresso-lpc1768/dhcpd/setenv.sh b/configs/lpcxpresso-lpc1768/dhcpd/setenv.sh
index 03641fd6122..8fd20167a63 100755
--- a/configs/lpcxpresso-lpc1768/dhcpd/setenv.sh
+++ b/configs/lpcxpresso-lpc1768/dhcpd/setenv.sh
@@ -42,7 +42,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 WD=`pwd`
 
 # This is where the buildroot might reside on a Linux or Cygwin system
-# export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+# export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # This is the default install location for Code Red on Linux
 export TOOLCHAIN_BIN="/usr/local/LPCXpresso/tools/bin"
diff --git a/configs/lpcxpresso-lpc1768/nsh/setenv.sh b/configs/lpcxpresso-lpc1768/nsh/setenv.sh
index 46d5b3261fd..8ef0628058d 100755
--- a/configs/lpcxpresso-lpc1768/nsh/setenv.sh
+++ b/configs/lpcxpresso-lpc1768/nsh/setenv.sh
@@ -42,7 +42,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 WD=`pwd`
 
 # This is where the buildroot might reside on a Linux or Cygwin system
-# export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+# export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # This is the default install location for Code Red on Linux
 export TOOLCHAIN_BIN="/usr/local/LPCXpresso/tools/bin"
diff --git a/configs/lpcxpresso-lpc1768/nx/setenv.sh b/configs/lpcxpresso-lpc1768/nx/setenv.sh
index 2f04a8ac6d1..565c16b98f6 100755
--- a/configs/lpcxpresso-lpc1768/nx/setenv.sh
+++ b/configs/lpcxpresso-lpc1768/nx/setenv.sh
@@ -42,7 +42,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 WD=`pwd`
 
 # This is where the buildroot might reside on a Linux or Cygwin system
-# export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+# export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # This is the default install location for Code Red on Linux
 export TOOLCHAIN_BIN="/usr/local/LPCXpresso/tools/bin"
diff --git a/configs/lpcxpresso-lpc1768/ostest/setenv.sh b/configs/lpcxpresso-lpc1768/ostest/setenv.sh
index 724d1420d67..47e7468c3b2 100755
--- a/configs/lpcxpresso-lpc1768/ostest/setenv.sh
+++ b/configs/lpcxpresso-lpc1768/ostest/setenv.sh
@@ -42,7 +42,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 WD=`pwd`
 
 # This is where the buildroot might reside on a Linux or Cygwin system
-# export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+# export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # This is the default install location for Code Red on Linux
 export TOOLCHAIN_BIN="/usr/local/LPCXpresso/tools/bin"
diff --git a/configs/lpcxpresso-lpc1768/thttpd/setenv.sh b/configs/lpcxpresso-lpc1768/thttpd/setenv.sh
index 7156a371dde..e6aded0f4b0 100755
--- a/configs/lpcxpresso-lpc1768/thttpd/setenv.sh
+++ b/configs/lpcxpresso-lpc1768/thttpd/setenv.sh
@@ -44,7 +44,7 @@ WD=`pwd`
 # This is where the buildroot might reside on a Linux or Cygwin system
 # A minimal buildroot version with the NXFLAT tools is always required
 # for this configuration in order to buildthe THTTPD CGI programs
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # This is the default install location for Code Red on Linux
 export TOOLCHAIN_BIN="/usr/local/LPCXpresso/tools/bin"
diff --git a/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh b/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh
index 8c4039ddd36..7318183acd1 100755
--- a/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh
+++ b/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh
@@ -42,7 +42,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 WD=`pwd`
 
 # This is where the buildroot might reside on a Linux or Cygwin system
-# export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+# export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # This is the default install location for Code Red on Linux
 export TOOLCHAIN_BIN="/usr/local/LPCXpresso/tools/bin"
diff --git a/configs/m68332evb/setenv.sh b/configs/m68332evb/setenv.sh
index 2882011fdbb..4b52986d310 100755
--- a/configs/m68332evb/setenv.sh
+++ b/configs/m68332evb/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_m68k/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_m68k/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/mbed/hidkbd/setenv.sh b/configs/mbed/hidkbd/setenv.sh
index c3ca070e338..8c14957c894 100644
--- a/configs/mbed/hidkbd/setenv.sh
+++ b/configs/mbed/hidkbd/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/mbed/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/mbed/nsh/setenv.sh b/configs/mbed/nsh/setenv.sh
index f29d9758923..f591fafb190 100755
--- a/configs/mbed/nsh/setenv.sh
+++ b/configs/mbed/nsh/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/mbed/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/mcu123-lpc214x/nsh/setenv.sh b/configs/mcu123-lpc214x/nsh/setenv.sh
index 97295dbd7cb..aeb2998883a 100755
--- a/configs/mcu123-lpc214x/nsh/setenv.sh
+++ b/configs/mcu123-lpc214x/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export LPC214XSCRIPTS="$WD/configs/mcu123-lpc214x/scripts"
 export PATH="${BUILDROOT_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/configs/mcu123-lpc214x/ostest/setenv.sh b/configs/mcu123-lpc214x/ostest/setenv.sh
index 67d8b5d65a1..e71f10f8889 100755
--- a/configs/mcu123-lpc214x/ostest/setenv.sh
+++ b/configs/mcu123-lpc214x/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export LPC214XSCRIPTS="$WD/configs/mcu123-lpc214x/scripts"
 export PATH="${BUILDROOT_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/configs/mcu123-lpc214x/usbserial/setenv.sh b/configs/mcu123-lpc214x/usbserial/setenv.sh
index 8661ee0cb76..59d61b8b83d 100755
--- a/configs/mcu123-lpc214x/usbserial/setenv.sh
+++ b/configs/mcu123-lpc214x/usbserial/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export LPC214XSCRIPTS="$WD/configs/mcu123-lpc214x/scripts"
 export PATH="${BUILDROOT_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/configs/mcu123-lpc214x/usbstorage/setenv.sh b/configs/mcu123-lpc214x/usbstorage/setenv.sh
index f27530656f5..7ea83ccb64d 100755
--- a/configs/mcu123-lpc214x/usbstorage/setenv.sh
+++ b/configs/mcu123-lpc214x/usbstorage/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export LPC214XSCRIPTS="$WD/configs/mcu123-lpc214x/scripts"
 export PATH="${BUILDROOT_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/configs/mx1ads/ostest/setenv.sh b/configs/mx1ads/ostest/setenv.sh
index e73858fc76e..a6fb5b02ac0 100755
--- a/configs/mx1ads/ostest/setenv.sh
+++ b/configs/mx1ads/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/ne64badge/ostest/setenv.sh b/configs/ne64badge/ostest/setenv.sh
index c5aa591b494..c4d6800ed54 100755
--- a/configs/ne64badge/ostest/setenv.sh
+++ b/configs/ne64badge/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_m9s12x/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_m9s12x/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/ntosd-dm320/nettest/setenv.sh b/configs/ntosd-dm320/nettest/setenv.sh
index 8a7788cfd9a..6090d4cea34 100755
--- a/configs/ntosd-dm320/nettest/setenv.sh
+++ b/configs/ntosd-dm320/nettest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/ntosd-dm320/nsh/setenv.sh b/configs/ntosd-dm320/nsh/setenv.sh
index bf3f497adb7..a84e68884b6 100755
--- a/configs/ntosd-dm320/nsh/setenv.sh
+++ b/configs/ntosd-dm320/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/ntosd-dm320/ostest/setenv.sh b/configs/ntosd-dm320/ostest/setenv.sh
index 6ce1e04a85e..a65be2677d0 100755
--- a/configs/ntosd-dm320/ostest/setenv.sh
+++ b/configs/ntosd-dm320/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/ntosd-dm320/poll/setenv.sh b/configs/ntosd-dm320/poll/setenv.sh
index a3479fb1809..de3b64ea904 100755
--- a/configs/ntosd-dm320/poll/setenv.sh
+++ b/configs/ntosd-dm320/poll/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/ntosd-dm320/thttpd/setenv.sh b/configs/ntosd-dm320/thttpd/setenv.sh
index 54700fb6b35..92ff91700e0 100755
--- a/configs/ntosd-dm320/thttpd/setenv.sh
+++ b/configs/ntosd-dm320/thttpd/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/ntosd-dm320/udp/setenv.sh b/configs/ntosd-dm320/udp/setenv.sh
index a2e1ffec738..052413b089e 100755
--- a/configs/ntosd-dm320/udp/setenv.sh
+++ b/configs/ntosd-dm320/udp/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/ntosd-dm320/uip/setenv.sh b/configs/ntosd-dm320/uip/setenv.sh
index ccc74829d8f..988e0a1269e 100755
--- a/configs/ntosd-dm320/uip/setenv.sh
+++ b/configs/ntosd-dm320/uip/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/nucleus2g/nsh/setenv.sh b/configs/nucleus2g/nsh/setenv.sh
index ffdc74e9b90..977e0d474cf 100755
--- a/configs/nucleus2g/nsh/setenv.sh
+++ b/configs/nucleus2g/nsh/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/nucleus2g/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/nucleus2g/ostest/setenv.sh b/configs/nucleus2g/ostest/setenv.sh
index 6a78a5c239b..d52412b4b0c 100755
--- a/configs/nucleus2g/ostest/setenv.sh
+++ b/configs/nucleus2g/ostest/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/nucleus2g/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/nucleus2g/usbserial/setenv.sh b/configs/nucleus2g/usbserial/setenv.sh
index 9333b3a2f59..cbd2e8d81cc 100755
--- a/configs/nucleus2g/usbserial/setenv.sh
+++ b/configs/nucleus2g/usbserial/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/nucleus2g/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/nucleus2g/usbstorage/setenv.sh b/configs/nucleus2g/usbstorage/setenv.sh
index e6f7197fd74..2443be4e138 100755
--- a/configs/nucleus2g/usbstorage/setenv.sh
+++ b/configs/nucleus2g/usbstorage/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/nucleus2g/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/olimex-lpc1766stk/ftpc/setenv.sh b/configs/olimex-lpc1766stk/ftpc/setenv.sh
index 85d20db3248..df109169008 100755
--- a/configs/olimex-lpc1766stk/ftpc/setenv.sh
+++ b/configs/olimex-lpc1766stk/ftpc/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/olimex-lpc1766stk/hidkbd/setenv.sh b/configs/olimex-lpc1766stk/hidkbd/setenv.sh
index 7bdba25d768..e4e130c24a1 100755
--- a/configs/olimex-lpc1766stk/hidkbd/setenv.sh
+++ b/configs/olimex-lpc1766stk/hidkbd/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/olimex-lpc1766stk/nettest/setenv.sh b/configs/olimex-lpc1766stk/nettest/setenv.sh
index 58951dc840f..92c6bdf5ec2 100755
--- a/configs/olimex-lpc1766stk/nettest/setenv.sh
+++ b/configs/olimex-lpc1766stk/nettest/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/olimex-lpc1766stk/nsh/setenv.sh b/configs/olimex-lpc1766stk/nsh/setenv.sh
index 4b9bec6d049..089165f694c 100755
--- a/configs/olimex-lpc1766stk/nsh/setenv.sh
+++ b/configs/olimex-lpc1766stk/nsh/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/olimex-lpc1766stk/nx/setenv.sh b/configs/olimex-lpc1766stk/nx/setenv.sh
index a2027d727cc..69cee3997c5 100755
--- a/configs/olimex-lpc1766stk/nx/setenv.sh
+++ b/configs/olimex-lpc1766stk/nx/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/olimex-lpc1766stk/ostest/setenv.sh b/configs/olimex-lpc1766stk/ostest/setenv.sh
index 996cefc4e87..b61805da06c 100755
--- a/configs/olimex-lpc1766stk/ostest/setenv.sh
+++ b/configs/olimex-lpc1766stk/ostest/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/olimex-lpc1766stk/slip-httpd/setenv.sh b/configs/olimex-lpc1766stk/slip-httpd/setenv.sh
index 546ca1e3a4c..50364e4a1c0 100755
--- a/configs/olimex-lpc1766stk/slip-httpd/setenv.sh
+++ b/configs/olimex-lpc1766stk/slip-httpd/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/olimex-lpc1766stk/thttpd/setenv.sh b/configs/olimex-lpc1766stk/thttpd/setenv.sh
index 09288f04c02..2a9ddae159f 100755
--- a/configs/olimex-lpc1766stk/thttpd/setenv.sh
+++ b/configs/olimex-lpc1766stk/thttpd/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/olimex-lpc1766stk/usbserial/setenv.sh b/configs/olimex-lpc1766stk/usbserial/setenv.sh
index f755b6afe90..b12d65852ef 100755
--- a/configs/olimex-lpc1766stk/usbserial/setenv.sh
+++ b/configs/olimex-lpc1766stk/usbserial/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/olimex-lpc1766stk/usbstorage/setenv.sh b/configs/olimex-lpc1766stk/usbstorage/setenv.sh
index e41283c4388..58fd5d04d59 100755
--- a/configs/olimex-lpc1766stk/usbstorage/setenv.sh
+++ b/configs/olimex-lpc1766stk/usbstorage/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/olimex-lpc1766stk/wlan/setenv.sh b/configs/olimex-lpc1766stk/wlan/setenv.sh
index 1b87dab69c9..6e6c79ab2e5 100755
--- a/configs/olimex-lpc1766stk/wlan/setenv.sh
+++ b/configs/olimex-lpc1766stk/wlan/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/olimex-lpc2378/nsh/setenv.sh b/configs/olimex-lpc2378/nsh/setenv.sh
index 9a2e92e4324..15808d32b71 100755
--- a/configs/olimex-lpc2378/nsh/setenv.sh
+++ b/configs/olimex-lpc2378/nsh/setenv.sh
@@ -45,7 +45,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export LPC23XXSCRIPTS="$WD/configs/olimex-lpc2378/scripts"
 export PATH="${BUILDROOT_BIN}:${LPC23XXSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/configs/olimex-lpc2378/ostest/setenv.sh b/configs/olimex-lpc2378/ostest/setenv.sh
index 73bf3d22399..9e7ff11fc8f 100755
--- a/configs/olimex-lpc2378/ostest/setenv.sh
+++ b/configs/olimex-lpc2378/ostest/setenv.sh
@@ -45,7 +45,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export LPC23XXSCRIPTS="$WD/configs/olimex-lpc2378/scripts"
 export PATH="${BUILDROOT_BIN}:${LPC23XXSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/configs/olimex-strp711/nettest/setenv.sh b/configs/olimex-strp711/nettest/setenv.sh
index bc47c3ed8a2..74003581bdf 100755
--- a/configs/olimex-strp711/nettest/setenv.sh
+++ b/configs/olimex-strp711/nettest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export STR41XSCRIPTS="$WD/configs/olimex-strp711/scripts"
 export PATH="${BUILDROOT_BIN}:${STR41XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/configs/olimex-strp711/nsh/setenv.sh b/configs/olimex-strp711/nsh/setenv.sh
index 6724741f697..f6d22c1ec01 100755
--- a/configs/olimex-strp711/nsh/setenv.sh
+++ b/configs/olimex-strp711/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export STR41XSCRIPTS="$WD/configs/olimex-strp711/scripts"
 export PATH="${BUILDROOT_BIN}:${STR41XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/configs/olimex-strp711/ostest/setenv.sh b/configs/olimex-strp711/ostest/setenv.sh
index c9454d26f6a..f20997352a7 100755
--- a/configs/olimex-strp711/ostest/setenv.sh
+++ b/configs/olimex-strp711/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export STR41XSCRIPTS="$WD/configs/olimex-strp711/scripts"
 export PATH="${BUILDROOT_BIN}:${STR41XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/configs/qemu-i486/nsh/setenv.sh b/configs/qemu-i486/nsh/setenv.sh
index 25ae59d71bd..5542bc4e210 100755
--- a/configs/qemu-i486/nsh/setenv.sh
+++ b/configs/qemu-i486/nsh/setenv.sh
@@ -42,7 +42,7 @@ if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 # Uncomment and modify the following if you are using anything other
 # than the system GCC
 # WD=`pwd`
-# export BUILDROOT_BIN="${WD}/../../../buildroot/build_i486/staging_dir/bin"
+# export BUILDROOT_BIN="${WD}/../../../misc/buildroot/build_i486/staging_dir/bin"
 # export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/qemu-i486/ostest/setenv.sh b/configs/qemu-i486/ostest/setenv.sh
index f9c3bdec8d6..a3c68d79747 100755
--- a/configs/qemu-i486/ostest/setenv.sh
+++ b/configs/qemu-i486/ostest/setenv.sh
@@ -42,7 +42,7 @@ if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 # Uncomment and modify the following if you are using anything other
 # than the system GCC
 # WD=`pwd`
-# export BUILDROOT_BIN="${WD}/../../../buildroot/build_i486/staging_dir/bin"
+# export BUILDROOT_BIN="${WD}/../../../misc/buildroot/build_i486/staging_dir/bin"
 # export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/sam3u-ek/knsh/setenv.sh b/configs/sam3u-ek/knsh/setenv.sh
index 3b27c3d9f98..1b8842e821a 100755
--- a/configs/sam3u-ek/knsh/setenv.sh
+++ b/configs/sam3u-ek/knsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/sam3u-ek/nsh/setenv.sh b/configs/sam3u-ek/nsh/setenv.sh
index 3f4e60221c5..ae56ecc43ba 100755
--- a/configs/sam3u-ek/nsh/setenv.sh
+++ b/configs/sam3u-ek/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/sam3u-ek/nx/setenv.sh b/configs/sam3u-ek/nx/setenv.sh
index a7e9efc8437..2730db642a1 100755
--- a/configs/sam3u-ek/nx/setenv.sh
+++ b/configs/sam3u-ek/nx/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/sam3u-ek/ostest/setenv.sh b/configs/sam3u-ek/ostest/setenv.sh
index 06d5eb54733..ab0f8bd9699 100755
--- a/configs/sam3u-ek/ostest/setenv.sh
+++ b/configs/sam3u-ek/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/sam3u-ek/touchscreen/setenv.sh b/configs/sam3u-ek/touchscreen/setenv.sh
index d5af12280f7..868c4de3891 100755
--- a/configs/sam3u-ek/touchscreen/setenv.sh
+++ b/configs/sam3u-ek/touchscreen/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/skp16c26/ostest/setenv.sh b/configs/skp16c26/ostest/setenv.sh
index a74258fb840..72c16064b9b 100755
--- a/configs/skp16c26/ostest/setenv.sh
+++ b/configs/skp16c26/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_m32c/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_m32c/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/stm3210e-eval/RIDE/setenv.sh b/configs/stm3210e-eval/RIDE/setenv.sh
index b7341113634..40872c164b2 100755
--- a/configs/stm3210e-eval/RIDE/setenv.sh
+++ b/configs/stm3210e-eval/RIDE/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/stm3210e-eval/buttons/setenv.sh b/configs/stm3210e-eval/buttons/setenv.sh
index 2bdf5367426..0afc622fba6 100755
--- a/configs/stm3210e-eval/buttons/setenv.sh
+++ b/configs/stm3210e-eval/buttons/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/stm3210e-eval/nsh/setenv.sh b/configs/stm3210e-eval/nsh/setenv.sh
index ee33a8d21de..ff9a4bf8ae4 100755
--- a/configs/stm3210e-eval/nsh/setenv.sh
+++ b/configs/stm3210e-eval/nsh/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/stm3210e-eval/nxlines/setenv.sh b/configs/stm3210e-eval/nxlines/setenv.sh
index a9dc78c74d2..90e6fa05cec 100755
--- a/configs/stm3210e-eval/nxlines/setenv.sh
+++ b/configs/stm3210e-eval/nxlines/setenv.sh
@@ -47,7 +47,7 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/stm3210e-eval/ostest/setenv.sh b/configs/stm3210e-eval/ostest/setenv.sh
index 046a7f5acfa..43495b51421 100755
--- a/configs/stm3210e-eval/ostest/setenv.sh
+++ b/configs/stm3210e-eval/ostest/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/stm3210e-eval/usbserial/setenv.sh b/configs/stm3210e-eval/usbserial/setenv.sh
index 046a7f5acfa..43495b51421 100755
--- a/configs/stm3210e-eval/usbserial/setenv.sh
+++ b/configs/stm3210e-eval/usbserial/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/stm3210e-eval/usbstorage/setenv.sh b/configs/stm3210e-eval/usbstorage/setenv.sh
index ee33a8d21de..ff9a4bf8ae4 100755
--- a/configs/stm3210e-eval/usbstorage/setenv.sh
+++ b/configs/stm3210e-eval/usbstorage/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/configs/stm3220g-eval/nsh/setenv.sh b/configs/stm3220g-eval/nsh/setenv.sh
index 489322177a8..fcec398eb35 100755
--- a/configs/stm3220g-eval/nsh/setenv.sh
+++ b/configs/stm3220g-eval/nsh/setenv.sh
@@ -67,7 +67,7 @@ fi
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH variable
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/configs/stm3220g-eval/nsh2/setenv.sh b/configs/stm3220g-eval/nsh2/setenv.sh
index 1e2f87b403f..af7403656fd 100755
--- a/configs/stm3220g-eval/nsh2/setenv.sh
+++ b/configs/stm3220g-eval/nsh2/setenv.sh
@@ -66,7 +66,7 @@ fi
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH variable
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/configs/stm3220g-eval/nxwm/setenv.sh b/configs/stm3220g-eval/nxwm/setenv.sh
index ff642018e49..8585313914e 100755
--- a/configs/stm3220g-eval/nxwm/setenv.sh
+++ b/configs/stm3220g-eval/nxwm/setenv.sh
@@ -67,7 +67,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH variable
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/configs/us7032evb1/nsh/setenv.sh b/configs/us7032evb1/nsh/setenv.sh
index d2313361286..fabcfb1de9e 100755
--- a/configs/us7032evb1/nsh/setenv.sh
+++ b/configs/us7032evb1/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_sh/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_sh/staging_dir/bin
 export SH1BINARIES=$WD/configs/us7032evb1/bin
 export PATH=${BUILDROOT_BIN}:${SH1BINARIES}:/sbin:/usr/sbin:${PATH_ORIG}
 
diff --git a/configs/us7032evb1/ostest/setenv.sh b/configs/us7032evb1/ostest/setenv.sh
index ac37e9150f6..6a923c95921 100755
--- a/configs/us7032evb1/ostest/setenv.sh
+++ b/configs/us7032evb1/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_sh/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_sh/staging_dir/bin
 export SH1BINARIES=$WD/configs/us7032evb1/bin
 export PATH=${BUILDROOT_BIN}:${SH1BINARIES}:/sbin:/usr/sbin:${PATH_ORIG}
 
diff --git a/configs/vsn/nsh/setenv.sh b/configs/vsn/nsh/setenv.sh
index 3b9f7f8967a..a01a604c0cc 100755
--- a/configs/vsn/nsh/setenv.sh
+++ b/configs/vsn/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"