From 73a89efed06a03f2733c14e42553ad23223f5cad Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 31 Mar 2015 11:59:16 -0600 Subject: Fix some problems with a preceding commit --- nuttx/FlatLibs.mk | 2 +- nuttx/KernelLibs.mk | 2 +- nuttx/ProtectedLibs.mk | 2 +- nuttx/include/nuttx/board.h | 2 +- nuttx/syscall/syscall_stublookup.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nuttx/FlatLibs.mk b/nuttx/FlatLibs.mk index c0ebca829..ebe69cbb6 100644 --- a/nuttx/FlatLibs.mk +++ b/nuttx/FlatLibs.mk @@ -47,7 +47,7 @@ USERLIBS = # Add libraries for board support -NUTTXLIBS = lib$(DELIM)libconfigs$(LIBEXT) +NUTTXLIBS += lib$(DELIM)libconfigs$(LIBEXT) # Add libraries for syscall support. diff --git a/nuttx/KernelLibs.mk b/nuttx/KernelLibs.mk index 2c7584934..02f9f8aa9 100644 --- a/nuttx/KernelLibs.mk +++ b/nuttx/KernelLibs.mk @@ -47,7 +47,7 @@ USERLIBS = # Add libraries for board support -NUTTXLIBS = lib$(DELIM)libconfigs$(LIBEXT) +NUTTXLIBS += lib$(DELIM)libconfigs$(LIBEXT) # Add libraries for syscall support. The C library will be needed by # both the kernel- and user-space builds. For now, the memory manager (mm) diff --git a/nuttx/ProtectedLibs.mk b/nuttx/ProtectedLibs.mk index ae9fcf451..3abd39084 100644 --- a/nuttx/ProtectedLibs.mk +++ b/nuttx/ProtectedLibs.mk @@ -47,7 +47,7 @@ USERLIBS = # Add libraries for board support -NUTTXLIBS = lib$(DELIM)libconfigs$(LIBEXT) +NUTTXLIBS += lib$(DELIM)libconfigs$(LIBEXT) # Add libraries for syscall support. The C library will be needed by # both the kernel- and user-space builds. For now, the memory manager (mm) diff --git a/nuttx/include/nuttx/board.h b/nuttx/include/nuttx/board.h index 20966e684..cfbbb8331 100644 --- a/nuttx/include/nuttx/board.h +++ b/nuttx/include/nuttx/board.h @@ -136,7 +136,7 @@ void board_initialize(void); * Description: * Perform application specific initialization. This function is never * called directly from application code, but only indirectly via the - * (non-standard) boardctl() interface + * (non-standard) boardctl() interface using the command BOARDIOC_INIT. * *****************************************************************************/ diff --git a/nuttx/syscall/syscall_stublookup.c b/nuttx/syscall/syscall_stublookup.c index fc81bff69..df142de66 100644 --- a/nuttx/syscall/syscall_stublookup.c +++ b/nuttx/syscall/syscall_stublookup.c @@ -187,7 +187,7 @@ uintptr_t STUB_aio_cancel(int nbr, uintptr_t parm1, uintptr_t parm2); /* Board support */ -uintptr-t STUB_boardctl(int nbr, uintptr_t parm1, uinptr_1 parm2); +uintptr_t STUB_boardctl(int nbr, uintptr_t parm1, uintptr_t parm2); /* The following are defined if file descriptors are enabled */ -- cgit v1.2.3