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 /nuttx/configs/kwikstik-k40 | |
| 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 'nuttx/configs/kwikstik-k40')
| -rwxr-xr-x | nuttx/configs/kwikstik-k40/ostest/defconfig | 1 | ||||
| -rw-r--r-- | nuttx/configs/kwikstik-k40/src/up_usbmsc.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/nuttx/configs/kwikstik-k40/ostest/defconfig b/nuttx/configs/kwikstik-k40/ostest/defconfig index 16b3bd321..bcf204bb4 100755 --- a/nuttx/configs/kwikstik-k40/ostest/defconfig +++ b/nuttx/configs/kwikstik-k40/ostest/defconfig @@ -463,7 +463,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXTEXT is not set CONFIG_EXAMPLES_OSTEST=y -# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 diff --git a/nuttx/configs/kwikstik-k40/src/up_usbmsc.c b/nuttx/configs/kwikstik-k40/src/up_usbmsc.c index ea97cb99f..bbdbbba94 100644 --- a/nuttx/configs/kwikstik-k40/src/up_usbmsc.c +++ b/nuttx/configs/kwikstik-k40/src/up_usbmsc.c @@ -110,9 +110,9 @@ int usbmsc_archinitialize(void) * this case, there is nothing further to be done here. */ -#ifndef CONFIG_EXAMPLES_USBMSC_BUILTIN +#ifndef CONFIG_NSH_BUILTIN_APPS # warning "Missing logic" -#endif /* CONFIG_EXAMPLES_USBMSC_BUILTIN */ +#endif /* CONFIG_NSH_BUILTIN_APPS */ return OK; } |