Prep for 6.14 release

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4301 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-01-15 16:11:32 +00:00
parent 247096fede
commit c55b63c7e3
7 changed files with 218 additions and 157 deletions
+1 -1
View File
@@ -1131,7 +1131,7 @@ examples/usbterm
Configuration options:
CONFIG_EXAMPLES_UBSTERM_BUILTIN - Build the usbterm example as an NSH
CONFIG_EXAMPLES_USBTERM_BUILTIN - Build the usbterm example as an NSH
built-in command. NOTE: This is not fully functional as of this
writing.. It should work, but there is no mechanism in place yet
to exit the USB terminal program and return to NSH.
+4 -4
View File
@@ -1,8 +1,8 @@
############################################################################
# apps/examples/usbterm/Makefile
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -67,7 +67,7 @@ STACKSIZE = 2048
VPATH =
all: .built
.PHONY: clean depend distclean
.PHONY: context clean depend distclean
$(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)
@@ -82,7 +82,7 @@ $(COBJS): %$(OBJEXT): %.c
@touch .built
.context:
ifeq ($(CONFIG_EXAMPLES_UBSTERM_BUILTIN),y)
ifeq ($(CONFIG_EXAMPLES_USBTERM_BUILTIN),y)
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
@touch $@
endif