sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/, Various Makefiles: Fix mixed references to nuttx/lib. These need to be changed to nuttx/staging.

Browse Source
This commit is contained in:
Gregory Nutt 2018-05-30 11:08:13 -06:00
parent 06dae98ce2
commit 634dd7709b
15 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -63,7 +63,7 @@ $(foreach BDIR, $(BUILDIRS), $(eval $(call Add_Application,$(BDIR))))
# Library path # Library path
LIBPATH ?= $(TOPDIR)$(DELIM)libs LIBPATH ?= $(TOPDIR)$(DELIM)staging
# The install path # The install path

4
examples/elf/tests/errno/Makefile
View File

@ -39,9 +39,9 @@ OBJEXT ?= .o
DELIM ?= / DELIM ?= /
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}" NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else else
NUTTXLIB = "$(TOPDIR)$(DELIM)lib" NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
endif endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y) ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)

4
examples/elf/tests/hello/Makefile
View File

@ -39,9 +39,9 @@ OBJEXT ?= .o
DELIM ?= / DELIM ?= /
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}" NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else else
NUTTXLIB = "$(TOPDIR)$(DELIM)lib" NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
endif endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y) ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)

4
examples/elf/tests/helloxx/Makefile
View File

@ -39,9 +39,9 @@ OBJEXT ?= .o
DELIM ?= / DELIM ?= /
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}" NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else else
NUTTXLIB = "$(TOPDIR)$(DELIM)lib" NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
endif endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y) ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)

4
examples/elf/tests/longjmp/Makefile
View File

@ -39,9 +39,9 @@ OBJEXT ?= .o
DELIM ?= / DELIM ?= /
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}" NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else else
NUTTXLIB = "$(TOPDIR)$(DELIM)lib" NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
endif endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y) ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)

4
examples/elf/tests/mutex/Makefile
View File

@ -39,9 +39,9 @@ OBJEXT ?= .o
DELIM ?= / DELIM ?= /
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}" NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else else
NUTTXLIB = "$(TOPDIR)$(DELIM)lib" NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
endif endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y) ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)

4
examples/elf/tests/pthread/Makefile
View File

@ -39,9 +39,9 @@ OBJEXT ?= .o
DELIM ?= / DELIM ?= /
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}" NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else else
NUTTXLIB = "$(TOPDIR)$(DELIM)lib" NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
endif endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y) ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)

4
examples/elf/tests/signal/Makefile
View File

@ -39,9 +39,9 @@ OBJEXT ?= .o
DELIM ?= / DELIM ?= /
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}" NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else else
NUTTXLIB = "$(TOPDIR)$(DELIM)lib" NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
endif endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y) ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)

4
examples/elf/tests/struct/Makefile
View File

@ -41,9 +41,9 @@ DELIM ?= /
CELFFLAGS += -I. CELFFLAGS += -I.
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}" NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else else
NUTTXLIB = "$(TOPDIR)$(DELIM)lib" NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
endif endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y) ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)

4
examples/elf/tests/task/Makefile
View File

@ -39,9 +39,9 @@ OBJEXT ?= .o
DELIM ?= / DELIM ?= /
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}" NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else else
NUTTXLIB = "$(TOPDIR)$(DELIM)lib" NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
endif endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y) ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)

4
examples/module/drivers/chardev/Makefile
View File

@ -40,9 +40,9 @@ OBJEXT ?= .o
DELIM ?= / DELIM ?= /
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}" NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else else
NUTTXLIB = "$(TOPDIR)$(DELIM)lib" NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
endif endif
KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__} KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}

4
examples/sotest/lib/modprint/Makefile
View File

@ -40,9 +40,9 @@ OBJEXT ?= .o
DELIM ?= / DELIM ?= /
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}" NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else else
NUTTXLIB = "$(TOPDIR)$(DELIM)lib" NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
endif endif
KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__} KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}

4
examples/sotest/lib/sotest/Makefile
View File

@ -40,9 +40,9 @@ OBJEXT ?= .o
DELIM ?= / DELIM ?= /
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}" NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else else
NUTTXLIB = "$(TOPDIR)$(DELIM)lib" NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
endif endif
KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__} KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}

4
import/Make.defs
View File

@ -186,10 +186,10 @@ AFLAGS = $(CFLAGS) -D__ASSEMBLY__
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
# Windows-native toolchains # Windows-native toolchains
LDLIBPATH = -L "${shell cygpath -w $(APPDIR)}" -L "${shell cygpath -w $(TOPDIR)$(DELIM)libs}" LDLIBPATH = -L "${shell cygpath -w $(APPDIR)}" -L "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else else
# Linux/Cygwin-native toolchain # Linux/Cygwin-native toolchain
LDLIBPATH = -L $(APPDIR) -L $(TOPDIR)$(DELIM)libs LDLIBPATH = -L $(APPDIR) -L $(TOPDIR)$(DELIM)staging
endif endif
LDLIBS = -lapps -lnuttx LDLIBS = -lapps -lnuttx

1
system/zmodem/zm_proto.c
View File

@ -312,6 +312,7 @@ int zm_sendhexhdr(FAR struct zm_state_s *pzm, int type,
} }
/* crc-1 crc-2 */ /* crc-1 crc-2 */
/* REVISIT: Should this be zm_putzdle()? */
ptr = zm_puthex8(ptr, (crc >> 8) & 0xff); ptr = zm_puthex8(ptr, (crc >> 8) & 0xff);
ptr = zm_puthex8(ptr, crc & 0xff); ptr = zm_puthex8(ptr, crc & 0xff);