diff options
-rwxr-xr-x | apps/Make.defs | 4 | ||||
-rw-r--r-- | apps/Makefile | 12 | ||||
-rw-r--r-- | apps/vsn/Makefile | 58 | ||||
-rw-r--r-- | apps/vsn/free/Makefile (renamed from apps/free/Makefile) | 4 | ||||
-rw-r--r-- | apps/vsn/free/README.txt (renamed from apps/free/README.txt) | 0 | ||||
-rw-r--r-- | apps/vsn/free/free.c (renamed from apps/free/free.c) | 0 | ||||
-rw-r--r-- | apps/vsn/hello/Makefile (renamed from apps/hello/Makefile) | 4 | ||||
-rw-r--r-- | apps/vsn/hello/README.txt (renamed from apps/hello/README.txt) | 0 | ||||
-rw-r--r-- | apps/vsn/hello/hello.c (renamed from apps/hello/hello.c) | 0 | ||||
-rw-r--r-- | apps/vsn/poweroff/Makefile (renamed from apps/poweroff/Makefile) | 4 | ||||
-rw-r--r-- | apps/vsn/poweroff/README.txt (renamed from apps/poweroff/README.txt) | 0 | ||||
-rw-r--r-- | apps/vsn/poweroff/poweroff.c (renamed from apps/poweroff/poweroff.c) | 0 | ||||
-rw-r--r-- | apps/vsn/ramtron/Makefile (renamed from apps/ramtron/Makefile) | 4 | ||||
-rw-r--r-- | apps/vsn/ramtron/README.txt (renamed from apps/ramtron/README.txt) | 0 | ||||
-rw-r--r-- | apps/vsn/ramtron/ramtron.c (renamed from apps/ramtron/ramtron.c) | 0 | ||||
-rw-r--r-- | apps/vsn/sdcard/Makefile (renamed from apps/sdcard/Makefile) | 4 | ||||
-rw-r--r-- | apps/vsn/sdcard/README.txt (renamed from apps/sdcard/README.txt) | 0 | ||||
-rw-r--r-- | apps/vsn/sdcard/sdcard.c (renamed from apps/sdcard/sdcard.c) | 0 | ||||
-rw-r--r-- | misc/buildroot/ChangeLog | 3 | ||||
-rw-r--r-- | misc/buildroot/Makefile | 2 | ||||
-rw-r--r-- | nuttx/ChangeLog | 5 | ||||
-rw-r--r-- | nuttx/Documentation/NuttX.html | 4 | ||||
-rwxr-xr-x | nuttx/configs/vsn/nsh/appconfig | 12 |
23 files changed, 100 insertions, 20 deletions
diff --git a/apps/Make.defs b/apps/Make.defs index 0a6e869dd..5b6cd9aa0 100755 --- a/apps/Make.defs +++ b/apps/Make.defs @@ -36,6 +36,6 @@ define REGISTER @echo "Register: $1" - @echo "{ .name = \"$1\", .priority = $2, .stacksize = $3, .main = $4 }," >> ../exec_nuttapp_list.h - @echo "EXTERN int $4(int argc, char *argv[]);" >> ../exec_nuttapp_proto.h + @echo "{ .name = \"$1\", .priority = $2, .stacksize = $3, .main = $4 }," >> "$(APPDIR)/exec_nuttapp_list.h" + @echo "EXTERN int $4(int argc, char *argv[]);" >> "$(APPDIR)/exec_nuttapp_proto.h" endef diff --git a/apps/Makefile b/apps/Makefile index b9a067c26..ce00bb667 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -42,8 +42,14 @@ endif # Application Directories +# SUBDIRS is the list of all directories containing Makefiles. It is used +# only for cleaning. + +SUBDIRS = nshlib vsn + # we use a non-existing .built_always to guarantee that Makefile # always walks into the sub-directories and asks for build + BUILTIN_APPS_BUILT = BUILTIN_APPS_DIR = @@ -130,15 +136,21 @@ $(BIN): $(OBJS) $(BUILTIN_APPS_BUILT) depend: .depend +define MAKECLEAN + @(MAKE) -C $1 $2 TOPDIR="$(TOPDIR)" +endef + clean: @rm -f $(BIN) *~ .*.swp *.o libapps.a $(call CLEAN) + $(foreach DIR, $(SUBDIRS), $(eval $(call MAKECLEAN,$(DIR),clean))) distclean: clean @rm -f .config @rm -f Make.dep .depend @rm -f exec_nuttapp_list.h @rm -f exec_nuttapp_proto.h + $(foreach DIR, $(SUBDIRS), $(eval $(call MAKECLEAN,$(DIR),distclean))) -include Make.dep diff --git a/apps/vsn/Makefile b/apps/vsn/Makefile new file mode 100644 index 000000000..d971d3fe4 --- /dev/null +++ b/apps/vsn/Makefile @@ -0,0 +1,58 @@ +############################################################################ +# vsn/Makefile +# +# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# +# 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. +# +############################################################################ + +# Sub-directories + +SUBDIRS = free hello poweroff ramtron sdcard + +all: nothing +.PHONY: nothing + +nothing: + +define DOMAKE + @(MAKE) -C $1 $2 TOPDIR="$(TOPDIR)" +endef + +depend: + $(foreach DIR, $(SUBDIRS), $(eval $(call DOMAKE,$(DIR),depend))) + +clean: + $(foreach DIR, $(SUBDIRS), $(eval $(call DOMAKE,$(DIR),clean))) + +distclean: clean + $(foreach DIR, $(SUBDIRS), $(eval $(call DOMAKE,$(DIR),distclean))) + +-include Make.dep diff --git a/apps/free/Makefile b/apps/vsn/free/Makefile index 33b2c564c..d63f7af3e 100644 --- a/apps/free/Makefile +++ b/apps/vsn/free/Makefile @@ -38,7 +38,7 @@ # sourcing the Make.defs! -include $(TOPDIR)/Make.defs -include ../Make.defs +include ../../Make.defs ifeq ($(WINTOOL),y) INCDIROPT = -w @@ -60,7 +60,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = ../libapps$(LIBEXT) +BIN = ../../libapps$(LIBEXT) ROOTDEPPATH = --dep-path . diff --git a/apps/free/README.txt b/apps/vsn/free/README.txt index dd92a94ae..dd92a94ae 100644 --- a/apps/free/README.txt +++ b/apps/vsn/free/README.txt diff --git a/apps/free/free.c b/apps/vsn/free/free.c index fa5288cdd..fa5288cdd 100644 --- a/apps/free/free.c +++ b/apps/vsn/free/free.c diff --git a/apps/hello/Makefile b/apps/vsn/hello/Makefile index 720d365af..a0bed80e1 100644 --- a/apps/hello/Makefile +++ b/apps/vsn/hello/Makefile @@ -38,7 +38,7 @@ # sourcing the Make.defs! -include $(TOPDIR)/Make.defs -include ../Make.defs +include ../../Make.defs ifeq ($(WINTOOL),y) INCDIROPT = -w @@ -60,7 +60,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = ../libapps$(LIBEXT) +BIN = ../../libapps$(LIBEXT) ROOTDEPPATH = --dep-path . diff --git a/apps/hello/README.txt b/apps/vsn/hello/README.txt index 531c4d193..531c4d193 100644 --- a/apps/hello/README.txt +++ b/apps/vsn/hello/README.txt diff --git a/apps/hello/hello.c b/apps/vsn/hello/hello.c index fb94d0ea9..fb94d0ea9 100644 --- a/apps/hello/hello.c +++ b/apps/vsn/hello/hello.c diff --git a/apps/poweroff/Makefile b/apps/vsn/poweroff/Makefile index b8e5ecd93..8e3538a2b 100644 --- a/apps/poweroff/Makefile +++ b/apps/vsn/poweroff/Makefile @@ -38,7 +38,7 @@ # sourcing the Make.defs! -include $(TOPDIR)/Make.defs -include ../Make.defs +include ../../Make.defs ifeq ($(WINTOOL),y) INCDIROPT = -w @@ -60,7 +60,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = ../libapps$(LIBEXT) +BIN = ../../libapps$(LIBEXT) ROOTDEPPATH = --dep-path . diff --git a/apps/poweroff/README.txt b/apps/vsn/poweroff/README.txt index e02180e5a..e02180e5a 100644 --- a/apps/poweroff/README.txt +++ b/apps/vsn/poweroff/README.txt diff --git a/apps/poweroff/poweroff.c b/apps/vsn/poweroff/poweroff.c index f8b56e0d8..f8b56e0d8 100644 --- a/apps/poweroff/poweroff.c +++ b/apps/vsn/poweroff/poweroff.c diff --git a/apps/ramtron/Makefile b/apps/vsn/ramtron/Makefile index d2430f747..42b73a09b 100644 --- a/apps/ramtron/Makefile +++ b/apps/vsn/ramtron/Makefile @@ -38,7 +38,7 @@ # sourcing the Make.defs! -include $(TOPDIR)/Make.defs -include ../Make.defs +include ../../Make.defs ifeq ($(WINTOOL),y) INCDIROPT = -w @@ -60,7 +60,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = ../libapps$(LIBEXT) +BIN = ../../libapps$(LIBEXT) ROOTDEPPATH = --dep-path . diff --git a/apps/ramtron/README.txt b/apps/vsn/ramtron/README.txt index 152774b66..152774b66 100644 --- a/apps/ramtron/README.txt +++ b/apps/vsn/ramtron/README.txt diff --git a/apps/ramtron/ramtron.c b/apps/vsn/ramtron/ramtron.c index 323a42247..323a42247 100644 --- a/apps/ramtron/ramtron.c +++ b/apps/vsn/ramtron/ramtron.c diff --git a/apps/sdcard/Makefile b/apps/vsn/sdcard/Makefile index 9df8cbe98..ccbd22952 100644 --- a/apps/sdcard/Makefile +++ b/apps/vsn/sdcard/Makefile @@ -38,7 +38,7 @@ # sourcing the Make.defs! -include $(TOPDIR)/Make.defs -include ../Make.defs +include ../../Make.defs ifeq ($(WINTOOL),y) INCDIROPT = -w @@ -60,7 +60,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = ../libapps$(LIBEXT) +BIN = ../../libapps$(LIBEXT) ROOTDEPPATH = --dep-path . diff --git a/apps/sdcard/README.txt b/apps/vsn/sdcard/README.txt index 332aa26cf..332aa26cf 100644 --- a/apps/sdcard/README.txt +++ b/apps/vsn/sdcard/README.txt diff --git a/apps/sdcard/sdcard.c b/apps/vsn/sdcard/sdcard.c index bf3e82a07..bf3e82a07 100644 --- a/apps/sdcard/sdcard.c +++ b/apps/vsn/sdcard/sdcard.c diff --git a/misc/buildroot/ChangeLog b/misc/buildroot/ChangeLog index 3ea2b60f3..c871bdd49 100644 --- a/misc/buildroot/ChangeLog +++ b/misc/buildroot/ChangeLog @@ -89,4 +89,7 @@ buildroot-1.10 2011-xx-xx <spudmonkey@racsa.co.cr> .exe files). That is probably not usable for most NuttX targets. Instead, you should use this i486-elf-gcc to generate true ELF binaries under Cygwin. + * Makefile - Alter copy arguements to avoid permissions problems when + copying NuttX header files. + diff --git a/misc/buildroot/Makefile b/misc/buildroot/Makefile index 5000dec8f..166b13c04 100644 --- a/misc/buildroot/Makefile +++ b/misc/buildroot/Makefile @@ -122,7 +122,7 @@ $(NUTTX_DIR)/include/arch: $(NUTTX_DIR) $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include : $(STAGING_DIR) $(NUTTX_DIR)/include/arch @mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include || \ { echo "Failed to create $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include" ; exit 1 ; } - @cp -a $(NUTTX_DIR)/include/* $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include/. || \ + @cp -aLf $(NUTTX_DIR)/include/* $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include/. || \ { echo "Failed to copy Nuttx header files" ; exit 1 ; } $(TOOL_BUILD_DIR): diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 11056a44c..1904cf0f0 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1597,3 +1597,8 @@ * examples/nsh and apps/nshlib - Move the core NuttShell (NSH) logic out of the exemples directory and into the apps/directory where it belongs. + * apps/Makefile and configs/*/appconfig - Use '=' as the delimiter + instead of '/' so that sub-directories in apps/ can be used. + * apps/vsn - Move all VSN apps to apps/vsn. + + diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 61b6e1d3e..6d7414d3a 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -8,7 +8,7 @@ <tr align="center" bgcolor="#e4e4e4"> <td> <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1> - <p>Last Updated: March 18, 2011</p> + <p>Last Updated: March 19, 2011</p> </td> </tr> </table> @@ -2248,6 +2248,8 @@ buildroot-1.10 2011-xx-xx <spudmonkey@racsa.co.cr> .exe files). That is probably not usable for most NuttX targets. Instead, you should use this i486-elf-gcc to generate true ELF binaries under Cygwin. + * Makefile - Alter copy arguements to avoid permissions problems when + copying NuttX header files. </pre></ul> <table width ="100%"> diff --git a/nuttx/configs/vsn/nsh/appconfig b/nuttx/configs/vsn/nsh/appconfig index 0d7fd27f4..3371dc21a 100755 --- a/nuttx/configs/vsn/nsh/appconfig +++ b/nuttx/configs/vsn/nsh/appconfig @@ -54,19 +54,19 @@ CONFIGURED_APPS += nshlib=.built_always # Individual selection of built-in applications: # Hello world provide a simple skeleton/demo application -CONFIGURED_APPS += hello=.built_always +CONFIGURED_APPS += vsn/hello=.built_always # Provide poweroff command to switch off the board -CONFIGURED_APPS += poweroff=.built_always +CONFIGURED_APPS += vsn/poweroff=.built_always # Provide SDcard tool -CONFIGURED_APPS += sdcard=.built_always +CONFIGURED_APPS += vsn/sdcard=.built_always # Provide RAMTRON tool -CONFIGURED_APPS += ramtron=.built_always +CONFIGURED_APPS += vsn/ramtron=.built_always # Provide UNIX style free -CONFIGURED_APPS += free=.built_always +CONFIGURED_APPS += vsn/free=.built_always # Provide JAVA Virtual Machine (the Darjeeling JVM) -#CONFIGURED_APPS += jvm=.built_always +#CONFIGURED_APPS += vsn/jvm=.built_always |