Move LPC214X scripts to a subdirectory

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1126 42af7a65-404d-4744-a932-0658087f49c3

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}"

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}"

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

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}"

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

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}"

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}"

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;
 }