From 54cd9689cccad1949c067f40d500491851799221 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 25 Sep 2013 17:23:03 -0600 Subject: Move apps/examples/cdcacm to apps/system/cdcacm --- nuttx/configs/pic32-starterkit/README.txt | 4 ++-- nuttx/configs/pic32-starterkit/nsh/appconfig | 4 ++-- nuttx/configs/pic32-starterkit/nsh/defconfig | 14 +++++++------- nuttx/configs/pic32-starterkit/nsh2/appconfig | 4 ++-- nuttx/configs/pic32-starterkit/nsh2/defconfig | 14 +++++++------- nuttx/configs/pic32-starterkit/ostest/defconfig | 14 +++++++------- 6 files changed, 27 insertions(+), 27 deletions(-) (limited to 'nuttx/configs/pic32-starterkit') diff --git a/nuttx/configs/pic32-starterkit/README.txt b/nuttx/configs/pic32-starterkit/README.txt index af194171b..2ea896f8a 100644 --- a/nuttx/configs/pic32-starterkit/README.txt +++ b/nuttx/configs/pic32-starterkit/README.txt @@ -1086,10 +1086,10 @@ Where is one of the following: CONFIG_PL2303=y : Enable the Prolifics PL2303 emulation CONFIG_CDCACM=y : or the CDC/ACM serial driver (not both) - examples/cdcacm - The examples/cdcacm program can be included as an + system/cdcacm - The system/cdcacm program can be included as an function by uncommenting the following line in the appconfig file: - CONFIGURED_APPS += examples/cdcacm + CONFIGURED_APPS += system/cdcacm and defining the following in your .config file: diff --git a/nuttx/configs/pic32-starterkit/nsh/appconfig b/nuttx/configs/pic32-starterkit/nsh/appconfig index 98c52a98e..d232e58e5 100644 --- a/nuttx/configs/pic32-starterkit/nsh/appconfig +++ b/nuttx/configs/pic32-starterkit/nsh/appconfig @@ -62,8 +62,8 @@ endif # USB CDC/ACM serial device configurations ifeq ($(CONFIG_CDCACM),y) -# Uncomment to enable the examples/cdcacm built-in -# CONFIGURED_APPS += examples/cdcacm +# Uncomment to enable the system/cdcacm built-in +# CONFIGURED_APPS += system/cdcacm # Uncomment the following to enable the examples/usbterm built-in # CONFIGURED_APPS += examples/usbterm endif diff --git a/nuttx/configs/pic32-starterkit/nsh/defconfig b/nuttx/configs/pic32-starterkit/nsh/defconfig index 3388dec0a..277ba1b68 100644 --- a/nuttx/configs/pic32-starterkit/nsh/defconfig +++ b/nuttx/configs/pic32-starterkit/nsh/defconfig @@ -649,16 +649,16 @@ CONFIG_EXAMPLES_USBTERM_TRACECONTROLLER=n CONFIG_EXAMPLES_USBTERM_TRACEINTERRUPTS=n # -# Settings for examples/cdcacm +# Settings for system/cdcacm # # Configuration prequisites: # -CONFIG_EXAMPLES_CDCACM_DEVMINOR=0 -CONFIG_EXAMPLES_CDCACM_TRACEINIT=n -CONFIG_EXAMPLES_CDCACM_TRACECLASS=n -CONFIG_EXAMPLES_CDCACM_TRACETRANSFERS=n -CONFIG_EXAMPLES_CDCACM_TRACECONTROLLER=n -CONFIG_EXAMPLES_CDCACM_TRACEINTERRUPTS=n +CONFIG_SYSTEM_CDCACM_DEVMINOR=0 +CONFIG_SYSTEM_CDCACM_TRACEINIT=n +CONFIG_SYSTEM_CDCACM_TRACECLASS=n +CONFIG_SYSTEM_CDCACM_TRACETRANSFERS=n +CONFIG_SYSTEM_CDCACM_TRACECONTROLLER=n +CONFIG_SYSTEM_CDCACM_TRACEINTERRUPTS=n # # Stack and heap information diff --git a/nuttx/configs/pic32-starterkit/nsh2/appconfig b/nuttx/configs/pic32-starterkit/nsh2/appconfig index 73cfdb455..135b89dbc 100644 --- a/nuttx/configs/pic32-starterkit/nsh2/appconfig +++ b/nuttx/configs/pic32-starterkit/nsh2/appconfig @@ -62,8 +62,8 @@ endif # USB CDC/ACM serial device configurations ifeq ($(CONFIG_CDCACM),y) -# Uncomment to enable the examples/cdcacm built-in -# CONFIGURED_APPS += examples/cdcacm +# Uncomment to enable the system/cdcacm built-in +# CONFIGURED_APPS += system/cdcacm # Uncomment the following to enable the examples/usbterm built-in # CONFIGURED_APPS += examples/usbterm endif diff --git a/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32-starterkit/nsh2/defconfig index 0cb70d5ac..1045844a8 100644 --- a/nuttx/configs/pic32-starterkit/nsh2/defconfig +++ b/nuttx/configs/pic32-starterkit/nsh2/defconfig @@ -648,16 +648,16 @@ CONFIG_EXAMPLES_USBTERM_TRACECONTROLLER=n CONFIG_EXAMPLES_USBTERM_TRACEINTERRUPTS=n # -# Settings for examples/cdcacm +# Settings for system/cdcacm # # Configuration prequisites: # -CONFIG_EXAMPLES_CDCACM_DEVMINOR=0 -CONFIG_EXAMPLES_CDCACM_TRACEINIT=n -CONFIG_EXAMPLES_CDCACM_TRACECLASS=n -CONFIG_EXAMPLES_CDCACM_TRACETRANSFERS=n -CONFIG_EXAMPLES_CDCACM_TRACECONTROLLER=n -CONFIG_EXAMPLES_CDCACM_TRACEINTERRUPTS=n +CONFIG_SYSTEM_CDCACM_DEVMINOR=0 +CONFIG_SYSTEM_CDCACM_TRACEINIT=n +CONFIG_SYSTEM_CDCACM_TRACECLASS=n +CONFIG_SYSTEM_CDCACM_TRACETRANSFERS=n +CONFIG_SYSTEM_CDCACM_TRACECONTROLLER=n +CONFIG_SYSTEM_CDCACM_TRACEINTERRUPTS=n # # Stack and heap information diff --git a/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig index 0e55d4a51..6b0b6ba7e 100644 --- a/nuttx/configs/pic32-starterkit/ostest/defconfig +++ b/nuttx/configs/pic32-starterkit/ostest/defconfig @@ -645,16 +645,16 @@ CONFIG_EXAMPLES_USBTERM_TRACECONTROLLER=n CONFIG_EXAMPLES_USBTERM_TRACEINTERRUPTS=n # -# Settings for examples/cdcacm +# Settings for system/cdcacm # # Configuration prequisites: # -CONFIG_EXAMPLES_CDCACM_DEVMINOR=0 -CONFIG_EXAMPLES_CDCACM_TRACEINIT=n -CONFIG_EXAMPLES_CDCACM_TRACECLASS=n -CONFIG_EXAMPLES_CDCACM_TRACETRANSFERS=n -CONFIG_EXAMPLES_CDCACM_TRACECONTROLLER=n -CONFIG_EXAMPLES_CDCACM_TRACEINTERRUPTS=n +CONFIG_SYSTEM_CDCACM_DEVMINOR=0 +CONFIG_SYSTEM_CDCACM_TRACEINIT=n +CONFIG_SYSTEM_CDCACM_TRACECLASS=n +CONFIG_SYSTEM_CDCACM_TRACETRANSFERS=n +CONFIG_SYSTEM_CDCACM_TRACECONTROLLER=n +CONFIG_SYSTEM_CDCACM_TRACEINTERRUPTS=n # # Stack and heap information -- cgit v1.2.3