diff --git a/configs/mcu123-lpc214x/nsh/setenv.sh b/configs/mcu123-lpc214x/nsh/setenv.sh
index 45a9c5c144d65cf77e063f49ddc115eec8e77183..5b8fc1108684a108ebf39e3dcd323ed0ca7dca97 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 12915788ddffb7e85241b8d795e3fbcc7da6f414..fa840b656bc6a9d947cdc161e593a87dcf9efba4 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 1e2c433e787679ce912f8a45548dec9b48095cf3..66d4d8045594859a8d351a995829d77eaa2cdd56 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 4fab9f2f962ca78f0e7da7870cd15fb56dcdb6cb..fe9114e63a357a8deaebb4df62dbd15cb8df2f64 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 cd04ff3ee3ab9a08f750db7640dd6b4667aab086..97a57de1f4dba79ae2bc3d075c0bb8a9f4974d8f 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 e24f06bf2a1d82f1f437a85439d7051011d697da..f5ca5a07e35b1a78352262e0f8121de03968db63 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 c18224c194d5345be8c596f8855977dc7cd9c0c2..0ebf1a2c90fdda7cedb0cf5214422d43762909ee 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 a4d6074a3f0a1a2d0e28cd43df5dde14bf45a70a..707f7fa0666ed4e9eedf1ab7b4d8b2d050afefce 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;
 }