diff --git a/configs/mcu123-lpc214x/nsh/setenv.sh b/configs/mcu123-lpc214x/nsh/setenv.sh
index 45a9c5c144d..5b8fc110868 100755
--- a/configs/mcu123-lpc214x/nsh/setenv.sh
+++ b/configs/mcu123-lpc214x/nsh/setenv.sh
@@ -41,6 +41,7 @@ if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
 export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
-export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
+export LPC214XSCRIPTS=$WD/configs/mcu123-lpc214x/scripts
+export PATH=${BUILDROOT_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/mcu123-lpc214x/ostest/setenv.sh b/configs/mcu123-lpc214x/ostest/setenv.sh
index 12915788ddf..fa840b656bc 100755
--- a/configs/mcu123-lpc214x/ostest/setenv.sh
+++ b/configs/mcu123-lpc214x/ostest/setenv.sh
@@ -41,6 +41,7 @@ if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
 export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
-export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
+export LPC214XSCRIPTS=$WD/configs/mcu123-lpc214x/scripts
+export PATH=${BUILDROOT_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/mcu123-lpc214x/lpc21isp.sh b/configs/mcu123-lpc214x/scripts/lpc21isp.sh
similarity index 100%
rename from configs/mcu123-lpc214x/lpc21isp.sh
rename to configs/mcu123-lpc214x/scripts/lpc21isp.sh
diff --git a/configs/mcu123-lpc214x/usbserial/Make.defs b/configs/mcu123-lpc214x/usbserial/Make.defs
index 1e2c433e787..66d4d804559 100644
--- a/configs/mcu123-lpc214x/usbserial/Make.defs
+++ b/configs/mcu123-lpc214x/usbserial/Make.defs
@@ -47,7 +47,7 @@ ARCHPICFLAGS		= -fpic
 ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
 ARCHDEFINES		=
 ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
-ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script
+ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/usbserial/ld.script
 
 CROSSDEV		= arm-elf-
 CC			= $(CROSSDEV)gcc
diff --git a/configs/mcu123-lpc214x/usbserial/setenv.sh b/configs/mcu123-lpc214x/usbserial/setenv.sh
index 4fab9f2f962..fe9114e63a3 100755
--- a/configs/mcu123-lpc214x/usbserial/setenv.sh
+++ b/configs/mcu123-lpc214x/usbserial/setenv.sh
@@ -41,6 +41,7 @@ if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
 export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
-export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
+export LPC214XSCRIPTS=$WD/configs/mcu123-lpc214x/scripts
+export PATH=${BUILDROOT_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/mcu123-lpc214x/usbstorage/Make.defs b/configs/mcu123-lpc214x/usbstorage/Make.defs
index cd04ff3ee3a..97a57de1f4d 100644
--- a/configs/mcu123-lpc214x/usbstorage/Make.defs
+++ b/configs/mcu123-lpc214x/usbstorage/Make.defs
@@ -47,7 +47,7 @@ ARCHPICFLAGS		= -fpic
 ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
 ARCHDEFINES		=
 ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
-ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script
+ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/usbstorage/ld.script
 
 CROSSDEV		= arm-elf-
 CC			= $(CROSSDEV)gcc
diff --git a/configs/mcu123-lpc214x/usbstorage/setenv.sh b/configs/mcu123-lpc214x/usbstorage/setenv.sh
index e24f06bf2a1..f5ca5a07e35 100755
--- a/configs/mcu123-lpc214x/usbstorage/setenv.sh
+++ b/configs/mcu123-lpc214x/usbstorage/setenv.sh
@@ -41,6 +41,7 @@ if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
 export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
-export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
+export LPC214XSCRIPTS=$WD/configs/mcu123-lpc214x/scripts
+export PATH=${BUILDROOT_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/olimex-strp711/ostest/setenv.sh b/configs/olimex-strp711/ostest/setenv.sh
index c18224c194d..0ebf1a2c90f 100755
--- a/configs/olimex-strp711/ostest/setenv.sh
+++ b/configs/olimex-strp711/ostest/setenv.sh
@@ -41,7 +41,7 @@ if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
 export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
-export STR41XCFGS=$WD/configs/olimex-strp711/scripts
-export PATH=${BUILDROOT_BIN}:${STR41XCFGS}:/sbin:/usr/sbin:${PATH_ORIG}
+export STR41XSCRIPTS=$WD/configs/olimex-strp711/scripts
+export PATH=${BUILDROOT_BIN}:${STR41XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/configs/olimex-strp711/src/up_spi.c b/configs/olimex-strp711/src/up_spi.c
index a4d6074a3f0..707f7fa0666 100644
--- a/configs/olimex-strp711/src/up_spi.c
+++ b/configs/olimex-strp711/src/up_spi.c
@@ -665,8 +665,10 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR ubyte *buffer, size_t b
 FAR struct spi_dev_s *up_spiinitialize(int port)
 {
   FAR struct spi_dev_s *ret;
+  irqstate_t flags;
   uint16 reg16;
 
+  flags = irqsave();
 #ifdef CONFIG_STR71X_BSPI0
   if (port == 0)
     {
@@ -762,6 +764,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
     {
       ret = NULL;
     }
+  irqrestore(flags);
   return ret;
 }