Move nuttx/netutils to apps/netutils

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3401 42af7a65-404d-4744-a932-0658087f49c3

125 files changed, 3054 insertions, 837 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 7f95c5cd3..d81606a3f 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -47,7 +47,7 @@ APPDIR = ${shell pwd}
 # SUBDIRS is the list of all directories containing Makefiles.  It is used
 # only for cleaning.
 
-SUBDIRS = nshlib vsn
+SUBDIRS = nshlib netutils vsn
 
 # we use a non-existing .built_always to guarantee that Makefile
 # always walks into the sub-directories and asks for build
diff --git a/apps/README.txt b/apps/README.txt
index 86758dddf..b80393a03 100644
--- a/apps/README.txt
+++ b/apps/README.txt
@@ -52,6 +52,7 @@ will call:
 Application skeleton can be found under the hello sub-directory,
 which shows how an application can be added to the project. One must
 define:
+
  1. create sub-directory as: appname
  2. provide entry point: appname_main()
  3. set the requirements in the file: Makefile, specially the lines:
@@ -62,3 +63,6 @@ define:
 	CSRCS		= C source file list as foo1.c foo2.c ..
 
  4. add application in the apps/Makefile
+
+
+
diff --git a/nuttx/netutils/tftpc/Make.defs b/apps/netutils/Makefile
index 644b91778..3c3f11c43 100644
--- a/nuttx/netutils/tftpc/Make.defs
+++ b/apps/netutils/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
-# netutils/tftpc/Make.defs
+# apps/netutils/Makefile
 #
-#   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+#   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
@@ -33,9 +33,30 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NET_UDP),y)
-ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
-TFTPC_ASRCS =
-TFTPC_CSRCS = tftpc_get.c tftpc_put.c tftpc_packets.c
+-include $(TOPDIR)/.config	# Current configuration
+
+# Sub-directories
+
+ifeq ($(CONFIG_NET),y)
+SUBDIRS = uiplib dhcpc dhcpd resolv smtp telnetd webclient webserver tftpc thttpd
 endif
-endif
\ No newline at end of file
+
+all: nothing
+.PHONY: nothing depend clean distclean
+
+nothing:
+
+define DOMAKE
+	@(MAKE) -C $1 $2 TOPDIR="$(TOPDIR) APPDIR=$(APPDIR)"
+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/nuttx/netutils/README.txt b/apps/netutils/README.txt
index e4b05eb21..e4b05eb21 100644
--- a/nuttx/netutils/README.txt
+++ b/apps/netutils/README.txt
diff --git a/apps/netutils/dhcpc/Makefile b/apps/netutils/dhcpc/Makefile
new file mode 100644
index 000000000..7209907de
--- /dev/null
+++ b/apps/netutils/dhcpc/Makefile
@@ -0,0 +1,94 @@
+############################################################################
+# apps/netutils/dhcpc/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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+# DHCP Client Library
+
+ASRCS		=
+CSRCS		= 
+
+ifeq ($(CONFIG_NET_UDP),y)
+CSRCS		+= dhcpc.c
+endif
+
+AOBJS		= $(ASRCS:.S=$(OBJEXT))
+COBJS		= $(CSRCS:.c=$(OBJEXT))
+
+SRCS		= $(ASRCS) $(CSRCS)
+OBJS		= $(AOBJS) $(COBJS)
+
+BIN	    	= ../../libapps$(LIBEXT)
+
+ROOTDEPPATH	= --dep-path .
+
+# Common build
+
+VPATH		= 
+
+all: .built
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+$(BIN):	$(OBJS)
+	@( for obj in $(OBJS) ; do \
+		$(call ARCHIVE, $@, $${obj}); \
+	done ; )
+	@touch .built
+	
+.built: $(BIN)
+
+.depend: Makefile $(SRCS)
+	@$(MKDEP) $(ROOTDEPPATH) \
+	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@touch $@
+
+# Register application
+depend: .depend
+
+clean:
+	@rm -f $(BIN) *.o *~ .*.swp .built
+	$(call CLEAN)
+
+distclean: clean
+	@rm -f Make.dep .depend
+
+-include Make.dep
diff --git a/nuttx/netutils/dhcpc/dhcpc.c b/apps/netutils/dhcpc/dhcpc.c
index dc80988bb..dc80988bb 100644
--- a/nuttx/netutils/dhcpc/dhcpc.c
+++ b/apps/netutils/dhcpc/dhcpc.c
diff --git a/apps/netutils/dhcpd/Makefile b/apps/netutils/dhcpd/Makefile
new file mode 100644
index 000000000..bcfb0330f
--- /dev/null
+++ b/apps/netutils/dhcpd/Makefile
@@ -0,0 +1,94 @@
+############################################################################
+# apps/netutils/dhcpd/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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+# DHCP Daemn Library
+
+ASRCS		=
+CSRCS		= 
+
+ifeq ($(CONFIG_NET_UDP),y)
+CSRCS		+= dhcpd.c
+endif
+
+AOBJS		= $(ASRCS:.S=$(OBJEXT))
+COBJS		= $(CSRCS:.c=$(OBJEXT))
+
+SRCS		= $(ASRCS) $(CSRCS)
+OBJS		= $(AOBJS) $(COBJS)
+
+BIN	    	= ../../libapps$(LIBEXT)
+
+ROOTDEPPATH	= --dep-path .
+
+# Common build
+
+VPATH		= 
+
+all: .built
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+$(BIN):	$(OBJS)
+	@( for obj in $(OBJS) ; do \
+		$(call ARCHIVE, $@, $${obj}); \
+	done ; )
+	@touch .built
+	
+.built: $(BIN)
+
+.depend: Makefile $(SRCS)
+	@$(MKDEP) $(ROOTDEPPATH) \
+	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@touch $@
+
+# Register application
+depend: .depend
+
+clean:
+	@rm -f $(BIN) *.o *~ .*.swp .built
+	$(call CLEAN)
+
+distclean: clean
+	@rm -f Make.dep .depend
+
+-include Make.dep
diff --git a/nuttx/netutils/dhcpd/dhcpd.c b/apps/netutils/dhcpd/dhcpd.c
index 39050bd62..39050bd62 100644
--- a/nuttx/netutils/dhcpd/dhcpd.c
+++ b/apps/netutils/dhcpd/dhcpd.c
diff --git a/apps/netutils/resolv/Makefile b/apps/netutils/resolv/Makefile
new file mode 100644
index 000000000..b3ed975dd
--- /dev/null
+++ b/apps/netutils/resolv/Makefile
@@ -0,0 +1,94 @@
+############################################################################
+# apps/netutils/resolv/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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+# Resolver library
+
+ASRCS		=
+CSRCS		= 
+
+ifeq ($(CONFIG_NET_UDP),y)
+CSRCS		= resolv.c
+endif
+
+AOBJS		= $(ASRCS:.S=$(OBJEXT))
+COBJS		= $(CSRCS:.c=$(OBJEXT))
+
+SRCS		= $(ASRCS) $(CSRCS)
+OBJS		= $(AOBJS) $(COBJS)
+
+BIN	    	= ../../libapps$(LIBEXT)
+
+ROOTDEPPATH	= --dep-path .
+
+# Common build
+
+VPATH		= 
+
+all: .built
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+$(BIN):	$(OBJS)
+	@( for obj in $(OBJS) ; do \
+		$(call ARCHIVE, $@, $${obj}); \
+	done ; )
+	@touch .built
+	
+.built: $(BIN)
+
+.depend: Makefile $(SRCS)
+	@$(MKDEP) $(ROOTDEPPATH) \
+	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@touch $@
+
+# Register application
+depend: .depend
+
+clean:
+	@rm -f $(BIN) *.o *~ .*.swp .built
+	$(call CLEAN)
+
+distclean: clean
+	@rm -f Make.dep .depend
+
+-include Make.dep
diff --git a/nuttx/netutils/resolv/resolv.c b/apps/netutils/resolv/resolv.c
index db9e00085..db9e00085 100644
--- a/nuttx/netutils/resolv/resolv.c
+++ b/apps/netutils/resolv/resolv.c
diff --git a/apps/netutils/smtp/Makefile b/apps/netutils/smtp/Makefile
new file mode 100644
index 000000000..05ace5c53
--- /dev/null
+++ b/apps/netutils/smtp/Makefile
@@ -0,0 +1,94 @@
+############################################################################
+# apps/netutils/smtp/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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+# SMTP Library
+
+ASRCS		=
+CSRCS		= 
+
+ifeq ($(CONFIG_NET_TCP),y)
+CSRCS		+= smtp.c
+endif
+
+AOBJS		= $(ASRCS:.S=$(OBJEXT))
+COBJS		= $(CSRCS:.c=$(OBJEXT))
+
+SRCS		= $(ASRCS) $(CSRCS)
+OBJS		= $(AOBJS) $(COBJS)
+
+BIN	    	= ../../libapps$(LIBEXT)
+
+ROOTDEPPATH	= --dep-path .
+
+# Common build
+
+VPATH		= 
+
+all: .built
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+$(BIN):	$(OBJS)
+	@( for obj in $(OBJS) ; do \
+		$(call ARCHIVE, $@, $${obj}); \
+	done ; )
+	@touch .built
+	
+.built: $(BIN)
+
+.depend: Makefile $(SRCS)
+	@$(MKDEP) $(ROOTDEPPATH) \
+	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@touch $@
+
+# Register application
+depend: .depend
+
+clean:
+	@rm -f $(BIN) *.o *~ .*.swp .built
+	$(call CLEAN)
+
+distclean: clean
+	@rm -f Make.dep .depend
+
+-include Make.dep
diff --git a/nuttx/netutils/smtp/smtp.c b/apps/netutils/smtp/smtp.c
index d758c6f6b..d758c6f6b 100644
--- a/nuttx/netutils/smtp/smtp.c
+++ b/apps/netutils/smtp/smtp.c
diff --git a/apps/netutils/telnetd/Makefile b/apps/netutils/telnetd/Makefile
new file mode 100644
index 000000000..4c345d487
--- /dev/null
+++ b/apps/netutils/telnetd/Makefile
@@ -0,0 +1,94 @@
+############################################################################
+# apps/netutils/telnetd/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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+# Telnet daemon
+
+ASRCS		=
+CSRCS		= 
+
+ifeq ($(CONFIG_NET_TCP),y)
+CSRCS		+= telnetd.c shell.c
+endif
+
+AOBJS		= $(ASRCS:.S=$(OBJEXT))
+COBJS		= $(CSRCS:.c=$(OBJEXT))
+
+SRCS		= $(ASRCS) $(CSRCS)
+OBJS		= $(AOBJS) $(COBJS)
+
+BIN	    	= ../../libapps$(LIBEXT)
+
+ROOTDEPPATH	= --dep-path .
+
+# Common build
+
+VPATH		= 
+
+all: .built
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+$(BIN):	$(OBJS)
+	@( for obj in $(OBJS) ; do \
+		$(call ARCHIVE, $@, $${obj}); \
+	done ; )
+	@touch .built
+	
+.built: $(BIN)
+
+.depend: Makefile $(SRCS)
+	@$(MKDEP) $(ROOTDEPPATH) \
+	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@touch $@
+
+# Register application
+depend: .depend
+
+clean:
+	@rm -f $(BIN) *.o *~ .*.swp .built
+	$(call CLEAN)
+
+distclean: clean
+	@rm -f Make.dep .depend
+
+-include Make.dep
diff --git a/nuttx/netutils/telnetd/README.txt b/apps/netutils/telnetd/README.txt
index 24fcba7d5..24fcba7d5 100644
--- a/nuttx/netutils/telnetd/README.txt
+++ b/apps/netutils/telnetd/README.txt
diff --git a/nuttx/netutils/telnetd/shell.c b/apps/netutils/telnetd/shell.c
index 93fd11601..93fd11601 100644
--- a/nuttx/netutils/telnetd/shell.c
+++ b/apps/netutils/telnetd/shell.c
diff --git a/nuttx/netutils/telnetd/shell.h b/apps/netutils/telnetd/shell.h
index 32325fe17..32325fe17 100644
--- a/nuttx/netutils/telnetd/shell.h
+++ b/apps/netutils/telnetd/shell.h
diff --git a/nuttx/netutils/telnetd/telnetd.c b/apps/netutils/telnetd/telnetd.c
index ccadd60dd..ccadd60dd 100644
--- a/nuttx/netutils/telnetd/telnetd.c
+++ b/apps/netutils/telnetd/telnetd.c
diff --git a/apps/netutils/tftpc/Makefile b/apps/netutils/tftpc/Makefile
new file mode 100644
index 000000000..24bf1d4c6
--- /dev/null
+++ b/apps/netutils/tftpc/Makefile
@@ -0,0 +1,96 @@
+############################################################################
+# apps/netutils/tftpc/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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+# TFTP Client Library
+
+ASRCS		=
+CSRCS		= 
+
+ifeq ($(CONFIG_NET_UDP),y)
+ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
+CSRCS		+= tftpc_get.c tftpc_put.c tftpc_packets.c
+endif
+endif
+
+AOBJS		= $(ASRCS:.S=$(OBJEXT))
+COBJS		= $(CSRCS:.c=$(OBJEXT))
+
+SRCS		= $(ASRCS) $(CSRCS)
+OBJS		= $(AOBJS) $(COBJS)
+
+BIN	    	= ../../libapps$(LIBEXT)
+
+ROOTDEPPATH	= --dep-path .
+
+# Common build
+
+VPATH		= 
+
+all: .built
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+$(BIN):	$(OBJS)
+	@( for obj in $(OBJS) ; do \
+		$(call ARCHIVE, $@, $${obj}); \
+	done ; )
+	@touch .built
+	
+.built: $(BIN)
+
+.depend: Makefile $(SRCS)
+	@$(MKDEP) $(ROOTDEPPATH) \
+	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@touch $@
+
+# Register application
+depend: .depend
+
+clean:
+	@rm -f $(BIN) *.o *~ .*.swp .built
+	$(call CLEAN)
+
+distclean: clean
+	@rm -f Make.dep .depend
+
+-include Make.dep
diff --git a/nuttx/netutils/tftpc/tftpc_get.c b/apps/netutils/tftpc/tftpc_get.c
index e0779d17d..e0779d17d 100644
--- a/nuttx/netutils/tftpc/tftpc_get.c
+++ b/apps/netutils/tftpc/tftpc_get.c
diff --git a/nuttx/netutils/tftpc/tftpc_internal.h b/apps/netutils/tftpc/tftpc_internal.h
index ffaecdb13..ffaecdb13 100644
--- a/nuttx/netutils/tftpc/tftpc_internal.h
+++ b/apps/netutils/tftpc/tftpc_internal.h
diff --git a/nuttx/netutils/tftpc/tftpc_packets.c b/apps/netutils/tftpc/tftpc_packets.c
index d43410ff4..d43410ff4 100644
--- a/nuttx/netutils/tftpc/tftpc_packets.c
+++ b/apps/netutils/tftpc/tftpc_packets.c
diff --git a/nuttx/netutils/tftpc/tftpc_put.c b/apps/netutils/tftpc/tftpc_put.c
index 4d87ba908..4d87ba908 100644
--- a/nuttx/netutils/tftpc/tftpc_put.c
+++ b/apps/netutils/tftpc/tftpc_put.c
diff --git a/nuttx/netutils/thttpd/Makefile b/apps/netutils/thttpd/Makefile
index f317e40a7..85e603f22 100644
--- a/nuttx/netutils/thttpd/Makefile
+++ b/apps/netutils/thttpd/Makefile
@@ -1,7 +1,7 @@
 #############################################################################
-# netutils/thttpd/Makefile
+# apps/netutils/thttpd/Makefile
 #
-#   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,30 @@
 
 -include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
 
-CGIBINDIR	= $(TOPDIR)/netutils/thttpd/cgi-bin
+# THTTPD Library
+
+ASRCS		=
+CSRCS		= 
+
+ifeq ($(CONFIG_NET_TCP),y)
+CSRCS		+= thttpd.c libhttpd.c thttpd_cgi.c thttpd_alloc.c thttpd_strings.c timers.c fdwatch.c tdate_parse.c
+endif
+
+AOBJS		= $(ASRCS:.S=$(OBJEXT))
+COBJS		= $(CSRCS:.c=$(OBJEXT))
+
+SRCS		= $(ASRCS) $(CSRCS)
+OBJS		= $(AOBJS) $(COBJS)
+
+BIN	    	= ../../libapps$(LIBEXT)
+
+ROOTDEPPATH	= --dep-path .
+
+# CGI binaries (examples only, not used in the build)
+
+CGIBINDIR	= $(APPDIR)/netutils/thttpd/cgi-bin
 
 SUBDIRS		=
 ifeq ($(CONFIG_NXFLAT),y)
@@ -47,7 +69,7 @@ SUBDIR_BIN3	= ssi
 SUBDIR_BIN	+= cgi-bin/$(SUBDIR_BIN1) cgi-bin/$(SUBDIR_BIN2)  cgi-bin/$(SUBDIR_BIN3)
 endif
 
-all:	$(SUBDIR_BIN)
+all: $(SUBDIR_BIN) $(BIN)
 .PHONY: depend clean distclean
 
 ifeq ($(CONFIG_NXFLAT),y)
@@ -73,16 +95,27 @@ cgi-bin/$(SUBDIR_BIN3): cgi-bin cgi-src/$(SUBDIR_BIN3)
 	@cp -a cgi-src/$(SUBDIR_BIN3) $@
 endif
 
-depend:
+$(BIN):	$(OBJS)
+	@( for obj in $(OBJS) ; do \
+		$(call ARCHIVE, $@, $${obj}); \
+	done ; )
+	@touch .built
+	
+.built: $(BIN)
+
+.depend: Makefile $(SRCS)
+	@$(MKDEP) $(ROOTDEPPATH) \
+	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@touch $@
+
+# Register application
+depend: .depend
 
 clean:
-	@rm -f *~ .*.swp
-	@rm -rf cgi-bin
-	@$(MAKE) -C cgi-src clean
+	@rm -f $(BIN) *.o *~ .*.swp .built
+	$(call CLEAN)
 
 distclean: clean
-	@$(MAKE) -C cgi-src distclean
+	@rm -f Make.dep .depend
 
 -include Make.dep
-
-
diff --git a/nuttx/netutils/thttpd/cgi-src/Makefile b/apps/netutils/thttpd/cgi-src/Makefile
index 79814fb80..3f025dec3 100644
--- a/nuttx/netutils/thttpd/cgi-src/Makefile
+++ b/apps/netutils/thttpd/cgi-src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
-# examples/nxflat/tests/hello/Makefile
+# apps/netutils/cgi-src/Makefile
 #
-#   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -33,17 +33,17 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config	# Current configuration
--include $(TOPDIR)/Make.defs	# Basic make info
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
 
-CFLAGS		+= -I$(TOPDIR)/netutils/thttpd -I$(TOPDIR)/netutils/thttpd/cgi-src
-CGIBINDIR	= $(TOPDIR)/netutils/thttpd/cgi-bin
+CFLAGS		+= -I$(APPDIR)/netutils/thttpd -I$(APPDIR)/netutils/thttpd/cgi-src
+CGIBINDIR	= $(APPDIR)/netutils/thttpd/cgi-bin
 CLEANFILES	= *.o redirect ssi phf
 
 BIN1			= phf
 BIN2			= redirect
 BIN3			= ssi
-BIN			= $(BIN1) $(BIN2) $(BIN3)
+BIN				= $(BIN1) $(BIN2) $(BIN3)
 
 R1SRCS1			= $(BIN1).c
 R1OBJS1			= $(R1SRCS1:.c=.o)
diff --git a/nuttx/netutils/thttpd/cgi-src/phf.c b/apps/netutils/thttpd/cgi-src/phf.c
index 2541481c4..2541481c4 100644
--- a/nuttx/netutils/thttpd/cgi-src/phf.c
+++ b/apps/netutils/thttpd/cgi-src/phf.c
diff --git a/nuttx/netutils/thttpd/cgi-src/redirect.c b/apps/netutils/thttpd/cgi-src/redirect.c
index 84f3b8712..84f3b8712 100644
--- a/nuttx/netutils/thttpd/cgi-src/redirect.c
+++ b/apps/netutils/thttpd/cgi-src/redirect.c
diff --git a/nuttx/netutils/thttpd/cgi-src/ssi.c b/apps/netutils/thttpd/cgi-src/ssi.c
index 4afb141f9..4afb141f9 100644
--- a/nuttx/netutils/thttpd/cgi-src/ssi.c
+++ b/apps/netutils/thttpd/cgi-src/ssi.c
diff --git a/nuttx/netutils/thttpd/config.h b/apps/netutils/thttpd/config.h
index f1b4c2d4c..f1b4c2d4c 100644
--- a/nuttx/netutils/thttpd/config.h
+++ b/apps/netutils/thttpd/config.h
diff --git a/nuttx/netutils/thttpd/fdwatch.c b/apps/netutils/thttpd/fdwatch.c
index 24ea7a1e0..24ea7a1e0 100644
--- a/nuttx/netutils/thttpd/fdwatch.c
+++ b/apps/netutils/thttpd/fdwatch.c
diff --git a/nuttx/netutils/thttpd/fdwatch.h b/apps/netutils/thttpd/fdwatch.h
index e60727db1..e60727db1 100644
--- a/nuttx/netutils/thttpd/fdwatch.h
+++ b/apps/netutils/thttpd/fdwatch.h
diff --git a/nuttx/netutils/thttpd/libhttpd.c b/apps/netutils/thttpd/libhttpd.c
index 05831b335..05831b335 100644
--- a/nuttx/netutils/thttpd/libhttpd.c
+++ b/apps/netutils/thttpd/libhttpd.c
diff --git a/nuttx/netutils/thttpd/libhttpd.h b/apps/netutils/thttpd/libhttpd.h
index f2e39e04d..f2e39e04d 100644
--- a/nuttx/netutils/thttpd/libhttpd.h
+++ b/apps/netutils/thttpd/libhttpd.h
diff --git a/nuttx/netutils/thttpd/mime_types.h b/apps/netutils/thttpd/mime_types.h
index cd0c514a8..cd0c514a8 100644
--- a/nuttx/netutils/thttpd/mime_types.h
+++ b/apps/netutils/thttpd/mime_types.h
diff --git a/nuttx/netutils/thttpd/tdate_parse.c b/apps/netutils/thttpd/tdate_parse.c
index d9ace1b41..d9ace1b41 100644
--- a/nuttx/netutils/thttpd/tdate_parse.c
+++ b/apps/netutils/thttpd/tdate_parse.c
diff --git a/nuttx/netutils/thttpd/tdate_parse.h b/apps/netutils/thttpd/tdate_parse.h
index 301d5467a..301d5467a 100644
--- a/nuttx/netutils/thttpd/tdate_parse.h
+++ b/apps/netutils/thttpd/tdate_parse.h
diff --git a/nuttx/netutils/thttpd/thttpd.c b/apps/netutils/thttpd/thttpd.c
index 3b49c0141..3b49c0141 100644
--- a/nuttx/netutils/thttpd/thttpd.c
+++ b/apps/netutils/thttpd/thttpd.c
diff --git a/nuttx/netutils/thttpd/thttpd_alloc.c b/apps/netutils/thttpd/thttpd_alloc.c
index 71c71397b..71c71397b 100755
--- a/nuttx/netutils/thttpd/thttpd_alloc.c
+++ b/apps/netutils/thttpd/thttpd_alloc.c
diff --git a/nuttx/netutils/thttpd/thttpd_alloc.h b/apps/netutils/thttpd/thttpd_alloc.h
index 1f24bc2e9..1f24bc2e9 100755
--- a/nuttx/netutils/thttpd/thttpd_alloc.h
+++ b/apps/netutils/thttpd/thttpd_alloc.h
diff --git a/nuttx/netutils/thttpd/thttpd_cgi.c b/apps/netutils/thttpd/thttpd_cgi.c
index ee126795a..ee126795a 100755
--- a/nuttx/netutils/thttpd/thttpd_cgi.c
+++ b/apps/netutils/thttpd/thttpd_cgi.c
diff --git a/nuttx/netutils/thttpd/thttpd_cgi.h b/apps/netutils/thttpd/thttpd_cgi.h
index 2d98e25ec..2d98e25ec 100755
--- a/nuttx/netutils/thttpd/thttpd_cgi.h
+++ b/apps/netutils/thttpd/thttpd_cgi.h
diff --git a/nuttx/netutils/thttpd/thttpd_strings.c b/apps/netutils/thttpd/thttpd_strings.c
index 82836ee99..82836ee99 100755
--- a/nuttx/netutils/thttpd/thttpd_strings.c
+++ b/apps/netutils/thttpd/thttpd_strings.c
diff --git a/nuttx/netutils/thttpd/thttpd_strings.h b/apps/netutils/thttpd/thttpd_strings.h
index 5bbaf7948..5bbaf7948 100755
--- a/nuttx/netutils/thttpd/thttpd_strings.h
+++ b/apps/netutils/thttpd/thttpd_strings.h
diff --git a/nuttx/netutils/thttpd/timers.c b/apps/netutils/thttpd/timers.c
index 8edd7b21b..8edd7b21b 100644
--- a/nuttx/netutils/thttpd/timers.c
+++ b/apps/netutils/thttpd/timers.c
diff --git a/nuttx/netutils/thttpd/timers.h b/apps/netutils/thttpd/timers.h
index 2d28d3558..2d28d3558 100644
--- a/nuttx/netutils/thttpd/timers.h
+++ b/apps/netutils/thttpd/timers.h
diff --git a/apps/netutils/uiplib/Makefile b/apps/netutils/uiplib/Makefile
new file mode 100644
index 000000000..ef6c65156
--- /dev/null
+++ b/apps/netutils/uiplib/Makefile
@@ -0,0 +1,103 @@
+############################################################################
+# apps/netutils/uiplib/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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+# UIP Library
+
+ASRCS		=
+CSRCS		= uiplib.c uip_sethostaddr.c uip_gethostaddr.c uip_setdraddr.c \
+			  uip_setnetmask.c uip_parsehttpurl.c uip_server.c
+
+# No MAC address support for SLIP (Ethernet only)
+
+ifneq ($(CONFIG_NET_SLIP),y)
+CSRCS		+= uip_setmacaddr.c uip_getmacaddr.c
+endif
+
+# IGMP support
+
+ifeq ($(CONFIG_NET_IGMP),y)
+CSRCS		+= uip_ipmsfilter.c
+endif
+
+AOBJS		= $(ASRCS:.S=$(OBJEXT))
+COBJS		= $(CSRCS:.c=$(OBJEXT))
+
+SRCS		= $(ASRCS) $(CSRCS)
+OBJS		= $(AOBJS) $(COBJS)
+
+BIN	    	= ../../libapps$(LIBEXT)
+
+ROOTDEPPATH	= --dep-path .
+
+# Common build
+
+VPATH		= 
+
+all: .built
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+$(BIN):	$(OBJS)
+	@( for obj in $(OBJS) ; do \
+		$(call ARCHIVE, $@, $${obj}); \
+	done ; )
+	@touch .built
+	
+.built: $(BIN)
+
+.depend: Makefile $(SRCS)
+	@$(MKDEP) $(ROOTDEPPATH) \
+	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@touch $@
+
+# Register application
+depend: .depend
+
+clean:
+	@rm -f $(BIN) *.o *~ .*.swp .built
+	$(call CLEAN)
+
+distclean: clean
+	@rm -f Make.dep .depend
+
+-include Make.dep
diff --git a/nuttx/netutils/uiplib/uip_gethostaddr.c b/apps/netutils/uiplib/uip_gethostaddr.c
index 0de639d6c..0de639d6c 100644
--- a/nuttx/netutils/uiplib/uip_gethostaddr.c
+++ b/apps/netutils/uiplib/uip_gethostaddr.c
diff --git a/nuttx/netutils/uiplib/uip_getmacaddr.c b/apps/netutils/uiplib/uip_getmacaddr.c
index c99bc7a7d..c99bc7a7d 100644
--- a/nuttx/netutils/uiplib/uip_getmacaddr.c
+++ b/apps/netutils/uiplib/uip_getmacaddr.c
diff --git a/nuttx/netutils/uiplib/uip_ipmsfilter.c b/apps/netutils/uiplib/uip_ipmsfilter.c
index ccae4a680..ccae4a680 100755
--- a/nuttx/netutils/uiplib/uip_ipmsfilter.c
+++ b/apps/netutils/uiplib/uip_ipmsfilter.c
diff --git a/nuttx/netutils/uiplib/uip_parsehttpurl.c b/apps/netutils/uiplib/uip_parsehttpurl.c
index bda5502b7..bda5502b7 100644
--- a/nuttx/netutils/uiplib/uip_parsehttpurl.c
+++ b/apps/netutils/uiplib/uip_parsehttpurl.c
diff --git a/nuttx/netutils/uiplib/uip_server.c b/apps/netutils/uiplib/uip_server.c
index f58f063de..f58f063de 100644
--- a/nuttx/netutils/uiplib/uip_server.c
+++ b/apps/netutils/uiplib/uip_server.c
diff --git a/nuttx/netutils/uiplib/uip_setdraddr.c b/apps/netutils/uiplib/uip_setdraddr.c
index 79eac5b97..79eac5b97 100644
--- a/nuttx/netutils/uiplib/uip_setdraddr.c
+++ b/apps/netutils/uiplib/uip_setdraddr.c
diff --git a/nuttx/netutils/uiplib/uip_sethostaddr.c b/apps/netutils/uiplib/uip_sethostaddr.c
index ccc7526b9..ccc7526b9 100644
--- a/nuttx/netutils/uiplib/uip_sethostaddr.c
+++ b/apps/netutils/uiplib/uip_sethostaddr.c
diff --git a/nuttx/netutils/uiplib/uip_setmacaddr.c b/apps/netutils/uiplib/uip_setmacaddr.c
index 28188b7f8..28188b7f8 100644
--- a/nuttx/netutils/uiplib/uip_setmacaddr.c
+++ b/apps/netutils/uiplib/uip_setmacaddr.c
diff --git a/nuttx/netutils/uiplib/uip_setnetmask.c b/apps/netutils/uiplib/uip_setnetmask.c
index 2cdc38474..2cdc38474 100644
--- a/nuttx/netutils/uiplib/uip_setnetmask.c
+++ b/apps/netutils/uiplib/uip_setnetmask.c
diff --git a/nuttx/netutils/uiplib/uiplib.c b/apps/netutils/uiplib/uiplib.c
index 99f716f5c..99f716f5c 100644
--- a/nuttx/netutils/uiplib/uiplib.c
+++ b/apps/netutils/uiplib/uiplib.c
diff --git a/apps/netutils/webclient/Makefile b/apps/netutils/webclient/Makefile
new file mode 100644
index 000000000..597b0c5c3
--- /dev/null
+++ b/apps/netutils/webclient/Makefile
@@ -0,0 +1,94 @@
+############################################################################
+# apps/netutils/webclient/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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+# Web client library
+
+ASRCS		=
+CSRCS		= 
+
+ifeq ($(CONFIG_NET_TCP),y)
+CSRCS		= webclient.c
+endif
+
+AOBJS		= $(ASRCS:.S=$(OBJEXT))
+COBJS		= $(CSRCS:.c=$(OBJEXT))
+
+SRCS		= $(ASRCS) $(CSRCS)
+OBJS		= $(AOBJS) $(COBJS)
+
+BIN	    	= ../../libapps$(LIBEXT)
+
+ROOTDEPPATH	= --dep-path .
+
+# Common build
+
+VPATH		= 
+
+all: .built
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+$(BIN):	$(OBJS)
+	@( for obj in $(OBJS) ; do \
+		$(call ARCHIVE, $@, $${obj}); \
+	done ; )
+	@touch .built
+	
+.built: $(BIN)
+
+.depend: Makefile $(SRCS)
+	@$(MKDEP) $(ROOTDEPPATH) \
+	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@touch $@
+
+# Register application
+depend: .depend
+
+clean:
+	@rm -f $(BIN) *.o *~ .*.swp .built
+	$(call CLEAN)
+
+distclean: clean
+	@rm -f Make.dep .depend
+
+-include Make.dep
diff --git a/nuttx/netutils/webclient/webclient.c b/apps/netutils/webclient/webclient.c
index 2c5108a4a..2c5108a4a 100644
--- a/nuttx/netutils/webclient/webclient.c
+++ b/apps/netutils/webclient/webclient.c
diff --git a/apps/netutils/webserver/Makefile b/apps/netutils/webserver/Makefile
new file mode 100644
index 000000000..5072e7782
--- /dev/null
+++ b/apps/netutils/webserver/Makefile
@@ -0,0 +1,94 @@
+############################################################################
+# apps/netutils/webserver/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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+# Web server library
+
+ASRCS		=
+CSRCS		= 
+
+ifeq ($(CONFIG_NET_TCP),y)
+CSRCS		= httpd.c httpd_fs.c httpd_cgi.c
+endif
+
+AOBJS		= $(ASRCS:.S=$(OBJEXT))
+COBJS		= $(CSRCS:.c=$(OBJEXT))
+
+SRCS		= $(ASRCS) $(CSRCS)
+OBJS		= $(AOBJS) $(COBJS)
+
+BIN	    	= ../../libapps$(LIBEXT)
+
+ROOTDEPPATH	= --dep-path .
+
+# Common build
+
+VPATH		= 
+
+all: .built
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+$(BIN):	$(OBJS)
+	@( for obj in $(OBJS) ; do \
+		$(call ARCHIVE, $@, $${obj}); \
+	done ; )
+	@touch .built
+	
+.built: $(BIN)
+
+.depend: Makefile $(SRCS)
+	@$(MKDEP) $(ROOTDEPPATH) \
+	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@touch $@
+
+# Register application
+depend: .depend
+
+clean:
+	@rm -f $(BIN) *.o *~ .*.swp .built
+	$(call CLEAN)
+
+distclean: clean
+	@rm -f Make.dep .depend
+
+-include Make.dep
diff --git a/nuttx/netutils/webserver/httpd.c b/apps/netutils/webserver/httpd.c
index 9322b58dc..9322b58dc 100644
--- a/nuttx/netutils/webserver/httpd.c
+++ b/apps/netutils/webserver/httpd.c
diff --git a/nuttx/netutils/webserver/httpd.h b/apps/netutils/webserver/httpd.h
index 52073765c..52073765c 100644
--- a/nuttx/netutils/webserver/httpd.h
+++ b/apps/netutils/webserver/httpd.h
diff --git a/nuttx/netutils/webserver/httpd_cgi.c b/apps/netutils/webserver/httpd_cgi.c
index 967ef9b9c..967ef9b9c 100644
--- a/nuttx/netutils/webserver/httpd_cgi.c
+++ b/apps/netutils/webserver/httpd_cgi.c
diff --git a/nuttx/netutils/webserver/httpd_cgi.h b/apps/netutils/webserver/httpd_cgi.h
index 9547bca33..9547bca33 100644
--- a/nuttx/netutils/webserver/httpd_cgi.h
+++ b/apps/netutils/webserver/httpd_cgi.h
diff --git a/nuttx/netutils/webserver/httpd_fs.c b/apps/netutils/webserver/httpd_fs.c
index 731f19498..731f19498 100644
--- a/nuttx/netutils/webserver/httpd_fs.c
+++ b/apps/netutils/webserver/httpd_fs.c
diff --git a/nuttx/netutils/webserver/httpd_fsdata.c b/apps/netutils/webserver/httpd_fsdata.c
index c9cd8a20c..c9cd8a20c 100644
--- a/nuttx/netutils/webserver/httpd_fsdata.c
+++ b/apps/netutils/webserver/httpd_fsdata.c
diff --git a/nuttx/netutils/webserver/httpd_fsdata.h b/apps/netutils/webserver/httpd_fsdata.h
index d0a69affa..d0a69affa 100644
--- a/nuttx/netutils/webserver/httpd_fsdata.h
+++ b/apps/netutils/webserver/httpd_fsdata.h
diff --git a/nuttx/netutils/webserver/makefsdata b/apps/netutils/webserver/makefsdata
index 71b6bd344..71b6bd344 100755
--- a/nuttx/netutils/webserver/makefsdata
+++ b/apps/netutils/webserver/makefsdata
diff --git a/apps/nshlib/Makefile b/apps/nshlib/Makefile
index 74cfccc9e..f5410dc4b 100644
--- a/apps/nshlib/Makefile
+++ b/apps/nshlib/Makefile
@@ -33,15 +33,9 @@
 #
 ############################################################################
 
-# TODO, this makefile should run make under the app dirs, instead of
-# sourcing the Make.defs!
-
+-include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
-include ../Make.defs
-
-ifeq ($(WINTOOL),y)
-INCDIROPT	= -w
-endif
+include $(APPDIR)/Make.defs
 
 # NSH Library
 
diff --git a/apps/vsn/Makefile b/apps/vsn/Makefile
index 3dde8e605..29b4f1b6a 100644
--- a/apps/vsn/Makefile
+++ b/apps/vsn/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# vsn/Makefile
+# apps/vsn/Makefile
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
diff --git a/apps/vsn/free/Makefile b/apps/vsn/free/Makefile
index d63f7af3e..421544f3c 100644
--- a/apps/vsn/free/Makefile
+++ b/apps/vsn/free/Makefile
@@ -37,8 +37,9 @@
 # TODO, this makefile should run make under the app dirs, instead of
 # sourcing the Make.defs!
 
+-include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
-include ../../Make.defs
+include $(APPDIR)/Make.defs
 
 ifeq ($(WINTOOL),y)
 INCDIROPT	= -w
diff --git a/apps/vsn/hello/Makefile b/apps/vsn/hello/Makefile
index a0bed80e1..3f4115ede 100644
--- a/apps/vsn/hello/Makefile
+++ b/apps/vsn/hello/Makefile
@@ -37,8 +37,9 @@
 # TODO, this makefile should run make under the app dirs, instead of
 # sourcing the Make.defs!
 
+-include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
-include ../../Make.defs
+include $(APPDIR)/Make.defs
 
 ifeq ($(WINTOOL),y)
 INCDIROPT	= -w
diff --git a/apps/vsn/poweroff/Makefile b/apps/vsn/poweroff/Makefile
index 8e3538a2b..80bde85b0 100644
--- a/apps/vsn/poweroff/Makefile
+++ b/apps/vsn/poweroff/Makefile
@@ -37,8 +37,9 @@
 # TODO, this makefile should run make under the app dirs, instead of
 # sourcing the Make.defs!
 
+-include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
-include ../../Make.defs
+include $(APPDIR)/Make.defs
 
 ifeq ($(WINTOOL),y)
 INCDIROPT	= -w
diff --git a/apps/vsn/ramtron/Makefile b/apps/vsn/ramtron/Makefile
index 42b73a09b..5803f1ffa 100644
--- a/apps/vsn/ramtron/Makefile
+++ b/apps/vsn/ramtron/Makefile
@@ -37,8 +37,9 @@
 # TODO, this makefile should run make under the app dirs, instead of
 # sourcing the Make.defs!
 
+-include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
-include ../../Make.defs
+include $(APPDIR)/Make.defs
 
 ifeq ($(WINTOOL),y)
 INCDIROPT	= -w
diff --git a/apps/vsn/sdcard/Makefile b/apps/vsn/sdcard/Makefile
index ccbd22952..b19ebdec7 100644
--- a/apps/vsn/sdcard/Makefile
+++ b/apps/vsn/sdcard/Makefile
@@ -37,8 +37,9 @@
 # TODO, this makefile should run make under the app dirs, instead of
 # sourcing the Make.defs!
 
+-include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
-include ../../Make.defs
+include $(APPDIR)/Make.defs
 
 ifeq ($(WINTOOL),y)
 INCDIROPT	= -w
diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html
index ae26bf3a2..2d77d4ab9 100644
--- a/nuttx/Documentation/NuttxPortingGuide.html
+++ b/nuttx/Documentation/NuttxPortingGuide.html
@@ -12,7 +12,7 @@
       <h1><big><font color="#3c34ec">
         <i>NuttX RTOS Porting Guide</i>
       </font></big></h1>
-      <p>Last Updated: March 18, 2011</p>
+      <p>Last Updated: March 19, 2011</p>
     </td>
   </tr>
 </table>
@@ -163,86 +163,96 @@
 </p>
 <ul><pre>
 .
-|-- <a href="#topmakefile">Makefile</a>
-|-- <a href="#DirStructDocumentation">Documentation</a>
-|   `-- <i>(documentation files)</i>/
-|-- <a href="#DirStructArch">arch</a>/
-|   |-- <i>&lt;arch-name&gt;</i>/
-|   |   |-- include/
-|   |   |   |--<i>&lt;chip-name&gt;</i>/
-|   |   |   |  `-- <i>(chip-specific header files)</i>
-|   |   |   |--<i>&lt;other-chips&gt;</i>/
-|   |   |   `-- <i>(architecture-specific header files)</i>
-|   |   `-- src/
-|   |       |--<i>&lt;chip-name&gt;</i>/
-|   |       |  `-- <i>(chip-specific source files)</i>
-|   |       |--<i>&lt;other-chips&gt;</i>/
-|   |       `-- <i>(architecture-specific source files)</i>
-|   `-- <i>&lt;other-architecture directories&gt;</i>/
-|-- <a href="#DirStructBinFmt">binfmt</a>/
-|   |-- Makefile
-|   |-- <i>(binfmt-specific sub-directories)</i>/
-|   |   `-- <i>(binfmt-specific source files)</i>
-|   `-- <i>(common binfmt source files)</i>
-|-- <a href="#DirStructConfigs">configs</a>/
-|   |-- <i>&lt;board-name&gt;</i>/
-|   |   |-- include/
-|   |   |   `-- <i>(other board-specific header files)</i>
-|   |   |-- src/
-|   |   |   `-- <i>(board-specific source files)</i>
-|   |   |---<i>&lt;config-name&gt;</i>/
-|   |   |   `-- <i>(board configuration-specific source files)</i>
-|   |   `---<i>(other configuration sub-directories for this board)</i>/
-|   `-- <i>&lt;(other board directories)&gt;</i>/
-|-- <a href="#DirStructDrivers">drivers</a>/
-|   |-- Makefile
-|   |-- <i>(driver-specific sub-directories)/</i>
-|   |   `-- <i>(driver-specific source files)</i>
-|   `-- <i>(common driver source files)</i>
-|-- <a href="#DirStructExamples">examples</a>/
-|   `-- <i>(example)</i>/
-|       |-- Makefile
-|       `-- <i>(example source files)</i>
-|-- <a href="#DirStructFs">fs</a>/
-|   |-- Makefile
-|   |-- <i>(file system-specific sub-directories)</i>/
-|   |   `-- <i>(file system-specific source files)</i>
-|   `-- <i>(common file system source files)</i>
-|-- <a href="#DirStructGraphics">graphics</a>/
-|   |-- Makefile
-|   |-- <i>(feature-specific sub-directories)</i>/
-|   |   `-- <i>(feature-specific source files library source files)</i>
-|   `-- <i>(common graphics-related source files)</i>
-|-- <a href="#DirStructInclude">include</a>/
-|   |-- <i>(standard header files)</i>
-|   |-- <i>(standard include sub-directories)</i>
-|   |   `-- <i>(more standard header files)</i>
-|   |-- <i>(non-standard include sub-directories)</i>
-|       `-- <i>(non-standard header files)</i>
-|-- <a href="#DirStructLib">lib</a>/
-|   |-- Makefile
-|   `-- <i>(lib source files)</i>
-|-- <a href="#DirStructLibXX">libxx</a>/
-|   |-- Makefile
-|   `-- <i>(libxx management source files)</i>
-|-- <a href="#DirStructMm">mm</a>/
-|   |-- Makefile
-|   `-- <i>(memory management source files)</i>
-|-- <a href="#DirStructNet">net</a>/
-|   |-- Makefile
-|   |-- uip/
-|   |   `-- <i>(uip source files)</i>
-|   `-- <i>(BSD socket source files)</i>
-|-- <a href="#DirStructNetUtils">netutils</a>/
-|   |-- Makefile
-|   |-- <i>(network feature sub-directories)</i>/
-|   |   `-- <i>(network feature source files)</i>
-|   `-- <i>(netutils common files)</i>
-|-- <a href="#DirStructSched">sched</a>/
-|   |-- Makefile
-|   `-- <i>(sched source files)</i>
-`-- <a href="#DirStructTools">tools</a>/
-    `-- <i>(miscellaneous scripts and programs)</i>
+|- nuttx
+|   |-- <a href="#topmakefile">Makefile</a>
+|   |-- <a href="#DirStructDocumentation">Documentation</a>
+|   |   `-- <i>(documentation files)</i>/
+|   |-- <a href="#DirStructArch">arch</a>/
+|   |   |-- <i>&lt;arch-name&gt;</i>/
+|   |   |   |-- include/
+|   |   |   |   |--<i>&lt;chip-name&gt;</i>/
+|   |   |   |   |  `-- <i>(chip-specific header files)</i>
+|   |   |   |   |--<i>&lt;other-chips&gt;</i>/
+|   |   |   |   `-- <i>(architecture-specific header files)</i>
+|   |   |   `-- src/
+|   |   |       |--<i>&lt;chip-name&gt;</i>/
+|   |   |       |  `-- <i>(chip-specific source files)</i>
+|   |   |       |--<i>&lt;other-chips&gt;</i>/
+|   |   |       `-- <i>(architecture-specific source files)</i>
+|   |   `-- <i>&lt;other-architecture directories&gt;</i>/
+|   |-- <a href="#DirStructBinFmt">binfmt</a>/
+|   |   |-- Makefile
+|   |   |-- <i>(binfmt-specific sub-directories)</i>/
+|   |   |   `-- <i>(binfmt-specific source files)</i>
+|   |   `-- <i>(common binfmt source files)</i>
+|   |-- <a href="#DirStructConfigs">configs</a>/
+|   |   |-- <i>&lt;board-name&gt;</i>/
+|   |   |   |-- include/
+|   |   |   |   `-- <i>(other board-specific header files)</i>
+|   |   |   |-- src/
+|   |   |   |   `-- <i>(board-specific source files)</i>
+|   |   |   |---<i>&lt;config-name&gt;</i>/
+|   |   |   |   `-- <i>(board configuration-specific source files)</i>
+|   |   |   `---<i>(other configuration sub-directories for this board)</i>/
+|   |   `-- <i>&lt;(other board directories)&gt;</i>/
+|   |-- <a href="#DirStructDrivers">drivers</a>/
+|   |   |-- Makefile
+|   |   |-- <i>(driver-specific sub-directories)/</i>
+|   |   |   `-- <i>(driver-specific source files)</i>
+|   |   `-- <i>(common driver source files)</i>
+|   |-- <a href="#DirStructExamples">examples</a>/
+|   |   `-- <i>(example)</i>/
+|   |       |-- Makefile
+|   |       `-- <i>(example source files)</i>
+|   |-- <a href="#DirStructFs">fs</a>/
+|   |   |-- Makefile
+|   |   |-- <i>(file system-specific sub-directories)</i>/
+|   |   |   `-- <i>(file system-specific source files)</i>
+|   |   `-- <i>(common file system source files)</i>
+|   |-- <a href="#DirStructGraphics">graphics</a>/
+|   |   |-- Makefile
+|   |   |-- <i>(feature-specific sub-directories)</i>/
+|   |   |   `-- <i>(feature-specific source files library source files)</i>
+|   |   `-- <i>(common graphics-related source files)</i>
+|   |-- <a href="#DirStructInclude">include</a>/
+|   |   |-- <i>(standard header files)</i>
+|   |   |-- <i>(standard include sub-directories)</i>
+|   |   |   `-- <i>(more standard header files)</i>
+|   |   |-- <i>(non-standard include sub-directories)</i>
+|   |       `-- <i>(non-standard header files)</i>
+|   |-- <a href="#DirStructLib">lib</a>/
+|   |   |-- Makefile
+|   |   `-- <i>(lib source files)</i>
+|   |-- <a href="#DirStructLibXX">libxx</a>/
+|   |   |-- Makefile
+|   |   `-- <i>(libxx management source files)</i>
+|   |-- <a href="#DirStructMm">mm</a>/
+|   |   |-- Makefile
+|   |   `-- <i>(memory management source files)</i>
+|   |-- <a href="#DirStructNet">net</a>/
+|   |   |-- Makefile
+|   |   |-- uip/
+|   |   |   `-- <i>(uip source files)</i>
+|   |   `-- <i>(BSD socket source files)</i>
+|   |-- <a href="#DirStructSched">sched</a>/
+|   |   |-- Makefile
+|   |   `-- <i>(sched source files)</i>
+|   `-- <a href="#DirStructTools">tools</a>/
+|       `-- <i>(miscellaneous scripts and programs)</i>
+`- apps
+    |-- <a href="#DirStructNetUtils">netutils</a>/
+    |   |-- Makefile
+    |   |-- <i>(network feature sub-directories)</i>/
+    |   |   `-- <i>(network feature source files)</i>
+    |   `-- <i>(netutils common files)</i>
+    |-- nshlib/
+    |   |-- Makefile
+    |   `-- <i>NuttShell (NSH) files</i>
+    `-- <i>(Board-specific applications)</i>/
+        |-- Makefile
+        |-- <i>(Board-specific application sub-directories)</i>/
+        |   `-- <i>(Board-specific application source files)</i>
+        `-- <i>(Board-specific common files)</i>
 </pre></ul>
 
 <p>
@@ -926,6 +936,9 @@ netutils/
 |-- tftpc/
 |   |-- Make.defs
 |   `-- <i>(tftpc source files)</i>
+|-- thttpd/
+|   |-- Make.defs
+|   `-- <i>(thttpd source files)</i>
 |-- uiplib/
 |   |-- Make.defs
 |   `-- <i>(uiplib source files)</i>
diff --git a/nuttx/Documentation/README.html b/nuttx/Documentation/README.html
index 034f84269..63f83166b 100755
--- a/nuttx/Documentation/README.html
+++ b/nuttx/Documentation/README.html
@@ -3,13 +3,13 @@
 <title>README Files</title>
 </head>
 <body background="backgd.gif">
-<base href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk/nuttx/include/nuttx/" TARGET="_self">
+<base href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk" TARGET="_self">
 <hr><hr>
 <table width ="100%">
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttX README Files</i></font></big></h1>
-      <p>Last Updated: March 6, 2010</p>
+      <p>Last Updated: March 19, 2010</p>
     </td>
   </tr>
 </table>
@@ -22,158 +22,168 @@
 </p>
 <ul><pre>
  .
- |
- |- arch/
+ | - nuttx
  |   |
- |   |- arm
- |   |   `- src
- |   |       `- <a href="arch/arm/src/lpc214x/README.txt?view=log">lpc214x/README.txt</a>
- |   |- sh/
- |   |   |- include/
- |   |   |   |-<a href="arch/sh/include/m16c/README.txt?view=log">m16c/README.txt</a>
- |   |   |   |-<a href="arch/sh/include/sh1/README.txt?view=log">sh1/README.txt</a>
- |   |   |   `-<a href="arch/sh/include/README.txt?view=log">README.txt</a>
- |   |   |- src/
- |   |   |   |-<a href="arch/sh/src/common/README.txt?view=log">common/README.txt</a>
- |   |   |   |-<a href="arch/sh/src/m16c/README.txt?view=log">m16c/README.txt</a>
- |   |   |   |-<a href="arch/sh/src/sh1/README.txt?view=log">sh1/README.txt</a>
- |   |   |   `-<a href="arch/sh/src/README.txt?view=log">README.txt</a>
- |   |- x86/
- |   |   |- include/
- |   |   |   `-<a href="arch/x86/include/README.txt?view=log">README.txt</a>
- |   |   `- src/
- |   |       `-<a href="arch/x86/src/README.txt?view=log">README.txt</a>
- |   `- z80/
- |   |   `- src/
- |   |       `- <a href="arch/z80/src/z80/README.txt?view=log">z80/README.txt</a>
- |   `- <a href="arch/README.txt?view=log"><b><i>README.txt</i></b></a>
- |- configs/
- |   |- avr32dev1/
- |   |   `- <a href="configs/avr32dev1/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- c5471evm/
- |   |   |- <a href="configs/c5471evm/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/c5471evm/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/c5471evm/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- demo9s12ne64/
- |   |   `- <a href="configs/demo9s12ne64/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- ea3131/
- |   |   `- <a href="configs/ea3131/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- eagle100/
- |   |   |- <a href="configs/eagle100/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/eagle100/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/eagle100/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- ez80f910200kitg/
- |   |   |- <a href="configs/ez80f910200kitg/ostest/README.txt?view=log">ostest/README.txt</a>
- |   |   `- <a href="configs/ez80f910200kitg/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- ez80f910200zco/
- |   |   |- <a href="configs/ez80f910200zco/ostest/README.txt?view=log">dhcpd/README.txt</a>
- |   |   |- <a href="configs/ez80f910200zco/httpd/README.txt?view=log">httpd/README.txt</a>
- |   |   |- <a href="configs/ez80f910200zco/nettest/README.txt?view=log">nettest/README.txt</a>
- |   |   |- <a href="configs/ez80f910200zco/nsh/README.txt?view=log">nsh/README.txt</a>
- |   |   |- <a href="configs/ez80f910200zco/ostest/README.txt?view=log">ostest/README.txt</a>
- |   |   |- <a href="configs/ez80f910200zco/poll/README.txt?view=log">poll/README.txt</a>
- |   |   `- <a href="configs/ez80f910200zco/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- lm3s6965-ek/
- |   |   |- <a href="configs/lm3s6965-ek/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/lm3s6965-ek/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/lm3s6965-ek/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- lm3s8962
- |   |   |- <a href="configs/lm3s8962-ek/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/lm3s8962-ek/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/lm3s8962-ek/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- m68332evb/
- |   |   |- <a href="configs/m68332evb/include/README.txt?view=log">include/README.txt</a>
- |   |   `- <a href="configs/m68332evb/src/README.txt?view=log">src/README.txt</a>
- |   |- mbed/
- |   |   `- <a href="configs/mbed/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- mcu123-lpc214x/
- |   |   |- <a href="configs/mcu123-lpc214x/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/mcu123-lpc214x/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/mcu123-lpc214x/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- mx1ads/
- |   |   |- <a href="configs/mx1ads/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/mx1ads/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/mx1ads/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- ne64badge/
- |   |   `- <a href="configs/ne64badge/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- ntosd-dm320/
- |   |   |- <a href="configs/ntosd-dm320/doc/README.txt?view=log">doc/README.txt</a>
- |   |   |- <a href="configs/ntosd-dm320/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/ntosd-dm320/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/ntosd-dm320/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- nucleus2g/
- |   |   `- <a href="configs/nucleus2g/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- olimex-lpc1766stk/
- |   |   `- <a href="configs/olimex-lpc1766stk/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- olimex-lpc2378/
- |   |   |- <a href="configs/olimex-lpc2378/include/README.txt?view=log">include/README.txt</a>
- |   |   `- <a href="configs/olimex-lpc2378/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- olimex-strp711/
- |   |   |- <a href="configs/olimex-strp711/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/olimex-strp711/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/olimex-strp711/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- pjrc-8051/
- |   |   |- <a href="configs/pjrc-8051/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/pjrc-8051/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/pjrc-8051/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- qemu-i486/
- |   |   |- <a href="configs/qemu-i486/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/qemu-i486/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/qemu-i486/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- sam3u-ek/
- |   |   `- <a href="configs/sam3u-ek/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- sim/
- |   |   |- <a href="configs/sim/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/sim/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/sim/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- skp16c26/
- |   |   |- <a href="configs/skp16c26/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/skp16c26/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/skp16c26/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- stm3210e-eval/
- |   |   |- <a href="configs/stm3210e-eval/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/stm3210e-eval/RIDE/README.txt?view=log">RIDE/README.txt</a>
- |   |   |- <a href="configs/stm3210e-eval/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/stm3210e-eval/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- us7032evb1/
- |   |   |- <a href="configs/us7032evb1/bin/README.txt?view=log">bin/README.txt</a>
- |   |   |- <a href="configs/us7032evb1/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/us7032evb1/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/us7032evb1/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- vsn/
- |   |   |- <a href="configs/vsn/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/vsn/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- xtrs/
- |   |   |- <a href="configs/xtrs/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/xtrs/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/xtrs/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- z16f2800100zcog/
- |   |   |- <a href="configs/xtrs/ostest/README.txt?view=log">ostest/README.txt</a>
- |   |   |- <a href="configs/xtrs/pashello/README.txt?view=log">pashello/README.txt</a>
- |   |   `- <a href="configs/xtrs/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- z80sim/
- |   |   |- <a href="configs/z80sim/include/README.txt?view=log">include/README.txt</a>
- |   |   |- <a href="configs/z80sim/src/README.txt?view=log">src/README.txt</a>
- |   |   `- <a href="configs/z80sim/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- z8encore000zco/
- |   |   |- <a href="configs/z8encore000zco/ostest/README.txt?view=log">ostest/README.txt</a>
- |   |   `- <a href="configs/z8encore000zco/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   |- z8f64200100kit/
- |   |   |- <a href="configs/z8f64200100kit/ostest/README.txt?view=log">ostest/README.txt</a>
- |   |   `- <a href="configs/z8f64200100kit/README.txt?view=log"><b><i>README.txt</i></b></a>
- |   `- <a href="configs/README.txt?view=log"><b><i>README.txt</i></b></a>
- |- drivers/
- |   `- <a href="drivers/README.txt?view=log"><b><i>README.txt</i></b></a>
- |- examples/
- |   |- <a href="examples/nsh/README.txt?view=log"><b><i>nsh/README.txt</i></b></a>
- |   |- <a href="examples/pashello/README.txt?view=log">pashello/README.txt</a>
- |   `- <a href="examples/README.txt?view=log"><b><i>README.txt</i></b></a>
- |- graphics/
- |   `- <a href="graphics/README.txt?view=log"><b><i>README.txt</i></b></a>
- |- libxx/
- |   `- <a href="libxx/README.txt?view=log"><b><i>README.txt</i></b></a>
- |- netutils/
- |   |- <a href="netutils/telnetd/README.txt?view=log">telnetd/README.txt</a>
- |   `- <a href="netutils/README?view=log"><b><i>README</i></b></a>
- `- tools/
-     `- <a href="tols/README.txt?view=log"><b><i>README.txt</i></b></a>
\ No newline at end of file
+ |   |- arch/
+ |   |   |
+ |   |   |- arm
+ |   |   |   `- src
+ |   |   |       `- <a href="nuttx/arch/arm/src/lpc214x/README.txt?view=log">lpc214x/README.txt</a>
+ |   |   |- sh/
+ |   |   |   |- include/
+ |   |   |   |   |-<a href="nuttx/arch/sh/include/m16c/README.txt?view=log">m16c/README.txt</a>
+ |   |   |   |   |-<a href="nuttx/arch/sh/include/sh1/README.txt?view=log">sh1/README.txt</a>
+ |   |   |   |   `-<a href="nuttx/arch/sh/include/README.txt?view=log">README.txt</a>
+ |   |   |   |- src/
+ |   |   |   |   |-<a href="nuttx/arch/sh/src/common/README.txt?view=log">common/README.txt</a>
+ |   |   |   |   |-<a href="nuttx/arch/sh/src/m16c/README.txt?view=log">m16c/README.txt</a>
+ |   |   |   |   |-<a href="nuttx/arch/sh/src/sh1/README.txt?view=log">sh1/README.txt</a>
+ |   |   |   |   `-<a href="nuttx/arch/sh/src/README.txt?view=log">README.txt</a>
+ |   |   |- x86/
+ |   |   |   |- include/
+ |   |   |   |   `-<a href="nuttx/arch/x86/include/README.txt?view=log">README.txt</a>
+ |   |   |   `- src/
+ |   |   |       `-<a href="nuttx/arch/x86/src/README.txt?view=log">README.txt</a>
+ |   |   |- z80/
+ |   |   |   `- src/
+ |   |   |       `- <a href="nuttx/arch/z80/src/z80/README.txt?view=log">z80/README.txt</a>
+ |   |   `- <a href="nuttx/arch/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |- configs/
+ |   |   |- avr32dev1/
+ |   |   |   `- <a href="nuttx/configs/avr32dev1/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- c5471evm/
+ |   |   |   |- <a href="nuttx/configs/c5471evm/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/c5471evm/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/c5471evm/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- demo9s12ne64/
+ |   |   |   `- <a href="nuttx/configs/demo9s12ne64/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- ea3131/
+ |   |   |   `- <a href="nuttx/configs/ea3131/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- eagle100/
+ |   |   |   |- <a href="nuttx/configs/eagle100/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/eagle100/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/eagle100/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- ez80f910200kitg/
+ |   |   |   |- <a href="nuttx/configs/ez80f910200kitg/ostest/README.txt?view=log">ostest/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/ez80f910200kitg/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- ez80f910200zco/
+ |   |   |   |- <a href="nuttx/configs/ez80f910200zco/ostest/README.txt?view=log">dhcpd/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/ez80f910200zco/httpd/README.txt?view=log">httpd/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/ez80f910200zco/nettest/README.txt?view=log">nettest/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/ez80f910200zco/nsh/README.txt?view=log">nsh/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/ez80f910200zco/ostest/README.txt?view=log">ostest/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/ez80f910200zco/poll/README.txt?view=log">poll/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/ez80f910200zco/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- lm3s6965-ek/
+ |   |   |   |- <a href="nuttx/configs/lm3s6965-ek/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/lm3s6965-ek/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/lm3s6965-ek/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- lm3s8962
+ |   |   |   |- <a href="nuttx/configs/lm3s8962-ek/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/lm3s8962-ek/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/lm3s8962-ek/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- m68332evb/
+ |   |   |   |- <a href="nuttx/configs/m68332evb/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/m68332evb/src/README.txt?view=log">src/README.txt</a>
+ |   |   |- mbed/
+ |   |   |   `- <a href="nuttx/configs/mbed/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- mcu123-lpc214x/
+ |   |   |   |- <a href="nuttx/configs/mcu123-lpc214x/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/mcu123-lpc214x/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/mcu123-lpc214x/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- mx1ads/
+ |   |   |   |- <a href="nuttx/configs/mx1ads/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/mx1ads/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/mx1ads/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- ne64badge/
+ |   |   |   `- <a href="nuttx/configs/ne64badge/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- ntosd-dm320/
+ |   |   |   |- <a href="nuttx/configs/ntosd-dm320/doc/README.txt?view=log">doc/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/ntosd-dm320/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/ntosd-dm320/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/ntosd-dm320/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- nucleus2g/
+ |   |   |   `- <a href="nuttx/configs/nucleus2g/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- olimex-lpc1766stk/
+ |   |   |   `- <a href="nuttx/configs/olimex-lpc1766stk/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- olimex-lpc2378/
+ |   |   |   |- <a href="nuttx/configs/olimex-lpc2378/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/olimex-lpc2378/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- olimex-strp711/
+ |   |   |   |- <a href="nuttx/configs/olimex-strp711/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/olimex-strp711/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/olimex-strp711/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- pjrc-8051/
+ |   |   |   |- <a href="nuttx/configs/pjrc-8051/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/pjrc-8051/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/pjrc-8051/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- qemu-i486/
+ |   |   |   |- <a href="nuttx/configs/qemu-i486/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/qemu-i486/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/qemu-i486/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- sam3u-ek/
+ |   |   |   `- <a href="nuttx/configs/sam3u-ek/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- sim/
+ |   |   |   |- <a href="nuttx/configs/sim/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/sim/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/sim/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- skp16c26/
+ |   |   |   |- <a href="nuttx/configs/skp16c26/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/skp16c26/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/skp16c26/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- stm3210e-eval/
+ |   |   |   |- <a href="nuttx/configs/stm3210e-eval/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/stm3210e-eval/RIDE/README.txt?view=log">RIDE/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/stm3210e-eval/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/stm3210e-eval/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- us7032evb1/
+ |   |   |   |- <a href="nuttx/configs/us7032evb1/bin/README.txt?view=log">bin/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/us7032evb1/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/us7032evb1/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/us7032evb1/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- vsn/
+ |   |   |   |- <a href="nuttx/configs/vsn/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/vsn/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- xtrs/
+ |   |   |   |- <a href="nuttx/configs/xtrs/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/xtrs/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/xtrs/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- z16f2800100zcog/
+ |   |   |   |- <a href="nuttx/configs/xtrs/ostest/README.txt?view=log">ostest/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/xtrs/pashello/README.txt?view=log">pashello/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/xtrs/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- z80sim/
+ |   |   |   |- <a href="nuttx/configs/z80sim/include/README.txt?view=log">include/README.txt</a>
+ |   |   |   |- <a href="nuttx/configs/z80sim/src/README.txt?view=log">src/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/z80sim/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- z8encore000zco/
+ |   |   |   |- <a href="nuttx/configs/z8encore000zco/ostest/README.txt?view=log">ostest/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/z8encore000zco/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   |- z8f64200100kit/
+ |   |   |   |- <a href="nuttx/configs/z8f64200100kit/ostest/README.txt?view=log">ostest/README.txt</a>
+ |   |   |   `- <a href="nuttx/configs/z8f64200100kit/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |   `- <a href="nuttx/configs/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |- drivers/
+ |   |   `- <a href="nuttx/drivers/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |- examples/
+ |   |   |- <a href="nuttx/examples/pashello/README.txt?view=log">pashello/README.txt</a>
+ |   |   `- <a href="nuttx/examples/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |- graphics/
+ |   |   `- <a href="nuttx/graphics/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |- libxx/
+ |   |   `- <a href="nuttx/libxx/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   `- tools/
+ |       `- <a href="nuttx/tols/README.txt?view=log"><b><i>README.txt</i></b></a>
+ `- apps/
+     |- netutils/
+     |   |   |- <a href="apps/netutils/telnetd/README.txt?view=log">telnetd/README.txt</a>
+     |   `- <a href="apps/netutils/README?view=log"><b><i>README</i></b></a>
+     |- nshlib/
+     |   |- <a href="apps/nshlib/README.txt?view=log"><b><i>README.txt</i></b></a>
+     `- vsn/
+         |- <a href="apps/vsn/free/README.txt?view=log">free/README.txt</a>
+         |- <a href="apps/vsn/hello/README.txt?view=log">hello/README.txt</a>
+         |- <a href="apps/vsn/poweroff/README.txt?view=log">poweroff/README.txt</a>
+         |- <a href="apps/vsn/ramtron/README.txt?view=log">ramtron/README.txt</a>
+         |- <a href="apps/vsn/sdcard/README.txt?view=log">sdcard/README.txt</a>
+         `- <a href="apps/vsn/sdcard/README.txt?view=log"><b><i>README.txt</i></b></a>
diff --git a/nuttx/Makefile b/nuttx/Makefile
index 8e875cf64..fef629ee2 100644
--- a/nuttx/Makefile
+++ b/nuttx/Makefile
@@ -82,10 +82,6 @@ NONFSDIRS	= sched lib $(ARCH_SRC) mm $(CONFIG_APP_DIR) $(ADDON_DIRS)
 FSDIRS		= fs drivers binfmt
 CONTEXTDIRS	=
 
-ifeq ($(CONFIG_NET),y)
-NONFSDIRS	+= net netutils
-endif
-
 ifeq ($(CONFIG_NX),y)
 NONFSDIRS	+= graphics
 CONTEXTDIRS	+= graphics
@@ -147,7 +143,7 @@ endif
 # Add libraries for network support
 
 ifeq ($(CONFIG_NET),y)
-LINKLIBS	+= net/libnet$(LIBEXT) netutils/libnetutils$(LIBEXT)
+LINKLIBS	+= net/libnet$(LIBEXT)
 endif
 
 # Add libraries for file system support
@@ -257,9 +253,6 @@ mm/libmm$(LIBEXT): context
 net/libnet$(LIBEXT): context
 	@$(MAKE) -C net TOPDIR="$(TOPDIR)" libnet$(LIBEXT)
 
-netutils/libnetutils$(LIBEXT): context
-	@$(MAKE) -C netutils TOPDIR="$(TOPDIR)" libnetutils$(LIBEXT)
-
 fs/libfs$(LIBEXT): context
 	@$(MAKE) -C fs TOPDIR="$(TOPDIR)" libfs$(LIBEXT)
 
diff --git a/nuttx/README.txt b/nuttx/README.txt
index 67588c9e7..1c6f93582 100755
--- a/nuttx/README.txt
+++ b/nuttx/README.txt
@@ -378,15 +378,11 @@ Below is a guide to the available README files in the NuttX source tree:
  |- drivers/
  |   `- README.txt
  |- examples/
- |   |- nsh/README.txt
  |   |- pashello/README.txt
  |   `- README.txt
  |- graphics/
  |   `- README.txt
  |- libxx/
  |   `- README.txt
- |- netutils/
- |   |- telnetd/README.txt
- |   `- README
  `- tools/
      `- README.txt
diff --git a/nuttx/TODO b/nuttx/TODO
index b2a3c7317..66b489a78 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -1,6 +1,8 @@
 NuttX TODO List (Last updated March 16 2011)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+nuttx/
+
   (5)  Task/Scheduler (sched/)
   (1)  On-demand paging (sched/)
   (2)  Memory Managment (mm/)
@@ -9,7 +11,6 @@ NuttX TODO List (Last updated March 16 2011)
   (1)  C++ Support
   (5)  Binary loaders (binfmt/)
  (16  Network (net/, drivers/net)
-  (5)  Network Utilities (netutils/)
   (2)  USB (drivers/usbdev, drivers/usbhost)
   (5)  Libraries (lib/)
  (13)  File system/Generic drivers (fs/, drivers/)
@@ -17,7 +18,6 @@ NuttX TODO List (Last updated March 16 2011)
   (1)  Pascal add-on (pcode/)
   (1)  Documentation (Documentation/)
   (5)  Build system / Toolchains
-  (4)  NuttShell (NSH) (apps/nshlib)
   (3)  Other Applications & Tests (examples/)
   (7)  Linux/Cywgin simulation (arch/sim)
   (3)  ARM (arch/arm/)
@@ -38,6 +38,11 @@ NuttX TODO List (Last updated March 16 2011)
   (8)  z16 (arch/z16/)
   (1)  mc68hc1x (arch/hc)
 
+apps/
+
+  (5)  Network Utilities (apps/netutils/)
+  (4)  NuttShell (NSH) (apps/nshlib)
+
 o Task/Scheduler (sched/)
   ^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -308,38 +313,6 @@ o Network (net/, drivers/net)
                the mechanism for leaving and joining groups is hidden behind a wrapper
                function so that little of this incompatibilities need be exposed.
 
-o Network Utilities (netutils/)
-
-  Description: One critical part of netutils/ apps is untested: The uIP
-               resolver in netutils/resolv.  The webclient code has been
-               tested on host using gethosbyname(), but still depends on the
-               untested resolve logic.
-  Status:      Open
-  Priority:    Medium, Important but not core NuttX functionality
-
-  Description: Port PPP support from http://contiki.cvs.sourceforge.net/contiki/contiki-2.x/backyard/core/net/ppp/
-  Status:      Open
-  Priority:    Low
-
-  Description: Not all THTTPD features/options have been verified.  In particular, there is no
-               test case of a CGI program receiving POST input.  Only the configuration of
-               examples/thttpd has been tested.
-  Status:      Open
-  Priority:    Medium
-
-  Description: The first GET received by THTTPD is not responded to.  Refreshing the page
-               from the browser solves the problem and THTTPD works fine after thatg.  I 
-               believe that this is the duplicate of another bug: "Outgoing [uIP] packets are dropped
-               and overwritten by ARP packets if the destination IP has not been mapped to a MAC."
-  Status:      Open
-  Priority:    Medium
-
-  Description: If the network is enabled, but THTTPD is not configured, it spews out lots
-               of pointless warnings.  This is kind of annoying and unprofessional; needs to
-               be fixed someday.
-  Status:      Open.  An annoyance, but not a real problem.
-  Priority:    Low
-
 o USB (drivers/usbdev, drivers/usbhost)
   ^^^^^^^^^^^^^^^^^^^^
 
@@ -551,32 +524,6 @@ o Build system
   Priority:    High if you are using NX and a newer compiler.
                
 
-o NuttShell (NSH) (apps/nshlib)
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-  Description: When the telnetd front end is received, each TCP packet
-               received causes a prompt (nsh >) to be presented.  The
-               prompt should only be presented when the user enters a
-               carriage return.
-  Status:      Open
-  Priority:    Low
-
-  Description: The wget command has been incorporated into NSH, however
-               it is still untested as of this writing (only because I
-               have not had the correct network setup for the testing
-               yet).  Since wget depends on the also untest uIP resolv/
-               logic, it is like non-functional.
-  Status:      Open
-  Priority:    Med-High
-
-  Description: Add support to NSH to run NXFLAT programs from a ROMFS file system
-  Status:      Open
-  Priority:    Low (enhancement)
-
-  Description: Add an ARP command so that we can see the contents of the ARP table.
-  Status:      Open
-  Priority:    Low (enhancement)
-
 o Other Applications & Tests (examples/)
   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -1222,4 +1169,64 @@ o mc68hc1x (arch/hc)
                It would be necessary to implement banked mode to able to access more
                the 48Kb of FLASH.
   Status:      Open.
-  Priority:    Medium/Low.
+  Priority:    Medium/Low
+
+o Network Utilities (apps/netutils/)
+
+  Description: One critical part of netutils/ apps is untested: The uIP
+               resolver in netutils/resolv.  The webclient code has been
+               tested on host using gethosbyname(), but still depends on the
+               untested resolve logic.
+  Status:      Open
+  Priority:    Medium, Important but not core NuttX functionality
+
+  Description: Port PPP support from http://contiki.cvs.sourceforge.net/contiki/contiki-2.x/backyard/core/net/ppp/
+  Status:      Open
+  Priority:    Low
+
+  Description: Not all THTTPD features/options have been verified.  In particular, there is no
+               test case of a CGI program receiving POST input.  Only the configuration of
+               examples/thttpd has been tested.
+  Status:      Open
+  Priority:    Medium
+
+  Description: The first GET received by THTTPD is not responded to.  Refreshing the page
+               from the browser solves the problem and THTTPD works fine after thatg.  I 
+               believe that this is the duplicate of another bug: "Outgoing [uIP] packets are dropped
+               and overwritten by ARP packets if the destination IP has not been mapped to a MAC."
+  Status:      Open
+  Priority:    Medium
+
+  Description: If the network is enabled, but THTTPD is not configured, it spews out lots
+               of pointless warnings.  This is kind of annoying and unprofessional; needs to
+               be fixed someday.
+  Status:      Open.  An annoyance, but not a real problem.
+  Priority:    Low
+
+o NuttShell (NSH) (apps/nshlib)
+  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  Description: When the telnetd front end is received, each TCP packet
+               received causes a prompt (nsh >) to be presented.  The
+               prompt should only be presented when the user enters a
+               carriage return.
+  Status:      Open
+  Priority:    Low
+
+  Description: The wget command has been incorporated into NSH, however
+               it is still untested as of this writing (only because I
+               have not had the correct network setup for the testing
+               yet).  Since wget depends on the also untest uIP resolv/
+               logic, it is like non-functional.
+  Status:      Open
+  Priority:    Med-High
+
+  Description: Add support to NSH to run NXFLAT programs from a ROMFS file system
+  Status:      Open
+  Priority:    Low (enhancement)
+
+  Description: Add an ARP command so that we can see the contents of the ARP table.
+  Status:      Open
+  Priority:    Low (enhancement)
+
+
diff --git a/nuttx/configs/c5471evm/httpd/Make.defs b/nuttx/configs/c5471evm/httpd/Make.defs
new file mode 100644
index 000000000..4c47818fe
--- /dev/null
+++ b/nuttx/configs/c5471evm/httpd/Make.defs
@@ -0,0 +1,119 @@
+############################################################################
+# configs/c5471evm/httpd/Make.defs
+#
+#   Copyright (C) 2007, 2008, 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.
+#
+############################################################################
+
+include ${TOPDIR}/.config
+
+CROSSDEV		= arm-elf-
+CC			= $(CROSSDEV)gcc
+CPP			= $(CROSSDEV)gcc -E
+LD			= $(CROSSDEV)ld
+AR			= $(CROSSDEV)ar rcs
+NM			= $(CROSSDEV)nm
+OBJCOPY			= $(CROSSDEV)objcopy
+OBJDUMP			= $(CROSSDEV)objdump
+
+ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
+ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+
+ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
+  ARCHOPTIMIZATION	= -g
+else
+  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
+			  -fomit-frame-pointer
+endif
+
+ifeq ($(ARCHCCMAJOR),4)
+  ARCHCPUFLAGS		= -mcpu=arm7tdmi -mfloat-abi=soft -fno-builtin
+else
+  ARCHCPUFLAGS		= -mapcs-32 -mcpu=arm7tdmi -msoft-float -fno-builtin
+endif
+ARCHPICFLAGS		= -fpic -msingle-pic-base -mpic-register=r10
+ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
+ARCHDEFINES		=
+ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
+ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/httpd/ld.script
+
+CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) -pipe
+CPICFLAGS		= $(ARCHPICFLAGS) $(CFLAGS)
+CPPFLAGS		= $(ARCHINCLUDES) $(ARCHDEFINES)
+AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
+
+NXFLATLDFLAGS1		= -r -d -warn-common
+NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -no-check-sections
+LDNXFLATFLAGS		= -e main -s 2048
+
+OBJEXT			= .o
+LIBEXT			= .a
+EXEEXT			=
+
+ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
+  LDFLAGS		+= -g
+endif
+
+define PREPROCESS
+	@echo "CPP: $1->$2"
+	@$(CPP) $(CPPFLAGS) $1 -o $2
+endef
+
+define COMPILE
+	@echo "CC: $1"
+	@$(CC) -c $(CFLAGS) $1 -o $2
+endef
+
+define ASSEMBLE
+	@echo "AS: $1"
+	@$(CC) -c $(AFLAGS) $1 -o $2
+endef
+
+define ARCHIVE
+	echo "AR: $2"; \
+	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
+endef
+
+define CLEAN
+	@rm -f *.o *.a
+endef
+
+MKDEP			= $(TOPDIR)/tools/mkdeps.sh
+
+HOSTCC			= gcc
+HOSTINCLUDES		= -I.
+HOSTCFLAGS		= -Wall -wstrict-prototypes -Wshadow -g -pipe
+HOSTLDFLAGS		=
+
+
diff --git a/nuttx/configs/c5471evm/httpd/appconfig b/nuttx/configs/c5471evm/httpd/appconfig
new file mode 100644
index 000000000..a4be53aec
--- /dev/null
+++ b/nuttx/configs/c5471evm/httpd/appconfig
@@ -0,0 +1,41 @@
+############################################################################

+# c5471evm/httpd/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/dhcpc=.built_always

+CONFIGURED_APPS += netutils/resolv=.built_always

+CONFIGURED_APPS += netutils/webserver=.built_always

diff --git a/nuttx/configs/c5471evm/dhcpconfig b/nuttx/configs/c5471evm/httpd/defconfig
index fcad5b52a..061f784c4 100644
--- a/nuttx/configs/c5471evm/dhcpconfig
+++ b/nuttx/configs/c5471evm/httpd/defconfig
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/c5471evm/dhcpconfig
+# configs/c5471evm/httpd/defconfig
 #
-#   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/c5471evm/ld.script b/nuttx/configs/c5471evm/httpd/ld.script
index ed083cb70..0aadf36d3 100644
--- a/nuttx/configs/c5471evm/ld.script
+++ b/nuttx/configs/c5471evm/httpd/ld.script
@@ -1,7 +1,7 @@
 /************************************************************
  * ld.script
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/c5471evm/setenv.sh b/nuttx/configs/c5471evm/httpd/setenv.sh
index 4c98cc923..20d841778 100755
--- a/nuttx/configs/c5471evm/setenv.sh
+++ b/nuttx/configs/c5471evm/httpd/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# c5471evm/setenv.sh
+# c5471evm/httpd/setenv.sh
 #
 #   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
diff --git a/nuttx/configs/c5471evm/nettest/Make.defs b/nuttx/configs/c5471evm/nettest/Make.defs
new file mode 100644
index 000000000..7e13b8479
--- /dev/null
+++ b/nuttx/configs/c5471evm/nettest/Make.defs
@@ -0,0 +1,119 @@
+############################################################################
+# configs/c5471evm/nettest/Make.defs
+#
+#   Copyright (C) 2007, 2008, 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.
+#
+############################################################################
+
+include ${TOPDIR}/.config
+
+CROSSDEV		= arm-elf-
+CC			= $(CROSSDEV)gcc
+CPP			= $(CROSSDEV)gcc -E
+LD			= $(CROSSDEV)ld
+AR			= $(CROSSDEV)ar rcs
+NM			= $(CROSSDEV)nm
+OBJCOPY			= $(CROSSDEV)objcopy
+OBJDUMP			= $(CROSSDEV)objdump
+
+ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
+ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+
+ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
+  ARCHOPTIMIZATION	= -g
+else
+  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
+			  -fomit-frame-pointer
+endif
+
+ifeq ($(ARCHCCMAJOR),4)
+  ARCHCPUFLAGS		= -mcpu=arm7tdmi -mfloat-abi=soft -fno-builtin
+else
+  ARCHCPUFLAGS		= -mapcs-32 -mcpu=arm7tdmi -msoft-float -fno-builtin
+endif
+ARCHPICFLAGS		= -fpic -msingle-pic-base -mpic-register=r10
+ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
+ARCHDEFINES		=
+ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
+ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nettest/ld.script
+
+CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) -pipe
+CPICFLAGS		= $(ARCHPICFLAGS) $(CFLAGS)
+CPPFLAGS		= $(ARCHINCLUDES) $(ARCHDEFINES)
+AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
+
+NXFLATLDFLAGS1		= -r -d -warn-common
+NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -no-check-sections
+LDNXFLATFLAGS		= -e main -s 2048
+
+OBJEXT			= .o
+LIBEXT			= .a
+EXEEXT			=
+
+ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
+  LDFLAGS		+= -g
+endif
+
+define PREPROCESS
+	@echo "CPP: $1->$2"
+	@$(CPP) $(CPPFLAGS) $1 -o $2
+endef
+
+define COMPILE
+	@echo "CC: $1"
+	@$(CC) -c $(CFLAGS) $1 -o $2
+endef
+
+define ASSEMBLE
+	@echo "AS: $1"
+	@$(CC) -c $(AFLAGS) $1 -o $2
+endef
+
+define ARCHIVE
+	echo "AR: $2"; \
+	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
+endef
+
+define CLEAN
+	@rm -f *.o *.a
+endef
+
+MKDEP			= $(TOPDIR)/tools/mkdeps.sh
+
+HOSTCC			= gcc
+HOSTINCLUDES		= -I.
+HOSTCFLAGS		= -Wall -wstrict-prototypes -Wshadow -g -pipe
+HOSTLDFLAGS		=
+
+
diff --git a/nuttx/netutils/dhcpd/Make.defs b/nuttx/configs/c5471evm/nettest/appconfig
index 77f245b25..ea921b2f2 100644
--- a/nuttx/netutils/dhcpd/Make.defs
+++ b/nuttx/configs/c5471evm/nettest/appconfig
@@ -1,39 +1,38 @@
-############################################################################
-# netutils/dhcpd/Make.defs
-#
-#   Copyright (C) 2007 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.
-#
-############################################################################
-
-ifeq ($(CONFIG_NET_UDP),y)
-DHCPD_ASRCS =
-DHCPD_CSRCS = dhcpd.c
-endif
\ No newline at end of file
+############################################################################

+# c5471evm/nettest/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

diff --git a/nuttx/configs/c5471evm/netconfig b/nuttx/configs/c5471evm/nettest/defconfig
index 657c04885..c0baa3a0b 100644
--- a/nuttx/configs/c5471evm/netconfig
+++ b/nuttx/configs/c5471evm/nettest/defconfig
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/c5471evm/netconfig
+# configs/c5471evm/nettest/defconfig
 #
-#   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/c5471evm/nettest/ld.script b/nuttx/configs/c5471evm/nettest/ld.script
new file mode 100644
index 000000000..0aadf36d3
--- /dev/null
+++ b/nuttx/configs/c5471evm/nettest/ld.script
@@ -0,0 +1,107 @@
+/************************************************************
+ * ld.script
+ *
+ *   Copyright (C) 2007, 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 Gregory Nutt 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.
+ *
+ ************************************************************/
+
+OUTPUT_ARCH(arm)
+ENTRY(_stext)
+SECTIONS
+{
+	/* Interrupt vector trampoline and command line parameters
+	 * are provided in IRAM by the rrload bootloader.  Vectors will be
+	 * copied into _svectors from _vflashstart.
+	 */
+
+	. = 0xffc00000;
+	_svectors = ABSOLUTE(.);
+
+	/* These are locations in IRAM where the rrload bootloader passes
+	 * information to the running program
+	 */
+
+	. = 0xffc00020;
+	__KernCommandLineMagicStr = .;	/* magic pattern string == "kcmdline-->" */
+	. = 0xffc0002C;			/* advance to .+strlen("kcmdline-->")+1 */
+	__KernCommandLineOverride = .;	/* location of kernel command line string */
+
+	. = 0xffc00100;
+	__EtherMACMagicStr = .;		/* magic pattern string == "etherMAC-->" */
+	. = 0xffc0010C;			/* advance to .+strlen("etherMAC-->")+1 */
+	__EtherMAC = .;
+
+
+	/* The OS entry point is here */
+
+	. = 0x10300000;
+	.text : {
+		_stext = ABSOLUTE(.);
+		*(.text)
+		*(.fixup)
+		*(.gnu.warning)
+		*(.rodata)
+		*(.glue_7)
+		*(.glue_7t)
+		*(.got)			/* Global offset table		*/
+		_etext = ABSOLUTE(.);
+	}
+
+	_eronly = ABSOLUTE(.);		/* See below                    */
+	. = ALIGN(4096);
+
+	.data : {
+		_sdata = ABSOLUTE(.);
+		*(.data)
+		CONSTRUCTORS
+		_edata = ABSOLUTE(.);
+	}
+
+	.bss : {			/* BSS				*/
+		_sbss = ABSOLUTE(.);
+		*(.bss)
+		*(COMMON)
+		_ebss = ABSOLUTE(.);
+	}
+					/* Stabs debugging sections.	*/
+	.stab 0 : { *(.stab) }
+	.stabstr 0 : { *(.stabstr) }
+	.stab.excl 0 : { *(.stab.excl) }
+	.stab.exclstr 0 : { *(.stab.exclstr) }
+	.stab.index 0 : { *(.stab.index) }
+	.stab.indexstr 0 : { *(.stab.indexstr) }
+	.comment 0 : { *(.comment) }
+	.debug_abbrev 0 : { *(.debug_abbrev) }
+	.debug_info 0 : { *(.debug_info) }
+	.debug_line 0 : { *(.debug_line) }
+	.debug_pubnames 0 : { *(.debug_pubnames) }
+	.debug_aranges 0 : { *(.debug_aranges) }
+}
diff --git a/nuttx/configs/c5471evm/nettest/setenv.sh b/nuttx/configs/c5471evm/nettest/setenv.sh
new file mode 100755
index 000000000..b9c7b6db2
--- /dev/null
+++ b/nuttx/configs/c5471evm/nettest/setenv.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+# c5471evm/nettest/setenv.sh
+#
+#   Copyright (C) 2007, 2008, 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.
+#
+
+if [ "$(basename $0)" = "setenv.sh" ] ; then
+  echo "You must source this script, not run it!" 1>&2
+  exit 1
+fi
+
+if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
+
+WD=`pwd`
+export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
+
+echo "PATH : ${PATH}"
diff --git a/nuttx/configs/c5471evm/Make.defs b/nuttx/configs/c5471evm/nsh/Make.defs
index 355df3971..e44c527d5 100644
--- a/nuttx/configs/c5471evm/Make.defs
+++ b/nuttx/configs/c5471evm/nsh/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/c5471evm/Make.defs
+# configs/c5471evm/nsh/Make.defs
 #
-#   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,7 @@ ARCHPICFLAGS		= -fpic -msingle-pic-base -mpic-register=r10
 ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
 ARCHDEFINES		=
 ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
-ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ld.script
+ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script
 
 CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
 			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) -pipe
diff --git a/nuttx/netutils/uiplib/Make.defs b/nuttx/configs/c5471evm/nsh/appconfig
index 1db3208b2..ab74c03ad 100644
--- a/nuttx/netutils/uiplib/Make.defs
+++ b/nuttx/configs/c5471evm/nsh/appconfig
@@ -1,50 +1,48 @@
-############################################################################
-# Make.defs
-#
-#   Copyright (C) 2007, 2010-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.
-#
-############################################################################
-
-UIPLIB_ASRCS =
-UIPLIB_CSRCS = uiplib.c uip_sethostaddr.c uip_gethostaddr.c uip_setdraddr.c \
-	uip_setnetmask.c uip_parsehttpurl.c uip_server.c\
-
-# No MAC address support for SLIP (Ethernet only)
-
-ifneq ($(CONFIG_NET_SLIP),y)
-UIPLIB_CSRCS += uip_setmacaddr.c uip_getmacaddr.c
-endif
-
-# IGMP support
-
-ifeq ($(CONFIG_NET_IGMP),y)
-UIPLIB_CSRCS += uip_ipmsfilter.c
-endif
+############################################################################

+# c5471evm/nsh/appconfig

+#

+#   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.

+#

+############################################################################

+

+# NSH library

+

+CONFIGURED_APPS += nshlib=.built_always

+

+# Networking support

+

+ifeq ($(CONFIG_NET),y)

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/dhcpc=.built_always

+CONFIGURED_APPS += netutils/resolv=.built_always

+CONFIGURED_APPS += netutils/tftp=.built_always

+CONFIGURED_APPS += netutils/webclient=.built_always

+endif

diff --git a/nuttx/configs/c5471evm/nshconfig b/nuttx/configs/c5471evm/nsh/defconfig
index 7c5ab6fa5..6014b99ff 100644
--- a/nuttx/configs/c5471evm/nshconfig
+++ b/nuttx/configs/c5471evm/nsh/defconfig
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/c5471evm/nshconfig
+# configs/c5471evm/nsh/defconfig
 #
-#   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/c5471evm/nsh/ld.script b/nuttx/configs/c5471evm/nsh/ld.script
new file mode 100644
index 000000000..0aadf36d3
--- /dev/null
+++ b/nuttx/configs/c5471evm/nsh/ld.script
@@ -0,0 +1,107 @@
+/************************************************************
+ * ld.script
+ *
+ *   Copyright (C) 2007, 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 Gregory Nutt 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.
+ *
+ ************************************************************/
+
+OUTPUT_ARCH(arm)
+ENTRY(_stext)
+SECTIONS
+{
+	/* Interrupt vector trampoline and command line parameters
+	 * are provided in IRAM by the rrload bootloader.  Vectors will be
+	 * copied into _svectors from _vflashstart.
+	 */
+
+	. = 0xffc00000;
+	_svectors = ABSOLUTE(.);
+
+	/* These are locations in IRAM where the rrload bootloader passes
+	 * information to the running program
+	 */
+
+	. = 0xffc00020;
+	__KernCommandLineMagicStr = .;	/* magic pattern string == "kcmdline-->" */
+	. = 0xffc0002C;			/* advance to .+strlen("kcmdline-->")+1 */
+	__KernCommandLineOverride = .;	/* location of kernel command line string */
+
+	. = 0xffc00100;
+	__EtherMACMagicStr = .;		/* magic pattern string == "etherMAC-->" */
+	. = 0xffc0010C;			/* advance to .+strlen("etherMAC-->")+1 */
+	__EtherMAC = .;
+
+
+	/* The OS entry point is here */
+
+	. = 0x10300000;
+	.text : {
+		_stext = ABSOLUTE(.);
+		*(.text)
+		*(.fixup)
+		*(.gnu.warning)
+		*(.rodata)
+		*(.glue_7)
+		*(.glue_7t)
+		*(.got)			/* Global offset table		*/
+		_etext = ABSOLUTE(.);
+	}
+
+	_eronly = ABSOLUTE(.);		/* See below                    */
+	. = ALIGN(4096);
+
+	.data : {
+		_sdata = ABSOLUTE(.);
+		*(.data)
+		CONSTRUCTORS
+		_edata = ABSOLUTE(.);
+	}
+
+	.bss : {			/* BSS				*/
+		_sbss = ABSOLUTE(.);
+		*(.bss)
+		*(COMMON)
+		_ebss = ABSOLUTE(.);
+	}
+					/* Stabs debugging sections.	*/
+	.stab 0 : { *(.stab) }
+	.stabstr 0 : { *(.stabstr) }
+	.stab.excl 0 : { *(.stab.excl) }
+	.stab.exclstr 0 : { *(.stab.exclstr) }
+	.stab.index 0 : { *(.stab.index) }
+	.stab.indexstr 0 : { *(.stab.indexstr) }
+	.comment 0 : { *(.comment) }
+	.debug_abbrev 0 : { *(.debug_abbrev) }
+	.debug_info 0 : { *(.debug_info) }
+	.debug_line 0 : { *(.debug_line) }
+	.debug_pubnames 0 : { *(.debug_pubnames) }
+	.debug_aranges 0 : { *(.debug_aranges) }
+}
diff --git a/nuttx/configs/c5471evm/nsh/setenv.sh b/nuttx/configs/c5471evm/nsh/setenv.sh
new file mode 100755
index 000000000..4ee41c934
--- /dev/null
+++ b/nuttx/configs/c5471evm/nsh/setenv.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+# c5471evm/nsh/setenv.sh
+#
+#   Copyright (C) 2007, 2008, 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.
+#
+
+if [ "$(basename $0)" = "setenv.sh" ] ; then
+  echo "You must source this script, not run it!" 1>&2
+  exit 1
+fi
+
+if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
+
+WD=`pwd`
+export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
+
+echo "PATH : ${PATH}"
diff --git a/nuttx/configs/c5471evm/ostest/Make.defs b/nuttx/configs/c5471evm/ostest/Make.defs
new file mode 100644
index 000000000..a15a23f6f
--- /dev/null
+++ b/nuttx/configs/c5471evm/ostest/Make.defs
@@ -0,0 +1,119 @@
+############################################################################
+# configs/c5471evm/ostest/Make.defs
+#
+#   Copyright (C) 2007, 2008, 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.
+#
+############################################################################
+
+include ${TOPDIR}/.config
+
+CROSSDEV		= arm-elf-
+CC			= $(CROSSDEV)gcc
+CPP			= $(CROSSDEV)gcc -E
+LD			= $(CROSSDEV)ld
+AR			= $(CROSSDEV)ar rcs
+NM			= $(CROSSDEV)nm
+OBJCOPY			= $(CROSSDEV)objcopy
+OBJDUMP			= $(CROSSDEV)objdump
+
+ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
+ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+
+ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
+  ARCHOPTIMIZATION	= -g
+else
+  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
+			  -fomit-frame-pointer
+endif
+
+ifeq ($(ARCHCCMAJOR),4)
+  ARCHCPUFLAGS		= -mcpu=arm7tdmi -mfloat-abi=soft -fno-builtin
+else
+  ARCHCPUFLAGS		= -mapcs-32 -mcpu=arm7tdmi -msoft-float -fno-builtin
+endif
+ARCHPICFLAGS		= -fpic -msingle-pic-base -mpic-register=r10
+ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
+ARCHDEFINES		=
+ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
+ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script
+
+CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) -pipe
+CPICFLAGS		= $(ARCHPICFLAGS) $(CFLAGS)
+CPPFLAGS		= $(ARCHINCLUDES) $(ARCHDEFINES)
+AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
+
+NXFLATLDFLAGS1		= -r -d -warn-common
+NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -no-check-sections
+LDNXFLATFLAGS		= -e main -s 2048
+
+OBJEXT			= .o
+LIBEXT			= .a
+EXEEXT			=
+
+ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
+  LDFLAGS		+= -g
+endif
+
+define PREPROCESS
+	@echo "CPP: $1->$2"
+	@$(CPP) $(CPPFLAGS) $1 -o $2
+endef
+
+define COMPILE
+	@echo "CC: $1"
+	@$(CC) -c $(CFLAGS) $1 -o $2
+endef
+
+define ASSEMBLE
+	@echo "AS: $1"
+	@$(CC) -c $(AFLAGS) $1 -o $2
+endef
+
+define ARCHIVE
+	echo "AR: $2"; \
+	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
+endef
+
+define CLEAN
+	@rm -f *.o *.a
+endef
+
+MKDEP			= $(TOPDIR)/tools/mkdeps.sh
+
+HOSTCC			= gcc
+HOSTINCLUDES		= -I.
+HOSTCFLAGS		= -Wall -wstrict-prototypes -Wshadow -g -pipe
+HOSTLDFLAGS		=
+
+
diff --git a/nuttx/configs/c5471evm/defconfig b/nuttx/configs/c5471evm/ostest/defconfig
index 9ecfa331b..2b8e54bbe 100644
--- a/nuttx/configs/c5471evm/defconfig
+++ b/nuttx/configs/c5471evm/ostest/defconfig
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/c5471evm/defconfig
+# configs/c5471evm/ostest/defconfig
 #
-#   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/c5471evm/ostest/ld.script b/nuttx/configs/c5471evm/ostest/ld.script
new file mode 100644
index 000000000..0aadf36d3
--- /dev/null
+++ b/nuttx/configs/c5471evm/ostest/ld.script
@@ -0,0 +1,107 @@
+/************************************************************
+ * ld.script
+ *
+ *   Copyright (C) 2007, 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 Gregory Nutt 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.
+ *
+ ************************************************************/
+
+OUTPUT_ARCH(arm)
+ENTRY(_stext)
+SECTIONS
+{
+	/* Interrupt vector trampoline and command line parameters
+	 * are provided in IRAM by the rrload bootloader.  Vectors will be
+	 * copied into _svectors from _vflashstart.
+	 */
+
+	. = 0xffc00000;
+	_svectors = ABSOLUTE(.);
+
+	/* These are locations in IRAM where the rrload bootloader passes
+	 * information to the running program
+	 */
+
+	. = 0xffc00020;
+	__KernCommandLineMagicStr = .;	/* magic pattern string == "kcmdline-->" */
+	. = 0xffc0002C;			/* advance to .+strlen("kcmdline-->")+1 */
+	__KernCommandLineOverride = .;	/* location of kernel command line string */
+
+	. = 0xffc00100;
+	__EtherMACMagicStr = .;		/* magic pattern string == "etherMAC-->" */
+	. = 0xffc0010C;			/* advance to .+strlen("etherMAC-->")+1 */
+	__EtherMAC = .;
+
+
+	/* The OS entry point is here */
+
+	. = 0x10300000;
+	.text : {
+		_stext = ABSOLUTE(.);
+		*(.text)
+		*(.fixup)
+		*(.gnu.warning)
+		*(.rodata)
+		*(.glue_7)
+		*(.glue_7t)
+		*(.got)			/* Global offset table		*/
+		_etext = ABSOLUTE(.);
+	}
+
+	_eronly = ABSOLUTE(.);		/* See below                    */
+	. = ALIGN(4096);
+
+	.data : {
+		_sdata = ABSOLUTE(.);
+		*(.data)
+		CONSTRUCTORS
+		_edata = ABSOLUTE(.);
+	}
+
+	.bss : {			/* BSS				*/
+		_sbss = ABSOLUTE(.);
+		*(.bss)
+		*(COMMON)
+		_ebss = ABSOLUTE(.);
+	}
+					/* Stabs debugging sections.	*/
+	.stab 0 : { *(.stab) }
+	.stabstr 0 : { *(.stabstr) }
+	.stab.excl 0 : { *(.stab.excl) }
+	.stab.exclstr 0 : { *(.stab.exclstr) }
+	.stab.index 0 : { *(.stab.index) }
+	.stab.indexstr 0 : { *(.stab.indexstr) }
+	.comment 0 : { *(.comment) }
+	.debug_abbrev 0 : { *(.debug_abbrev) }
+	.debug_info 0 : { *(.debug_info) }
+	.debug_line 0 : { *(.debug_line) }
+	.debug_pubnames 0 : { *(.debug_pubnames) }
+	.debug_aranges 0 : { *(.debug_aranges) }
+}
diff --git a/nuttx/configs/c5471evm/ostest/setenv.sh b/nuttx/configs/c5471evm/ostest/setenv.sh
new file mode 100755
index 000000000..dc2c64376
--- /dev/null
+++ b/nuttx/configs/c5471evm/ostest/setenv.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+# c5471evm/ostest/setenv.sh
+#
+#   Copyright (C) 2007, 2008, 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.
+#
+
+if [ "$(basename $0)" = "setenv.sh" ] ; then
+  echo "You must source this script, not run it!" 1>&2
+  exit 1
+fi
+
+if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
+
+WD=`pwd`
+export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
+
+echo "PATH : ${PATH}"
diff --git a/nuttx/configs/detron/nsh/appconfig b/nuttx/configs/detron/nsh/appconfig
index 7abe0c6ed..a4d5dc64c 100644
--- a/nuttx/configs/detron/nsh/appconfig
+++ b/nuttx/configs/detron/nsh/appconfig
@@ -33,4 +33,16 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
+# NSH library

+

+CONFIGURED_APPS += nshlib=.built_always

+

+# Networking support

+

+ifeq ($(CONFIG_NET),y)

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/dhcpc=.built_always

+CONFIGURED_APPS += netutils/resolv=.built_always

+CONFIGURED_APPS += netutils/tftp=.built_always

+CONFIGURED_APPS += netutils/webclient=.built_always

+endif

diff --git a/nuttx/configs/eagle100/httpd/appconfig b/nuttx/configs/eagle100/httpd/appconfig
new file mode 100644
index 000000000..879749364
--- /dev/null
+++ b/nuttx/configs/eagle100/httpd/appconfig
@@ -0,0 +1,41 @@
+############################################################################

+# eagle100/httpd/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/dhcpc=.built_always

+CONFIGURED_APPS += netutils/resolv=.built_always

+CONFIGURED_APPS += netutils/webserver=.built_always

diff --git a/nuttx/netutils/resolv/Make.defs b/nuttx/configs/eagle100/nettest/appconfig
index 0ca95b94e..0ee4fa816 100644
--- a/nuttx/netutils/resolv/Make.defs
+++ b/nuttx/configs/eagle100/nettest/appconfig
@@ -1,39 +1,38 @@
-############################################################################
-# Make.defs
-#
-#   Copyright (C) 2007 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.
-#
-############################################################################
-
-ifeq ($(CONFIG_NET_UDP),y)
-RESOLV_ASRCS  =
-RESOLV_CSRCS  = resolv.c
-endif
+############################################################################

+# eagle100/nettest/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

diff --git a/nuttx/netutils/thttpd/Make.defs b/nuttx/configs/eagle100/thttpd/appconfig
index 9bc86cab1..66db0879d 100644
--- a/nuttx/netutils/thttpd/Make.defs
+++ b/nuttx/configs/eagle100/thttpd/appconfig
@@ -1,38 +1,39 @@
-############################################################################
-# netutils/thttpd/Make.defs
-#
-#   Copyright (C) 2009 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.
-#
-############################################################################
-
-THTTPD_ASRCS =
-THTTPD_CSRCS = thttpd.c libhttpd.c thttpd_cgi.c thttpd_alloc.c thttpd_strings.c timers.c fdwatch.c tdate_parse.c
-
+############################################################################

+# eagle100/thttpd/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/thttpd=.built_always

diff --git a/nuttx/configs/ez80f910200zco/dhcpd/appconfig b/nuttx/configs/ez80f910200zco/dhcpd/appconfig
new file mode 100644
index 000000000..de16dcb82
--- /dev/null
+++ b/nuttx/configs/ez80f910200zco/dhcpd/appconfig
@@ -0,0 +1,39 @@
+############################################################################

+# ez80f910200zco/dhcpd/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/dhcpd=.built_always

diff --git a/nuttx/configs/ez80f910200zco/httpd/appconfig b/nuttx/configs/ez80f910200zco/httpd/appconfig
new file mode 100644
index 000000000..202a3c93e
--- /dev/null
+++ b/nuttx/configs/ez80f910200zco/httpd/appconfig
@@ -0,0 +1,42 @@
+############################################################################

+# ez80f910200zco/httpd/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/dhcpc=.built_always

+CONFIGURED_APPS += netutils/resolv=.built_always

+CONFIGURED_APPS += netutils/webserver=.built_always

+

diff --git a/nuttx/configs/ez80f910200zco/nettest/appconfig b/nuttx/configs/ez80f910200zco/nettest/appconfig
new file mode 100644
index 000000000..63c1a122f
--- /dev/null
+++ b/nuttx/configs/ez80f910200zco/nettest/appconfig
@@ -0,0 +1,38 @@
+############################################################################

+# ez80f910200zco/nettest/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

diff --git a/nuttx/configs/ez80f910200zco/nsh/appconfig b/nuttx/configs/ez80f910200zco/nsh/appconfig
index 80161aac8..267f96a57 100644
--- a/nuttx/configs/ez80f910200zco/nsh/appconfig
+++ b/nuttx/configs/ez80f910200zco/nsh/appconfig
@@ -33,4 +33,16 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
+# NSH library

+

+CONFIGURED_APPS += nshlib=.built_always

+

+# Networking support

+

+ifeq ($(CONFIG_NET),y)

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/dhcpc=.built_always

+CONFIGURED_APPS += netutils/resolv=.built_always

+CONFIGURED_APPS += netutils/tftp=.built_always

+CONFIGURED_APPS += netutils/webclient=.built_always

+endif

diff --git a/nuttx/configs/ez80f910200zco/poll/appconfig b/nuttx/configs/ez80f910200zco/poll/appconfig
new file mode 100644
index 000000000..6968345b2
--- /dev/null
+++ b/nuttx/configs/ez80f910200zco/poll/appconfig
@@ -0,0 +1,38 @@
+############################################################################

+# ez80f910200zco/poll/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

diff --git a/nuttx/configs/lm3s6965-ek/nsh/appconfig b/nuttx/configs/lm3s6965-ek/nsh/appconfig
index 8c0158df0..be88688cf 100644
--- a/nuttx/configs/lm3s6965-ek/nsh/appconfig
+++ b/nuttx/configs/lm3s6965-ek/nsh/appconfig
@@ -33,4 +33,16 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
+# NSH library

+

+CONFIGURED_APPS += nshlib=.built_always

+

+# Networking support

+

+ifeq ($(CONFIG_NET),y)

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/dhcpc=.built_always

+CONFIGURED_APPS += netutils/resolv=.built_always

+CONFIGURED_APPS += netutils/tftp=.built_always

+CONFIGURED_APPS += netutils/webclient=.built_always

+endif

diff --git a/nuttx/configs/lm3s8962-ek/nsh/appconfig b/nuttx/configs/lm3s8962-ek/nsh/appconfig
index 723d429ac..4ab3e1ce2 100644
--- a/nuttx/configs/lm3s8962-ek/nsh/appconfig
+++ b/nuttx/configs/lm3s8962-ek/nsh/appconfig
@@ -33,4 +33,16 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
+# NSH library

+

+CONFIGURED_APPS += nshlib=.built_always

+

+# Networking support

+

+ifeq ($(CONFIG_NET),y)

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/dhcpc=.built_always

+CONFIGURED_APPS += netutils/resolv=.built_always

+CONFIGURED_APPS += netutils/tftp=.built_always

+CONFIGURED_APPS += netutils/webclient=.built_always

+endif

diff --git a/nuttx/configs/ntosd-dm320/nettest/appconfig b/nuttx/configs/ntosd-dm320/nettest/appconfig
new file mode 100644
index 000000000..8c20cb4a2
--- /dev/null
+++ b/nuttx/configs/ntosd-dm320/nettest/appconfig
@@ -0,0 +1,38 @@
+############################################################################

+# ntosd-dm320/nettest/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

diff --git a/nuttx/configs/ntosd-dm320/nsh/appconfig b/nuttx/configs/ntosd-dm320/nsh/appconfig
index 4378bc7b1..3a908a4d1 100644
--- a/nuttx/configs/ntosd-dm320/nsh/appconfig
+++ b/nuttx/configs/ntosd-dm320/nsh/appconfig
@@ -33,4 +33,16 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
+# NSH library

+

+CONFIGURED_APPS += nshlib=.built_always

+

+# Networking support

+

+ifeq ($(CONFIG_NET),y)

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/dhcpc=.built_always

+CONFIGURED_APPS += netutils/resolv=.built_always

+CONFIGURED_APPS += netutils/tftp=.built_always

+CONFIGURED_APPS += netutils/webclient=.built_always

+endif

diff --git a/nuttx/configs/ntosd-dm320/poll/appconfig b/nuttx/configs/ntosd-dm320/poll/appconfig
new file mode 100644
index 000000000..be5cbeb4e
--- /dev/null
+++ b/nuttx/configs/ntosd-dm320/poll/appconfig
@@ -0,0 +1,38 @@
+############################################################################

+# ntosd-dm320/poll/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

diff --git a/nuttx/configs/ntosd-dm320/thttpd/appconfig b/nuttx/configs/ntosd-dm320/thttpd/appconfig
new file mode 100644
index 000000000..b81a71c7a
--- /dev/null
+++ b/nuttx/configs/ntosd-dm320/thttpd/appconfig
@@ -0,0 +1,39 @@
+############################################################################

+# ntosd-dm320/thttpd/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/thttpd=.built_always

diff --git a/nuttx/netutils/dhcpc/Make.defs b/nuttx/configs/ntosd-dm320/udp/appconfig
index a275a9fbb..d3c324f7c 100644
--- a/nuttx/netutils/dhcpc/Make.defs
+++ b/nuttx/configs/ntosd-dm320/udp/appconfig
@@ -1,39 +1,38 @@
-############################################################################
-# Make.defs
-#
-#   Copyright (C) 2007 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.
-#
-############################################################################
-
-ifeq ($(CONFIG_NET_UDP),y)
-DHCPC_ASRCS =
-DHCPC_CSRCS = dhcpc.c
-endif
\ No newline at end of file
+############################################################################

+# ntosd-dm320/udp/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

diff --git a/nuttx/configs/ntosd-dm320/uip/appconfig b/nuttx/configs/ntosd-dm320/uip/appconfig
new file mode 100644
index 000000000..b8629c693
--- /dev/null
+++ b/nuttx/configs/ntosd-dm320/uip/appconfig
@@ -0,0 +1,41 @@
+############################################################################

+# ntosd-dm320/uip/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/dhcpc=.built_always

+CONFIGURED_APPS += netutils/resolv=.built_always

+CONFIGURED_APPS += netutils/webserver=.built_always

diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/appconfig b/nuttx/configs/olimex-lpc1766stk/nettest/appconfig
new file mode 100644
index 000000000..8fb8f8bcf
--- /dev/null
+++ b/nuttx/configs/olimex-lpc1766stk/nettest/appconfig
@@ -0,0 +1,38 @@
+############################################################################

+# olimex-lpc1766stk/nettest/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/appconfig b/nuttx/configs/olimex-lpc1766stk/nsh/appconfig
index 64bdcee3f..70363f99a 100644
--- a/nuttx/configs/olimex-lpc1766stk/nsh/appconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/appconfig
@@ -33,4 +33,16 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
+# NSH library

+

+CONFIGURED_APPS += nshlib=.built_always

+

+# Networking support

+

+ifeq ($(CONFIG_NET),y)

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/dhcpc=.built_always

+CONFIGURED_APPS += netutils/resolv=.built_always

+CONFIGURED_APPS += netutils/tftp=.built_always

+CONFIGURED_APPS += netutils/webclient=.built_always

+endif

diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/appconfig b/nuttx/configs/olimex-lpc1766stk/slip-httpd/appconfig
new file mode 100644
index 000000000..08e7caeb3
--- /dev/null
+++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/appconfig
@@ -0,0 +1,39 @@
+############################################################################

+# olimex-lpc1766stk/slip-httpd/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/thttps=.built_always

diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/appconfig b/nuttx/configs/olimex-lpc1766stk/thttpd/appconfig
new file mode 100644
index 000000000..87766510d
--- /dev/null
+++ b/nuttx/configs/olimex-lpc1766stk/thttpd/appconfig
@@ -0,0 +1,39 @@
+############################################################################

+# olimex-lpc1766stk/thttpd/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

+CONFIGURED_APPS += netutils/thttpd=.built_always

diff --git a/nuttx/configs/olimex-strp711/nettest/appconfig b/nuttx/configs/olimex-strp711/nettest/appconfig
new file mode 100644
index 000000000..332a9998c
--- /dev/null
+++ b/nuttx/configs/olimex-strp711/nettest/appconfig
@@ -0,0 +1,38 @@
+############################################################################

+# olimex-strp711/nettest/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

diff --git a/nuttx/netutils/smtp/Make.defs b/nuttx/configs/sim/nettest/appconfig
index 6ea777b1c..599f57ad7 100644
--- a/nuttx/netutils/smtp/Make.defs
+++ b/nuttx/configs/sim/nettest/appconfig
@@ -1,37 +1,38 @@
-############################################################################
-# Make.defs
-#
-#   Copyright (C) 2007 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.
-#
-############################################################################
-
-SMTP_ASRCS  =
-SMTP_CSRCS  = smtp.c
+############################################################################

+# sim/nettest/appconfig

+#

+#   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.

+#

+############################################################################

+

+# Networking support

+

+CONFIGURED_APPS += netutils/uiplib=.built_always

diff --git a/nuttx/examples/README.txt b/nuttx/examples/README.txt
index 83b0c5667..9dc843f90 100644
--- a/nuttx/examples/README.txt
+++ b/nuttx/examples/README.txt
@@ -42,6 +42,12 @@ examples/dhcpd
   and used in netutils/dhcpd/dhcpd.c. These settings are required
   to described the behavior of the daemon.
 
+  Applications using this example will need to provide an appconfig
+  file in the configuration driver with instruction to build applications
+  like:
+
+  CONFIGURED_APPS = uiplib=.built_always
+
 examples/hello
 ^^^^^^^^^^^^^^
 
@@ -91,6 +97,12 @@ examples/igmp
   * CONFIG_EXAMPLE_IGMP_GRPADDR
       Multicast group address
 
+  Applications using this example will need to provide an appconfig
+  file in the configuration driver with instruction to build applications
+  like:
+
+  CONFIGURED_APPS = uiplib=.built_always
+
 examples/mm
 ^^^^^^^^^^^
 
@@ -129,6 +141,12 @@ examples/netttest
   This is a simple network test for verifying client- and server-
   functionality in a TCP/IP connection.
 
+  Applications using this example will need to provide an appconfig
+  file in the configuration driver with instruction to build applications
+  like:
+
+  CONFIGURED_APPS = uiplib=.built_always
+
 examples/nsh
 ^^^^^^^^^^^^
 
@@ -137,6 +155,20 @@ examples/nsh
   application.  NSH is described in its own README located at
   apps/nshlib/README.txt
 
+  Applications using this example will need to provide an appconfig
+  file in the configuration driver with instruction to build applications
+  like:
+
+  CONFIGURED_APPS = nshlib=.built_always
+
+  And if networking is included:
+
+  CONFIGURED_APPS = uiplib=.built_always
+  CONFIGURED_APPS = dhcpc=.built_always
+  CONFIGURED_APPS = resolv=.built_always
+  CONFIGURED_APPS = tftp=.built_always
+  CONFIGURED_APPS = webclient=.built_always
+
 examples/nx
 ^^^^^^^^^^^
 
@@ -296,6 +328,12 @@ examples/poll
   The target example should read the small message and send it back to
   the host.  The host should then receive the echo'ed message.
 
+  If networking is enabled, applications using this example will need to
+  provide an appconfig file in the configuration driver with instruction
+  to build applications like:
+
+  CONFIGURED_APPS = uiplib=.built_always
+
 examples/romfs
 ^^^^^^^^^^^^^^
 
@@ -342,6 +380,13 @@ examples/sendmail
   unprotected recipients can be used.  Most will protect themselves
   from this test email because it looks like SPAM.
 
+  Applications using this example will need to provide an appconfig
+  file in the configuration driver with instruction to build applications
+  like:
+
+  CONFIGURED_APPS = uiplib=.built_always
+  CONFIGURED_APPS = smtp=.built_always
+
 examples/serloop
 ^^^^^^^^^^^^^^^^
 
@@ -363,12 +408,25 @@ examples/thttpd
     CONFIG_EXAMPLE_THTTPD_DRIPADDR - Default router IP addess
     CONFIG_EXAMPLE_THTTPD_NETMASK  - Network mask
 
+  Applications using this example will need to provide an appconfig
+  file in the configuration driver with instruction to build applications
+  like:
+
+  CONFIGURED_APPS = uiplib=.built_always
+  CONFIGURED_APPS = thttpd=.built_always
+
 examples/udp
 ^^^^^^^^^^^^
 
   This is a simple network test for verifying client- and server-
   functionality over UDP.
 
+  Applications using this example will need to provide an appconfig
+  file in the configuration driver with instruction to build applications
+  like:
+
+  CONFIGURED_APPS = uiplib=.built_always
+
 examples/uip
 ^^^^^^^^^^^^
 
@@ -403,6 +461,15 @@ examples/uip
     CONFIG_NETUTILS_HTTPDFILESTATS
     CONFIG_NETUTILS_HTTPDNETSTATS
 
+  Applications using this example will need to provide an appconfig
+  file in the configuration driver with instruction to build applications
+  like:
+
+  CONFIGURED_APPS = uiplib=.built_always
+  CONFIGURED_APPS = dhcpc=.built_always
+  CONFIGURED_APPS = resolv=.built_always
+  CONFIGURED_APPS = webserver=.built_always
+
 examples/usbserial
 ^^^^^^^^^^^^^^^^^^
 
@@ -558,3 +625,12 @@ examples/wget
     cd examples/wget
     make -f Makefile.host
 
+  Applications using this example will need to provide an appconfig
+  file in the configuration driver with instruction to build applications
+  like:
+
+  CONFIGURED_APPS = uiplib=.built_always
+  CONFIGURED_APPS = resolv=.built_always
+  CONFIGURED_APPS = webclient=.built_always
+
+
diff --git a/nuttx/netutils/Makefile b/nuttx/netutils/Makefile
deleted file mode 100644
index 9f95a7d22..000000000
--- a/nuttx/netutils/Makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-############################################################################
-# netutils/Makefile
-#
-#   Copyright (C) 2007-2009 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.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-ifeq ($(CONFIG_NET),y)
-include uiplib/Make.defs
-ifeq ($(CONFIG_NET_TCP),y)
-include smtp/Make.defs
-include telnetd/Make.defs
-include webclient/Make.defs
-include webserver/Make.defs
-include thttpd/Make.defs
-endif
-ifeq ($(CONFIG_NET_UDP),y)
-include dhcpc/Make.defs
-include dhcpd/Make.defs
-include resolv/Make.defs
-ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
-include tftpc/Make.defs
-endif
-endif
-endif
-
-SUBDIRS		= uiplib dhcpc dhcpd resolv smtp telnetd webclient webserver tftpc thttpd
-
-ASRCS		= $(UIPLIB_ASRCS) $(DHCPC_ASRCS) $(DHCPD_ASRCS) $(RESOLV_ASRCS) \
-		  $(SMTP_ASRCS) $(TELNETD_ASRCS) $(WEBCLIENT_ASRCS) $(WEBSERVER_ASRCS) \
-		  $(TFTPC_ASRCS) $(THTTPD_ASRCS)
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-
-CSRCS		= $(UIPLIB_CSRCS) $(DHCPC_CSRCS) $(DHCPD_CSRCS) $(RESOLV_CSRCS) \
-		  $(SMTP_CSRCS) $(TELNETD_CSRCS) $(WEBCLIENT_CSRCS) $(WEBSERVER_CSRCS) \
-		  $(TFTPC_CSRCS) $(THTTPD_CSRCS)
-COBJS		= $(CSRCS:.c=$(OBJEXT))
-
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
-
-BIN		= libnetutils$(LIBEXT)
-
-VPATH		= uiplib:dhcpc:dhcpd:resolv:smtp:telnetd:webclient:webserver:tftpc:thttpd
-
-all:	$(BIN)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-$(BIN): $(OBJS)
-	@( for obj in $(OBJS) ; do \
-		$(call ARCHIVE, $@, $${obj}); \
-	done ; )
-
-.depend: Makefile $(SRCS)
-	@$(MAKE) -C thttpd all TOPDIR="$(TOPDIR)"
-ifeq ($(CONFIG_NET),y)
-	@$(MKDEP) --dep-path . --dep-path uiplib --dep-path dhcpc --dep-path dhcpd \
-		  --dep-path smtp --dep-path webclient --dep-path resolv --dep-path telnetd \
-		  --dep-path webserver --dep-path tftpc --dep-path thttpd \
-	$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-endif
-	@touch $@
-
-depend: .depend
-	@$(MAKE) -C thttpd depend TOPDIR="$(TOPDIR)"
-
-clean:
-	@rm -f $(BIN) *~ .*.swp
-	$(call CLEAN)
-	@( for dir in $(SUBDIRS); do \
-		rm -f $${dir}/*~ $${dir}/.*.swp; \
-	done ; )
-	@$(MAKE) -C thttpd clean TOPDIR="$(TOPDIR)"
-
-distclean: clean
-	@rm -f Make.dep .depend
-	@$(MAKE) -C thttpd distclean TOPDIR="$(TOPDIR)"
-
--include Make.dep
-
diff --git a/nuttx/netutils/telnetd/Make.defs b/nuttx/netutils/telnetd/Make.defs
deleted file mode 100644
index 7aafdfd27..000000000
--- a/nuttx/netutils/telnetd/Make.defs
+++ /dev/null
@@ -1,37 +0,0 @@
-############################################################################
-# Make.defs
-#
-#   Copyright (C) 2007 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.
-#
-############################################################################
-
-TELNETD_ASRCS =
-TELNETD_CSRCS = telnetd.c shell.c
diff --git a/nuttx/netutils/webclient/Make.defs b/nuttx/netutils/webclient/Make.defs
deleted file mode 100644
index 7f6c98ced..000000000
--- a/nuttx/netutils/webclient/Make.defs
+++ /dev/null
@@ -1,37 +0,0 @@
-############################################################################
-# Make.defs
-#
-#   Copyright (C) 2007 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.
-#
-############################################################################
-
-WEBCLIENT_ASRCS =
-WEBCLIENT_CSRCS = webclient.c
diff --git a/nuttx/netutils/webserver/Make.defs b/nuttx/netutils/webserver/Make.defs
deleted file mode 100644
index bdbfe6ffa..000000000
--- a/nuttx/netutils/webserver/Make.defs
+++ /dev/null
@@ -1,37 +0,0 @@
-############################################################################
-# Make.defs
-#
-#   Copyright (C) 2007, 2009 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.
-#
-############################################################################
-
-WEBSERVER_ASRCS =
-WEBSERVER_CSRCS = httpd.c httpd_fs.c httpd_cgi.c