From f596d5fb9328ab338cbd0e8538887c12ec083f66 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 14 Apr 2012 20:01:08 +0000 Subject: [PATCH] Developing a new way to handle application configurations git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4609 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- apps/Make.defs | 0 apps/Makefile | 41 ++++ apps/examples/Make.defs | 223 ++++++++++++++++++ apps/graphics/Kconfig | 9 + apps/graphics/Make.defs | 40 ++++ apps/interpreters/Kconfig | 17 ++ apps/interpreters/Make.defs | 43 ++++ apps/interpreters/ficl/Kconfig | 12 + apps/namedapp/Kconfig | 11 + apps/namedapp/Make.defs | 40 ++++ apps/netutils/Kconfig | 2 + apps/netutils/Make.defs | 83 +++++++ apps/netutils/dhcpc/Kconfig | 9 + apps/netutils/dhcpd/Kconfig | 9 + apps/netutils/ftpc/Kconfig | 9 + apps/netutils/ftpd/Kconfig | 9 + apps/netutils/resolv/Kconfig | 9 + apps/netutils/smtp/Kconfig | 9 + apps/netutils/telnetd/Kconfig | 9 + apps/netutils/tftpc/Kconfig | 9 + apps/netutils/thttpd/Kconfig | 9 +- apps/netutils/uiplib/Kconfig | 9 + apps/netutils/webclient/Kconfig | 9 + apps/netutils/webserver/Kconfig | 9 + apps/nshlib/Kconfig | 4 +- apps/nshlib/Make.defs | 40 ++++ apps/system/Make.defs | 51 ++++ apps/system/free/Kconfig | 10 + apps/system/i2c/Kconfig | 12 +- apps/system/install/Kconfig | 10 + apps/system/readline/Kconfig | 9 +- apps/vsn/Make.defs | 40 ++++ apps/vsn/poweroff/Kconfig | 10 + apps/vsn/ramtron/Kconfig | 10 + apps/vsn/sdcard/Kconfig | 10 + apps/vsn/sysinfo/Kconfig | 10 + .../z16f2800100zcog/pashello/Make.defs | 0 37 files changed, 840 insertions(+), 5 deletions(-) mode change 100755 => 100644 apps/Make.defs create mode 100644 apps/examples/Make.defs create mode 100644 apps/graphics/Make.defs create mode 100644 apps/interpreters/Make.defs create mode 100644 apps/namedapp/Make.defs create mode 100644 apps/netutils/Make.defs create mode 100644 apps/nshlib/Make.defs create mode 100644 apps/system/Make.defs create mode 100644 apps/vsn/Make.defs mode change 100755 => 100644 nuttx/configs/z16f2800100zcog/pashello/Make.defs diff --git a/apps/Make.defs b/apps/Make.defs old mode 100755 new mode 100644 diff --git a/apps/Makefile b/apps/Makefile index f54a9104d..979f204b5 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -35,6 +35,7 @@ ############################################################################ -include $(TOPDIR)/Make.defs +-include $(TOPDIR)/.config APPDIR = ${shell pwd} @@ -50,6 +51,45 @@ APPDIR = ${shell pwd} CONFIGURED_APPS = SUBDIRS = examples graphics interpreters namedapp nshlib netutils system vsn +# There are two different mechanisms for obtaining the list of configured +# directories: +# +# (1) In the legacy method, these paths are all provided in the appconfig +# file that is copied to the top-level apps/ directory as .config +# (2) With the development of the NuttX configuration tool, however, the +# selected applications are now enabled by the configuration tool. +# The apps/.config file is no longer used. Instead, the set of +# configured build directories can be found by including a Make.defs +# file contained in each of the apps/subdirectories. +# +# When the NuttX configuration tools executes, it will always define the +# configure CONFIG_NUTTX_NEWCONFIG to select between these two cases. Then +# legacy appconfig files will still work but newly configuration files will +# also work. Eventually the CONFIG_NUTTX_NEWCONFIG option will be phased +# out. + +ifeq ($(CONFIG_NUTTX_NEWCONFIG),y) + +include examples/Make.defs +include graphics/Make.defs +include interpreters/Make.defs +include namedapp/Make.defs +include netutils/Make.defs +include nshlib/Make.defs +include system/Make.defs +include vsn/Make.defs + + +# INSTALLED_APPS is the list of currently available application directories. It +# is the same as CONFIGURED_APPS, but filtered to exclude any non-existent +# application directory. namedapp is always in the list of applications to be +# built. + +INSTALLED_APPS = + +# The legacy case: + +else -include .config # INSTALLED_APPS is the list of currently available application directories. It @@ -58,6 +98,7 @@ SUBDIRS = examples graphics interpreters namedapp nshlib netutils system vsn # built. INSTALLED_APPS = namedapp +endif # Create the list of available applications (INSTALLED_APPS) diff --git a/apps/examples/Make.defs b/apps/examples/Make.defs new file mode 100644 index 000000000..aa8d83733 --- /dev/null +++ b/apps/examples/Make.defs @@ -0,0 +1,223 @@ +############################################################################ +# apps/examples/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2012 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. +# +############################################################################ + +ifeq ($(CONFIG_EXAMPLES_ADC),y) +CONFIGURED_APPS += examples/adc +endif + +ifeq ($(CONFIG_EXAMPLES_BUTTONS),y) +CONFIGURED_APPS += examples/buttons +endif + +ifeq ($(CONFIG_EXAMPLES_CAN),y) +CONFIGURED_APPS += examples/can +endif + +ifeq ($(CONFIG_EXAMPLES_CDCACM),y) +CONFIGURED_APPS += examples/cdcacm +endif + +ifeq ($(CONFIG_EXAMPLES_COMPOSITE),y) +CONFIGURED_APPS += examples/composite +endif + +ifeq ($(CONFIG_EXAMPLES_DHCPD),y) +CONFIGURED_APPS += examples/dhcpd +endif + +ifeq ($(CONFIG_EXAMPLES_FTPC),y) +CONFIGURED_APPS += examples/ftpc +endif + +ifeq ($(CONFIG_EXAMPLES_FTPD),y) +CONFIGURED_APPS += examples/ftpd +endif + +ifeq ($(CONFIG_EXAMPLES_HELLO),y) +CONFIGURED_APPS += examples/hello +endif + +ifeq ($(CONFIG_EXAMPLES_HELLOXX),y) +CONFIGURED_APPS += examples/helloxx +endif + +ifeq ($(CONFIG_EXAMPLES_HIDKBD),y) +CONFIGURED_APPS += examples/hidkbd +endif + +ifeq ($(CONFIG_EXAMPLES_IGMP),y) +CONFIGURED_APPS += examples/igmp +endif + +ifeq ($(CONFIG_EXAMPLES_LCDRW),y) +CONFIGURED_APPS += examples/lcdrw +endif + +ifeq ($(CONFIG_EXAMPLES_MM),y) +CONFIGURED_APPS += examples/mm +endif + +ifeq ($(CONFIG_EXAMPLES_MOUNT),y) +CONFIGURED_APPS += examples/mount +endif + +ifeq ($(CONFIG_EXAMPLES_NETTEST),y) +CONFIGURED_APPS += examples/nettest +endif + +ifeq ($(CONFIG_EXAMPLES_NSH),y) +CONFIGURED_APPS += examples/nsh +endif + +ifeq ($(CONFIG_EXAMPLES_NULL),y) +CONFIGURED_APPS += examples/null +endif + +ifeq ($(CONFIG_EXAMPLES_NX),y) +CONFIGURED_APPS += examples/nx +endif + +ifeq ($(CONFIG_EXAMPLES_NXCONSOLE),y) +CONFIGURED_APPS += examples/nxconsole +endif + +ifeq ($(CONFIG_EXAMPLES_NXFFS),y) +CONFIGURED_APPS += examples/nxffs +endif + +ifeq ($(CONFIG_EXAMPLES_NXFLAT),y) +CONFIGURED_APPS += examples/nxflat +endif + +ifeq ($(CONFIG_EXAMPLES_NXHELLO),y) +CONFIGURED_APPS += examples/nxhello +endif + +ifeq ($(CONFIG_EXAMPLES_NXIMAGE),y) +CONFIGURED_APPS += examples/nximage +endif + +ifeq ($(CONFIG_EXAMPLES_NXLINES),y) +CONFIGURED_APPS += examples/nxlines +endif + +ifeq ($(CONFIG_EXAMPLES_NXTEXT),y) +CONFIGURED_APPS += examples/nxtext +endif + +ifeq ($(CONFIG_EXAMPLES_OSTEST),y) +CONFIGURED_APPS += examples/ostest +endif + +ifeq ($(CONFIG_EXAMPLES_PASHELLO),y) +CONFIGURED_APPS += examples/pashello +endif + +ifeq ($(CONFIG_EXAMPLES_PIPE),y) +CONFIGURED_APPS += examples/pipe +endif + +ifeq ($(CONFIG_EXAMPLES_POLL),y) +CONFIGURED_APPS += examples/poll +endif + +ifeq ($(CONFIG_EXAMPLES_PWM),y) +CONFIGURED_APPS += examples/pwm +endif + +ifeq ($(CONFIG_EXAMPLES_QENCODER),y) +CONFIGURED_APPS += examples/qencoder +endif + +ifeq ($(CONFIG_EXAMPLES_RGMP),y) +CONFIGURED_APPS += examples/rgmp +endif + +ifeq ($(CONFIG_EXAMPLES_ROMFS),y) +CONFIGURED_APPS += examples/romfs +endif + +ifeq ($(CONFIG_EXAMPLES_SENDMAIL),y) +CONFIGURED_APPS += examples/sendmail +endif + +ifeq ($(CONFIG_EXAMPLES_SERLOOP),y) +CONFIGURED_APPS += examples/serloop +endif + +ifeq ($(CONFIG_EXAMPLES_TELNETD),y) +CONFIGURED_APPS += examples/telnetd +endif + +ifeq ($(CONFIG_EXAMPLES_THTTPD),y) +CONFIGURED_APPS += examples/thttpd +endif + +ifeq ($(CONFIG_EXAMPLES_TIFF),y) +CONFIGURED_APPS += examples/tiff +endif + +ifeq ($(CONFIG_EXAMPLES_TOUCHSCREEN),y) +CONFIGURED_APPS += examples/touchscreen +endif + +ifeq ($(CONFIG_EXAMPLES_UDP),y) +CONFIGURED_APPS += examples/udp +endif + +ifeq ($(CONFIG_EXAMPLES_UIP),y) +CONFIGURED_APPS += examples/uip +endif + +ifeq ($(CONFIG_EXAMPLES_USBSERIAL),y) +CONFIGURED_APPS += examples/usbserial +endif + +ifeq ($(CONFIG_EXAMPLES_USBMSC),y) +CONFIGURED_APPS += examples/usbmsc +endif + +ifeq ($(CONFIG_EXAMPLES_USBTERM),y) +CONFIGURED_APPS += examples/usbterm +endif + +ifeq ($(CONFIG_EXAMPLES_WGET),y) +CONFIGURED_APPS += examples/wget +endif + +ifeq ($(CONFIG_EXAMPLES_WLAN),y) +CONFIGURED_APPS += examples/wlan +endif diff --git a/apps/graphics/Kconfig b/apps/graphics/Kconfig index ae2bf3130..09d3b5491 100644 --- a/apps/graphics/Kconfig +++ b/apps/graphics/Kconfig @@ -2,3 +2,12 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config TIFF + bool "TIFF file generation utility" + default n + ---help--- + Enable support for the TIFF file generation program. + +if TIFF +endif diff --git a/apps/graphics/Make.defs b/apps/graphics/Make.defs new file mode 100644 index 000000000..f17d36367 --- /dev/null +++ b/apps/graphics/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/graaphics/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2012 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. +# +############################################################################ + +if ($(CONFIG_TIFF),y) +CONFIGURED_APPS += graphics/tiff +endif + diff --git a/apps/interpreters/Kconfig b/apps/interpreters/Kconfig index ae2bf3130..db5b5ff35 100644 --- a/apps/interpreters/Kconfig +++ b/apps/interpreters/Kconfig @@ -2,3 +2,20 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +comment "Interpreters" + +source "$APPSDIR/interprets/hello/Kconfig" + +config PCODE + bool "Pascal p-code interpreter" + default n + ---help--- + Enable support for the Pascal p-code interpreter. See README file at misc/pascal + and also the README.txt file in the apps/interpreter directory. Use of this + configuration implies that you have performed the required installation of the + Pascal run-time code. + +if PCODE +endif + diff --git a/apps/interpreters/Make.defs b/apps/interpreters/Make.defs new file mode 100644 index 000000000..36ee7004d --- /dev/null +++ b/apps/interpreters/Make.defs @@ -0,0 +1,43 @@ +############################################################################ +# apps/interpreters/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2012 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. +# +############################################################################ + +if ($(CONFIG_PCODE),y) +CONFIGURED_APPS += interpreters/pcode +endif + +if ($(CONFIG_FICL),y) +CONFIGURED_APPS += interpreters/ficl +endif diff --git a/apps/interpreters/ficl/Kconfig b/apps/interpreters/ficl/Kconfig index ae2bf3130..1860a1591 100644 --- a/apps/interpreters/ficl/Kconfig +++ b/apps/interpreters/ficl/Kconfig @@ -2,3 +2,15 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config FICL + bool "Ficl Forth interpreter" + default n + ---help--- + Enable support for the Ficl interpreter interpreter. See README.txt file in the + apps/interpreters/ficl directory. Use of this configuration assumes + that you have performed the required installation of the Ficl run-time code. + +if FICL +endif + diff --git a/apps/namedapp/Kconfig b/apps/namedapp/Kconfig index ae2bf3130..8d8f03421 100644 --- a/apps/namedapp/Kconfig +++ b/apps/namedapp/Kconfig @@ -2,3 +2,14 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config NAMEDAPP + bool "Support named applications" + default n + ---help--- + Enable support for named applications. This features assigns a string + name to an application. This feature is also the underlying requirement + to support built-in applications in the NuttShell (NSH). + +if NAMEDAPP +endif diff --git a/apps/namedapp/Make.defs b/apps/namedapp/Make.defs new file mode 100644 index 000000000..a07b3b3c2 --- /dev/null +++ b/apps/namedapp/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/namedapps/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2012 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. +# +############################################################################ + +if ($(CONFIG_NAMEDAPP),y) +CONFIGURED_APPS += namedapp +endif + diff --git a/apps/netutils/Kconfig b/apps/netutils/Kconfig index 6570af783..cd0cb84dd 100644 --- a/apps/netutils/Kconfig +++ b/apps/netutils/Kconfig @@ -3,6 +3,8 @@ # see misc/tools/kconfig-language.txt. # +comment "Networking Utilities" + menu "DHCP client" source "$APPSDIR/netutils/dhcpc/Kconfig" endmenu diff --git a/apps/netutils/Make.defs b/apps/netutils/Make.defs new file mode 100644 index 000000000..3994da612 --- /dev/null +++ b/apps/netutils/Make.defs @@ -0,0 +1,83 @@ +############################################################################ +# apps/netutils/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in include and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of include 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. +# +############################################################################ + +if ($(CONFIG_NETUTILS_DHCPC),y) +CONFIGURED_APPS += netutils/dhcpc +endif + +if ($(CONFIG_NETUTILS_DHCPD),y) +CONFIGURED_APPS += netutils/dhcpd +endif + +if ($(CONFIG_NETUTILS_FTPC),y) +CONFIGURED_APPS += netutils/ftpc +endif + +if ($(CONFIG_NETUTILS_FTPD),y) +CONFIGURED_APPS += netutils/ftpd +endif + +if ($(CONFIG_NETUTILS_RESOLV),y) +CONFIGURED_APPS += netutils/resolv +endif + +if ($(CONFIG_NETUTILS_SMTP),y) +CONFIGURED_APPS += netutils/smtp +endif + +if ($(CONFIG_NETUTILS_TELNETD),y) +CONFIGURED_APPS += netutils/telnetd +endif + +if ($(CONFIG_NETUTILS_TFTPC),y) +CONFIGURED_APPS += netutils/tftpc +endif + +if ($(CONFIG_NETUTILS_THTTPD),y) +CONFIGURED_APPS += netutils/thttpd +endif + +if ($(CONFIG_NETUTILS_UIPLIB),y) +CONFIGURED_APPS += netutils/uiplib +endif + +if ($(CONFIG_NETUTILS_WEBCLIENT),y) +CONFIGURED_APPS += netutils/webclient +endif + +if ($(CONFIGNETUTILS_WEBSERVER),y) +CONFIGURED_APPS += netutils/webserver +endif diff --git a/apps/netutils/dhcpc/Kconfig b/apps/netutils/dhcpc/Kconfig index ae2bf3130..7453f2747 100644 --- a/apps/netutils/dhcpc/Kconfig +++ b/apps/netutils/dhcpc/Kconfig @@ -2,3 +2,12 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config NETUTILS_DHCPC + bool "DHCP client" + default n + ---help--- + Enable support for the DHCP client. + +if NETUTILS_DHCPC +endif diff --git a/apps/netutils/dhcpd/Kconfig b/apps/netutils/dhcpd/Kconfig index ae2bf3130..0d3b89f24 100644 --- a/apps/netutils/dhcpd/Kconfig +++ b/apps/netutils/dhcpd/Kconfig @@ -2,3 +2,12 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config NETUTILS_DHCPD + bool "DHCP server" + default n + ---help--- + Enable support for the DHCP server. + +if NETUTILS_DHCPD +endif diff --git a/apps/netutils/ftpc/Kconfig b/apps/netutils/ftpc/Kconfig index ae2bf3130..7a63001fa 100644 --- a/apps/netutils/ftpc/Kconfig +++ b/apps/netutils/ftpc/Kconfig @@ -2,3 +2,12 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config NETUTILS_FTPC + bool "FTP client" + default n + ---help--- + Enable support for the FTP client. + +if NETUTILS_FTPC +endif diff --git a/apps/netutils/ftpd/Kconfig b/apps/netutils/ftpd/Kconfig index ae2bf3130..43fc70dbd 100644 --- a/apps/netutils/ftpd/Kconfig +++ b/apps/netutils/ftpd/Kconfig @@ -2,3 +2,12 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config NETUTILS_FTPD + bool "FTP server" + default n + ---help--- + Enable support for the FTP server. + +if NETUTILS_FTPD +endif diff --git a/apps/netutils/resolv/Kconfig b/apps/netutils/resolv/Kconfig index 7e003f10b..3274889aa 100644 --- a/apps/netutils/resolv/Kconfig +++ b/apps/netutils/resolv/Kconfig @@ -3,8 +3,17 @@ # see misc/tools/kconfig-language.txt. # +config NETUTILS_RESOLV + bool "Name resolution" + default n + ---help--- + Enable support for the name resolution. + +if NETUTILS_RESOLV config NET_RESOLV_ENTRIES int "Number of resolver entries" default 8 ---help--- Number of resolver entries. Default: 8 + +endif \ No newline at end of file diff --git a/apps/netutils/smtp/Kconfig b/apps/netutils/smtp/Kconfig index ae2bf3130..99f4e4bd6 100644 --- a/apps/netutils/smtp/Kconfig +++ b/apps/netutils/smtp/Kconfig @@ -2,3 +2,12 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config NETUTILS_SMTP + bool "SMTP" + default n + ---help--- + Enable support for SMTP. + +if NETUTILS_SMTP +endif diff --git a/apps/netutils/telnetd/Kconfig b/apps/netutils/telnetd/Kconfig index ae2bf3130..8df8e907b 100644 --- a/apps/netutils/telnetd/Kconfig +++ b/apps/netutils/telnetd/Kconfig @@ -2,3 +2,12 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config NETUTILS_TELNETD + bool "Telet daemon" + default n + ---help--- + Enable support for the Telnet daemon. + +if NETUTILS_TELNETD +endif diff --git a/apps/netutils/tftpc/Kconfig b/apps/netutils/tftpc/Kconfig index ae2bf3130..e2edcd6ac 100644 --- a/apps/netutils/tftpc/Kconfig +++ b/apps/netutils/tftpc/Kconfig @@ -2,3 +2,12 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config NETUTILS_TFTPC + bool "TFTP client" + default n + ---help--- + Enable support for the TFTP client. + +if NETUTILS_TFTPC +endif diff --git a/apps/netutils/thttpd/Kconfig b/apps/netutils/thttpd/Kconfig index ee630ee3b..8c73008ab 100644 --- a/apps/netutils/thttpd/Kconfig +++ b/apps/netutils/thttpd/Kconfig @@ -3,6 +3,13 @@ # see misc/tools/kconfig-language.txt. # +config NETUTILS_THTTPD + bool "THTTPD webserver" + default n + ---help--- + Enable support for the THTTPD webservert. + +if NETUTILS_TFTPC config THTTPD_PORT int "THTTPD port number" default 80 @@ -230,4 +237,4 @@ config THTTPD_URLPATTERN ---help--- If defined, then it will be used to match and verify referrers. - +endif diff --git a/apps/netutils/uiplib/Kconfig b/apps/netutils/uiplib/Kconfig index ae2bf3130..2eb098717 100644 --- a/apps/netutils/uiplib/Kconfig +++ b/apps/netutils/uiplib/Kconfig @@ -2,3 +2,12 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config NETUTILS_UIPLIB + bool "Network support library" + default n + ---help--- + Enable support for the network support library. + +if NETUTILS_UIPLIB +endif diff --git a/apps/netutils/webclient/Kconfig b/apps/netutils/webclient/Kconfig index ae2bf3130..c53195d48 100644 --- a/apps/netutils/webclient/Kconfig +++ b/apps/netutils/webclient/Kconfig @@ -2,3 +2,12 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config NETUTILS_WEBCLIENT + bool "uIP web client" + default n + ---help--- + Enable support for the uIP web client. + +if NETUTILS_WEBCLIENT +endif diff --git a/apps/netutils/webserver/Kconfig b/apps/netutils/webserver/Kconfig index ae2bf3130..2fb80fe95 100644 --- a/apps/netutils/webserver/Kconfig +++ b/apps/netutils/webserver/Kconfig @@ -2,3 +2,12 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config NETUTILS_WEBSERVER + bool "uIP web server" + default n + ---help--- + Enable support for the uIP web server. + +if NETUTILS_WEBSERVER +endif diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig index c363e6c0b..1f7b3d754 100644 --- a/apps/nshlib/Kconfig +++ b/apps/nshlib/Kconfig @@ -14,10 +14,12 @@ if NSH_LIBRARY config NSH_BUILTIN_APPS bool "Enable built-in applications" default y + depends on NAMEDAPP ---help--- Support external registered, "named" applications that can be executed from the NSH command line (see apps/README.txt for - more information). + more information). This options requires support for named applications + (NAMEDAPP). menu "Disable Individual commands" config NSH_DISABLE_CAT diff --git a/apps/nshlib/Make.defs b/apps/nshlib/Make.defs new file mode 100644 index 000000000..c72c09bce --- /dev/null +++ b/apps/nshlib/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/nshlib/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2012 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. +# +############################################################################ + +if ($(CONFIG_NSH_LIBRARY),y) +CONFIGURED_APPS += nshlib +endif + diff --git a/apps/system/Make.defs b/apps/system/Make.defs new file mode 100644 index 000000000..1ddabd337 --- /dev/null +++ b/apps/system/Make.defs @@ -0,0 +1,51 @@ +############################################################################ +# apps/system/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2012 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. +# +############################################################################ + +if ($(CONFIG_VSN_POWEROFF),y) +CONFIGURED_APPS += vsn/poweroff +endif + +if ($(CONFIG_VSN_RAMTRON),y) +CONFIGURED_APPS += vsn/ramtron +endif + +if ($(CONFIG_VSN_SDCARD),y) +CONFIGURED_APPS += vsn/sdcard +endif + +if ($(CONFIG_VSN_SYSINFO),y) +CONFIGURED_APPS += vsn/sysinfo +endif diff --git a/apps/system/free/Kconfig b/apps/system/free/Kconfig index ae2bf3130..239559867 100644 --- a/apps/system/free/Kconfig +++ b/apps/system/free/Kconfig @@ -2,3 +2,13 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config SYSTEM_FREE + bool "NSH free command replacement" + default n + ---help--- + Enable support for the NSH free replacement command. + +if SYSTEM_FREE +endif + diff --git a/apps/system/i2c/Kconfig b/apps/system/i2c/Kconfig index 6922464f8..f21ee21c1 100644 --- a/apps/system/i2c/Kconfig +++ b/apps/system/i2c/Kconfig @@ -3,7 +3,15 @@ # see misc/tools/kconfig-language.txt. # -#if I2C + +config SYSTEM_I2CTOOL + bool "I2C tool" + default n + depends on I2C + ---help--- + Enable support for the I2C tool. + +if SYSTEM_I2CTOOL config I2CTOOL_BUILTIN bool "NSH built-in command" default y @@ -47,4 +55,4 @@ config I2CTOOL_DEFFREQ ---help--- Default I2C frequency (default: 4000000) -#endif \ No newline at end of file +endif \ No newline at end of file diff --git a/apps/system/install/Kconfig b/apps/system/install/Kconfig index ae2bf3130..a48f67f20 100644 --- a/apps/system/install/Kconfig +++ b/apps/system/install/Kconfig @@ -2,3 +2,13 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config SYSTEM_INSTALL + bool "FLASH installation tool" + default n + ---help--- + Enable support for the FLASH installation tool. + +if SYSTEM_INSTALL +endif + diff --git a/apps/system/readline/Kconfig b/apps/system/readline/Kconfig index 11aedf0c3..a7467b15d 100644 --- a/apps/system/readline/Kconfig +++ b/apps/system/readline/Kconfig @@ -3,7 +3,13 @@ # see misc/tools/kconfig-language.txt. # -config READLINE_ECHO +config SYSTEM_READLINE + bool "readline() support" + default n + ---help--- + Enable support for the readline() function. + +if SYSTEM_READLINE bool "Echo character input" default y ---help--- @@ -29,3 +35,4 @@ config EOL_IS_EITHER_CRLF bool "EOL is CR or LF" endchoice +endif diff --git a/apps/vsn/Make.defs b/apps/vsn/Make.defs new file mode 100644 index 000000000..a07b3b3c2 --- /dev/null +++ b/apps/vsn/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/namedapps/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2012 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. +# +############################################################################ + +if ($(CONFIG_NAMEDAPP),y) +CONFIGURED_APPS += namedapp +endif + diff --git a/apps/vsn/poweroff/Kconfig b/apps/vsn/poweroff/Kconfig index ae2bf3130..d0059a0d3 100644 --- a/apps/vsn/poweroff/Kconfig +++ b/apps/vsn/poweroff/Kconfig @@ -2,3 +2,13 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config VSN_POWEROFF + bool "NSH poweroff command" + default n + ---help--- + Enable support for the NSH poweroff command. + +if VSN_POWEROFF +endif + diff --git a/apps/vsn/ramtron/Kconfig b/apps/vsn/ramtron/Kconfig index ae2bf3130..14f358921 100644 --- a/apps/vsn/ramtron/Kconfig +++ b/apps/vsn/ramtron/Kconfig @@ -2,3 +2,13 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config VSN_RAMTRON + bool "NSH ramtron command" + default n + ---help--- + Enable support for the NSH ramtron command. + +if VSN_RAMTRON +endif + diff --git a/apps/vsn/sdcard/Kconfig b/apps/vsn/sdcard/Kconfig index ae2bf3130..8e6c13264 100644 --- a/apps/vsn/sdcard/Kconfig +++ b/apps/vsn/sdcard/Kconfig @@ -2,3 +2,13 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config VSN_SDCARD + bool "NSH sdcard command" + default n + ---help--- + Enable support for the NSH sdcard command. + +if VSN_SDCARD +endif + diff --git a/apps/vsn/sysinfo/Kconfig b/apps/vsn/sysinfo/Kconfig index ae2bf3130..38e0f16be 100644 --- a/apps/vsn/sysinfo/Kconfig +++ b/apps/vsn/sysinfo/Kconfig @@ -2,3 +2,13 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config VSN_SYSINFO + bool "NSH sysinfo command" + default n + ---help--- + Enable support for the NSH sysinfo command. + +if VSN_SYSINFO +endif + diff --git a/nuttx/configs/z16f2800100zcog/pashello/Make.defs b/nuttx/configs/z16f2800100zcog/pashello/Make.defs old mode 100755 new mode 100644