Make system: Build the drivers/ directory even if file descriptors are disabled. There are still things that may be needed from the drivers/ director (such as SYSLOG logic or lower half drivers).
This commit is contained in:
Gregory Nutt
parent
505ca542e8
commit
ec1e1a10fd
@ -12105,3 +12105,7 @@
|
||||
* SYSLOG: Remove lowsyslog(), vlowsyslog(), and associated macros
|
||||
*llinfo(), *llwarn(), and llerr(). In the redesigned syslog() logic,
|
||||
these serve no purpose (2016-06-20).
|
||||
* Make system: Need to build the drivers/ directory even it file
|
||||
descriptors are not supported. There are things in the drivers/
|
||||
directory that are still needed (like SYSLOG logic).
|
||||
|
||||
|
||||
@ -59,7 +59,10 @@ endif
|
||||
#
|
||||
# FSDIRS depend on file descriptor support; NONFSDIRS do not (except for parts
|
||||
# of FSDIRS). We will exclude FSDIRS from the build if file descriptor
|
||||
# support is disabled
|
||||
# support is disabled. NOTE that drivers, in general, depends on file
|
||||
# descriptor support but is always built because there are other components
|
||||
# in the drivers directory that are needed even if file descriptors are not
|
||||
# supported.
|
||||
# CONTEXTDIRS include directories that have special, one-time pre-build
|
||||
# requirements. Normally this includes things like auto-generation of
|
||||
# configuration specific files or creation of configurable symbolic links
|
||||
@ -69,8 +72,8 @@ endif
|
||||
# be cleaned to prevent garbage from collecting in them when changing
|
||||
# configurations.
|
||||
|
||||
NONFSDIRS = sched configs $(ARCH_SRC) $(NUTTX_ADDONS)
|
||||
FSDIRS = fs drivers binfmt
|
||||
NONFSDIRS = sched drivers configs $(ARCH_SRC) $(NUTTX_ADDONS)
|
||||
FSDIRS = fs binfmt
|
||||
CONTEXTDIRS = $(APPDIR)
|
||||
USERDIRS =
|
||||
OTHERDIRS = lib
|
||||
|
||||
11
FlatLibs.mk
11
FlatLibs.mk
@ -45,6 +45,12 @@
|
||||
NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT)
|
||||
USERLIBS =
|
||||
|
||||
# Driver support. Generally depends on file descriptor support but there
|
||||
# are some components in the drivers directory that are needed even if file
|
||||
# descriptors are not supported.
|
||||
|
||||
NUTTXLIBS += lib$(DELIM)libdrivers$(LIBEXT)
|
||||
|
||||
# Add libraries for board support
|
||||
|
||||
NUTTXLIBS += lib$(DELIM)libconfigs$(LIBEXT)
|
||||
@ -89,11 +95,8 @@ 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)
|
||||
NUTTXLIBS += lib$(DELIM)libfs$(LIBEXT) lib$(DELIM)libbinfmt$(LIBEXT)
|
||||
endif
|
||||
|
||||
# Add libraries for the NX graphics sub-system
|
||||
|
||||
@ -45,6 +45,12 @@
|
||||
NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT)
|
||||
USERLIBS =
|
||||
|
||||
# Driver support. Generally depends on file descriptor support but there
|
||||
# are some components in the drivers directory that are needed even if file
|
||||
# descriptors are not supported.
|
||||
|
||||
NUTTXLIBS += lib$(DELIM)libdrivers$(LIBEXT)
|
||||
|
||||
# Add libraries for board support
|
||||
|
||||
NUTTXLIBS += lib$(DELIM)libconfigs$(LIBEXT)
|
||||
@ -83,11 +89,8 @@ 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)
|
||||
NUTTXLIBS += lib$(DELIM)libfs$(LIBEXT) lib$(DELIM)libbinfmt$(LIBEXT)
|
||||
endif
|
||||
|
||||
# Add libraries for the NX graphics sub-system
|
||||
|
||||
@ -45,6 +45,12 @@
|
||||
NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT)
|
||||
USERLIBS =
|
||||
|
||||
# Driver support. Generally depends on file descriptor support but there
|
||||
# are some components in the drivers directory that are needed even if file
|
||||
# descriptors are not supported.
|
||||
|
||||
NUTTXLIBS += lib$(DELIM)libdrivers$(LIBEXT)
|
||||
|
||||
# Add libraries for board support
|
||||
|
||||
NUTTXLIBS += lib$(DELIM)libconfigs$(LIBEXT)
|
||||
@ -89,11 +95,8 @@ 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)
|
||||
NUTTXLIBS += lib$(DELIM)libfs$(LIBEXT) lib$(DELIM)libbinfmt$(LIBEXT)
|
||||
endif
|
||||
|
||||
# Add libraries for the NX graphics sub-system
|
||||
|
||||
@ -548,6 +548,16 @@ Where <subdir> is one of the following:
|
||||
console device was about 5 KB (primarily OS support) and the cost of
|
||||
the NSH 'ls' command (including OS support) is about 2KB.
|
||||
|
||||
2016-02-20: There has been some size increase due primarily, I believe
|
||||
to the enhanced SYSLOG logic:
|
||||
|
||||
$ arm-none-eabi-size nuttx
|
||||
text data bss dec hex filename
|
||||
13002 8 816 13826 3602 nuttx
|
||||
|
||||
No single large new things were included in the link. Apparently
|
||||
several new smaller things are now included. No idea what.
|
||||
|
||||
nsh:
|
||||
---
|
||||
Configures the NuttShell (nsh) located at apps/examples/nsh. This
|
||||
|
||||
Loading…
Reference in New Issue
Block a user