diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-06-12 17:32:00 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-06-12 17:32:00 -0600 |
| commit | 3980a00ab75c580d1f4246a9be226631832c9e6e (patch) | |
| tree | 1d8e177d23a39c0fe30e44cc1843cb3f4d737021 /apps/examples/tiff | |
| parent | 5633c904e72b25119bbd9056bc0951ef9f6ad88e (diff) | |
| download | px4-nuttx-3980a00ab75c580d1f4246a9be226631832c9e6e.tar.gz px4-nuttx-3980a00ab75c580d1f4246a9be226631832c9e6e.tar.bz2 px4-nuttx-3980a00ab75c580d1f4246a9be226631832c9e6e.zip | |
Remove CONFIG_XYZ_BUILTIN configurations, replace with the single CONFIG_NSH_BUILTIN_APPS. Add SAM3/4 sam_periphclks.h which is just a header file that includes the right header file. Misc SAM3U-EK cleanup
Diffstat (limited to 'apps/examples/tiff')
| -rw-r--r-- | apps/examples/tiff/Makefile | 2 | ||||
| -rw-r--r-- | apps/examples/tiff/tiff_main.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/apps/examples/tiff/Makefile b/apps/examples/tiff/Makefile index 17b3bb92c..7be74a587 100644 --- a/apps/examples/tiff/Makefile +++ b/apps/examples/tiff/Makefile @@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_EXAMPLES_TIFF_BUILTIN),y) +ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) diff --git a/apps/examples/tiff/tiff_main.c b/apps/examples/tiff/tiff_main.c index 1bf931a43..357e29bf8 100644 --- a/apps/examples/tiff/tiff_main.c +++ b/apps/examples/tiff/tiff_main.c @@ -1,7 +1,7 @@ /**************************************************************************** * apps/graphics/tiff/tiff_main.c * - * Copyright (C) 2011 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 @@ -56,7 +56,6 @@ * built-on, i.e., if the following is defined: * * CONFIG_NSH_BUILTIN_APPS=y - * CONFIG_EXAMPLES_TIFF_BUILTIN=y * * Other configuration options: * |