diff options
| -rwxr-xr-x | nuttx/configs/mcu123-lpc214x/nsh/setenv.sh | 3 | ||||
| -rwxr-xr-x | nuttx/configs/mcu123-lpc214x/ostest/setenv.sh | 3 | ||||
| -rwxr-xr-x | nuttx/configs/mcu123-lpc214x/scripts/lpc21isp.sh (renamed from nuttx/configs/mcu123-lpc214x/lpc21isp.sh) | 0 | ||||
| -rw-r--r-- | nuttx/configs/mcu123-lpc214x/usbserial/Make.defs | 2 | ||||
| -rwxr-xr-x | nuttx/configs/mcu123-lpc214x/usbserial/setenv.sh | 3 | ||||
| -rw-r--r-- | nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs | 2 | ||||
| -rwxr-xr-x | nuttx/configs/mcu123-lpc214x/usbstorage/setenv.sh | 3 | ||||
| -rwxr-xr-x | nuttx/configs/olimex-strp711/ostest/setenv.sh | 4 | ||||
| -rw-r--r-- | nuttx/configs/olimex-strp711/src/up_spi.c | 3 |
9 files changed, 15 insertions, 8 deletions
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/setenv.sh b/nuttx/configs/mcu123-lpc214x/nsh/setenv.sh index 45a9c5c14..5b8fc1108 100755 --- a/nuttx/configs/mcu123-lpc214x/nsh/setenv.sh +++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/ostest/setenv.sh b/nuttx/configs/mcu123-lpc214x/ostest/setenv.sh index 12915788d..fa840b656 100755 --- a/nuttx/configs/mcu123-lpc214x/ostest/setenv.sh +++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/lpc21isp.sh b/nuttx/configs/mcu123-lpc214x/scripts/lpc21isp.sh index ccb2025dd..ccb2025dd 100755 --- a/nuttx/configs/mcu123-lpc214x/lpc21isp.sh +++ b/nuttx/configs/mcu123-lpc214x/scripts/lpc21isp.sh diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs b/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs index 1e2c433e7..66d4d8045 100644 --- a/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs +++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/usbserial/setenv.sh b/nuttx/configs/mcu123-lpc214x/usbserial/setenv.sh index 4fab9f2f9..fe9114e63 100755 --- a/nuttx/configs/mcu123-lpc214x/usbserial/setenv.sh +++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs b/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs index cd04ff3ee..97a57de1f 100644 --- a/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs +++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/usbstorage/setenv.sh b/nuttx/configs/mcu123-lpc214x/usbstorage/setenv.sh index e24f06bf2..f5ca5a07e 100755 --- a/nuttx/configs/mcu123-lpc214x/usbstorage/setenv.sh +++ b/nuttx/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/nuttx/configs/olimex-strp711/ostest/setenv.sh b/nuttx/configs/olimex-strp711/ostest/setenv.sh index c18224c19..0ebf1a2c9 100755 --- a/nuttx/configs/olimex-strp711/ostest/setenv.sh +++ b/nuttx/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/nuttx/configs/olimex-strp711/src/up_spi.c b/nuttx/configs/olimex-strp711/src/up_spi.c index a4d6074a3..707f7fa06 100644 --- a/nuttx/configs/olimex-strp711/src/up_spi.c +++ b/nuttx/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; } |