From 994aa23afe0095bbb54a0bcf83d33508936ac479 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 30 Aug 2014 10:43:58 -0600 Subject: Separate flat, protected, and kernel mode library selected into separate files. The conditional logic as exceed my able to comprehend and maintain the selections. --- nuttx/FlatLibs.mk | 29 ++-------- nuttx/KernelLibs.mk | 99 ++++++++++++++++++++++++++++++++ nuttx/Makefile.unix | 9 ++- nuttx/Makefile.win | 8 +++ nuttx/ProtectedLibs.mk | 109 ++++++++++++++++++++++++++++++++++++ nuttx/configs/sama5d4-ek/README.txt | 5 ++ 6 files changed, 233 insertions(+), 26 deletions(-) create mode 100644 nuttx/KernelLibs.mk create mode 100644 nuttx/ProtectedLibs.mk diff --git a/nuttx/FlatLibs.mk b/nuttx/FlatLibs.mk index d9775a9a8..58f443a52 100644 --- a/nuttx/FlatLibs.mk +++ b/nuttx/FlatLibs.mk @@ -43,43 +43,27 @@ NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT) USERLIBS = -# 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) -# is placed in user space (only). - -ifeq ($(CONFIG_BUILD_PROTECTED),y) -NUTTXLIBS += lib$(DELIM)libstubs$(LIBEXT) lib$(DELIM)libkc$(LIBEXT) lib$(DELIM)libkmm$(LIBEXT) -NUTTXLIBS += lib$(DELIM)libkarch$(LIBEXT) -USERLIBS += lib$(DELIM)libproxies$(LIBEXT) lib$(DELIM)libuc$(LIBEXT) lib$(DELIM)libumm$(LIBEXT) -USERLIBS += lib$(DELIM)libuarch$(LIBEXT) -else -NUTTXLIBS += lib$(DELIM)libc$(LIBEXT) lib$(DELIM)libmm$(LIBEXT) lib$(DELIM)libarch$(LIBEXT) +# Add libraries for syscall support. + +NUTTXLIBS += lib$(DELIM)libc$(LIBEXT) lib$(DELIM)libmm$(LIBEXT) +NUTTXLIBS += lib$(DELIM)libarch$(LIBEXT) ifeq ($(CONFIG_LIB_SYSCALL),y) NUTTXLIBS += lib$(DELIM)libstubs$(LIBEXT) USERLIBS += lib$(DELIM)libproxies$(LIBEXT) endif -endif # Add libraries for C++ support. CXX, CXXFLAGS, and COMPILEXX must # be defined in Make.defs for this to work! ifeq ($(CONFIG_HAVE_CXX),y) -ifeq ($(CONFIG_BUILD_PROTECTED),y) -USERLIBS += lib$(DELIM)libcxx$(LIBEXT) -else NUTTXLIBS += lib$(DELIM)libcxx$(LIBEXT) endif -endif # Add library for application support. ifneq ($(APPDIR),) -ifeq ($(CONFIG_BUILD_PROTECTED),y) -USERLIBS += lib$(DELIM)libapps$(LIBEXT) -else NUTTXLIBS += lib$(DELIM)libapps$(LIBEXT) endif -endif # Add libraries for network support @@ -110,13 +94,8 @@ endif ifeq ($(CONFIG_NX),y) NUTTXLIBS += lib$(DELIM)libgraphics$(LIBEXT) -ifeq ($(CONFIG_BUILD_PROTECTED),y) -NUTTXLIBS += lib$(DELIM)libknx$(LIBEXT) -USERLIBS += lib$(DELIM)libunx$(LIBEXT) -else NUTTXLIBS += lib$(DELIM)libnx$(LIBEXT) endif -endif # Add libraries for the Audio sub-system diff --git a/nuttx/KernelLibs.mk b/nuttx/KernelLibs.mk new file mode 100644 index 000000000..8d7c35920 --- /dev/null +++ b/nuttx/KernelLibs.mk @@ -0,0 +1,99 @@ +############################################################################ +# KernalLibs.mk +# +# Copyright (C) 2014 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +# NUTTXLIBS is the list of NuttX libraries that is passed to the +# processor-specific Makefile to build the final NuttX target. +# Libraries in FSDIRS are excluded if file descriptor support +# is disabled. +# USERLIBS is the list of libraries used to build the final user-space +# application + +NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT) +USERLIBS = + +# 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) +# is placed in user space (only). + +NUTTXLIBS += lib$(DELIM)libstubs$(LIBEXT) lib$(DELIM)libkc$(LIBEXT) +NUTTXLIBS += lib$(DELIM)libkmm$(LIBEXT) lib$(DELIM)libkarch$(LIBEXT) +USERLIBS += lib$(DELIM)libproxies$(LIBEXT) lib$(DELIM)libuc$(LIBEXT) +USERLIBS += lib$(DELIM)libumm$(LIBEXT) lib$(DELIM)libuarch$(LIBEXT) + +# Add libraries for C++ support. CXX, CXXFLAGS, and COMPILEXX must +# be defined in Make.defs for this to work! + +ifeq ($(CONFIG_HAVE_CXX),y) +USERLIBS += lib$(DELIM)libcxx$(LIBEXT) +endif + +# Add libraries for network support + +ifeq ($(CONFIG_NET),y) +NUTTXLIBS += lib$(DELIM)libnet$(LIBEXT) +endif + +# Add libraries for Crypto API support + +ifeq ($(CONFIG_CRYPTO),y) +NUTTXLIBS += lib$(DELIM)libcrypto$(LIBEXT) +endif + +# Add libraries for file system support + +ifeq ($(CONFIG_NFILE_DESCRIPTORS),0) +ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0) +NUTTXLIBS += lib$(DELIM)libfs$(LIBEXT) +endif +ifeq ($(CONFIG_NET),y) +NUTTXLIBS += lib$(DELIM)libdrivers$(LIBEXT) +endif +else +NUTTXLIBS += lib$(DELIM)libfs$(LIBEXT) lib$(DELIM)libdrivers$(LIBEXT) lib$(DELIM)libbinfmt$(LIBEXT) +endif + +# Add libraries for the NX graphics sub-system + +ifeq ($(CONFIG_NX),y) +NUTTXLIBS += lib$(DELIM)libgraphics$(LIBEXT) +NUTTXLIBS += lib$(DELIM)libknx$(LIBEXT) +USERLIBS += lib$(DELIM)libunx$(LIBEXT) +endif + +# Add libraries for the Audio sub-system + +ifeq ($(CONFIG_AUDIO),y) +NUTTXLIBS += lib$(DELIM)libaudio$(LIBEXT) +endif diff --git a/nuttx/Makefile.unix b/nuttx/Makefile.unix index dfc0762d5..9c6ee8132 100644 --- a/nuttx/Makefile.unix +++ b/nuttx/Makefile.unix @@ -124,8 +124,15 @@ endif # Library build selections +ifeq ($(CONFIG_BUILD_PROTECTED),y) +include ProtectedLibs.mk +else +ifeq ($(CONFIG_BUILD_KERNEL),y) +include KernelLibs.mk +else include FlatLibs.mk - +endif +endif # LINKLIBS derives from NUTTXLIBS and is simply the same list with the # subdirectory removed diff --git a/nuttx/Makefile.win b/nuttx/Makefile.win index faa5d4cec..e5ba6466d 100644 --- a/nuttx/Makefile.win +++ b/nuttx/Makefile.win @@ -117,7 +117,15 @@ endif # Library build selections +ifeq ($(CONFIG_BUILD_PROTECTED),y) +include ProtectedLibs.mk +else +ifeq ($(CONFIG_BUILD_KERNEL),y) +include KernelLibs.mk +else include FlatLibs.mk +endif +endif # LINKLIBS derives from NUTTXLIBS and is simply the same list with the # subdirectory removed diff --git a/nuttx/ProtectedLibs.mk b/nuttx/ProtectedLibs.mk new file mode 100644 index 000000000..1a7a35fcf --- /dev/null +++ b/nuttx/ProtectedLibs.mk @@ -0,0 +1,109 @@ +############################################################################ +# ProtectedLibs.mk +# +# Copyright (C) 2007-2012, 2014 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +# NUTTXLIBS is the list of NuttX libraries that is passed to the +# processor-specific Makefile to build the final NuttX target. +# Libraries in FSDIRS are excluded if file descriptor support +# is disabled. +# USERLIBS is the list of libraries used to build the final user-space +# application + +NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT) +USERLIBS = + +# 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) +# is placed in user space (only). + +NUTTXLIBS += lib$(DELIM)libstubs$(LIBEXT) lib$(DELIM)libkc$(LIBEXT) +NUTTXLIBS += lib$(DELIM)libkmm$(LIBEXT) lib$(DELIM)libkarch$(LIBEXT) +USERLIBS += lib$(DELIM)libproxies$(LIBEXT) lib$(DELIM)libuc$(LIBEXT) +USERLIBS += lib$(DELIM)libumm$(LIBEXT) lib$(DELIM)libuarch$(LIBEXT) + +# Add libraries for C++ support. CXX, CXXFLAGS, and COMPILEXX must +# be defined in Make.defs for this to work! + +ifeq ($(CONFIG_HAVE_CXX),y) +USERLIBS += lib$(DELIM)libcxx$(LIBEXT) +endif + +# Add library for application support. + +ifneq ($(APPDIR),) +USERLIBS += lib$(DELIM)libapps$(LIBEXT) +endif + +# Add libraries for network support + +ifeq ($(CONFIG_NET),y) +NUTTXLIBS += lib$(DELIM)libnet$(LIBEXT) +endif + +# Add libraries for Crypto API support + +ifeq ($(CONFIG_CRYPTO),y) +NUTTXLIBS += lib$(DELIM)libcrypto$(LIBEXT) +endif + +# Add libraries for file system support + +ifeq ($(CONFIG_NFILE_DESCRIPTORS),0) +ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0) +NUTTXLIBS += lib$(DELIM)libfs$(LIBEXT) +endif +ifeq ($(CONFIG_NET),y) +NUTTXLIBS += lib$(DELIM)libdrivers$(LIBEXT) +endif +else +NUTTXLIBS += lib$(DELIM)libfs$(LIBEXT) lib$(DELIM)libdrivers$(LIBEXT) lib$(DELIM)libbinfmt$(LIBEXT) +endif + +# Add libraries for the NX graphics sub-system + +ifeq ($(CONFIG_NX),y) +NUTTXLIBS += lib$(DELIM)libgraphics$(LIBEXT) +ifeq ($(CONFIG_BUILD_PROTECTED),y) +NUTTXLIBS += lib$(DELIM)libknx$(LIBEXT) +USERLIBS += lib$(DELIM)libunx$(LIBEXT) +else +NUTTXLIBS += lib$(DELIM)libnx$(LIBEXT) +endif +endif + +# Add libraries for the Audio sub-system + +ifeq ($(CONFIG_AUDIO),y) +NUTTXLIBS += lib$(DELIM)libaudio$(LIBEXT) +endif diff --git a/nuttx/configs/sama5d4-ek/README.txt b/nuttx/configs/sama5d4-ek/README.txt index b9cb114c0..86ce6de34 100644 --- a/nuttx/configs/sama5d4-ek/README.txt +++ b/nuttx/configs/sama5d4-ek/README.txt @@ -4195,6 +4195,11 @@ Configurations STATUS: See the To-Do list below + (2014-8-30): Retesting today I am seeing a strange behavior: Serial + output is coming out in chunks with delays between the chunks. It + appears that something is not good in the serial port configuration. + I see no such chunky behavior in, for example, grahics output. + nxwm: This is a special configuration setup for the NxWM window manager -- cgit v1.2.3