diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-13 09:14:40 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-13 09:14:40 +0200 |
| commit | c255df1df9c1cd51e6d0e71ee5f2e92a22eac5cf (patch) | |
| tree | 2254ceb7c66ba63b6cb6738af92c839f3868c748 /apps/examples/usbterm | |
| parent | bc5c15a4909386a1efd556f4648385440379b164 (diff) | |
| download | nuttx-c255df1df9c1cd51e6d0e71ee5f2e92a22eac5cf.tar.gz nuttx-c255df1df9c1cd51e6d0e71ee5f2e92a22eac5cf.tar.bz2 nuttx-c255df1df9c1cd51e6d0e71ee5f2e92a22eac5cf.zip | |
Merged in upstream, took upstream UART driver without changes, needs re-evaluation (minor diffs to local version)
Diffstat (limited to 'apps/examples/usbterm')
| -rw-r--r-- | apps/examples/usbterm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/examples/usbterm/Makefile b/apps/examples/usbterm/Makefile index 91e80686e..bf27558c5 100644 --- a/apps/examples/usbterm/Makefile +++ b/apps/examples/usbterm/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/examples/usbterm/Makefile # -# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_EXAMPLES_USBTERM_BUILTIN),y) +ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) |