diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-09-25 16:54:39 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-09-25 16:54:39 -0600 |
| commit | 55a34548ccc4fc7aa55ad585b007c7d77d8cf937 (patch) | |
| tree | e1e5eb48cbf91118a54ba58744275e945753afbf /nuttx/configs/pic32mx7mmb | |
| parent | 3302f2a96c91ee259e7aa5e2661154363eb9a4f4 (diff) | |
| download | px4-nuttx-55a34548ccc4fc7aa55ad585b007c7d77d8cf937.tar.gz px4-nuttx-55a34548ccc4fc7aa55ad585b007c7d77d8cf937.tar.bz2 px4-nuttx-55a34548ccc4fc7aa55ad585b007c7d77d8cf937.zip | |
Move apps/examples/usbmsc to apps/system/usbmsc
Diffstat (limited to 'nuttx/configs/pic32mx7mmb')
| -rw-r--r-- | nuttx/configs/pic32mx7mmb/README.txt | 10 | ||||
| -rw-r--r-- | nuttx/configs/pic32mx7mmb/nsh/appconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/pic32mx7mmb/nsh/defconfig | 20 | ||||
| -rw-r--r-- | nuttx/configs/pic32mx7mmb/ostest/defconfig | 20 | ||||
| -rw-r--r-- | nuttx/configs/pic32mx7mmb/src/up_usbmsc.c | 2 |
5 files changed, 27 insertions, 27 deletions
diff --git a/nuttx/configs/pic32mx7mmb/README.txt b/nuttx/configs/pic32mx7mmb/README.txt index 73b50945b..19ae05bc6 100644 --- a/nuttx/configs/pic32mx7mmb/README.txt +++ b/nuttx/configs/pic32mx7mmb/README.txt @@ -771,15 +771,15 @@ Where <subdir> is one of the following: d) Use a RAM disk (instead of an SD card) as the USB MSC logical unit: - -CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0" - +CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/ram0" + -CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0" + +CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/ram0" 2. Changes to nuttx/.config. - a) Enable building of the examples/usbmsc: + a) Enable building of the system/usbmsc: - -# CONFIGURED_APPS += examples/usbmsc - + CONFIGURED_APPS += examples/usbmsc + -# CONFIGURED_APPS += system/usbmsc + + CONFIGURED_APPS += system/usbmsc 3. When NSH first comes up, you must manually create the RAM disk before exporting it: diff --git a/nuttx/configs/pic32mx7mmb/nsh/appconfig b/nuttx/configs/pic32mx7mmb/nsh/appconfig index 679ab5997..08ee858e9 100644 --- a/nuttx/configs/pic32mx7mmb/nsh/appconfig +++ b/nuttx/configs/pic32mx7mmb/nsh/appconfig @@ -55,7 +55,7 @@ ifeq ($(CONFIG_PIC32MX_USBDEV),y) # USB Mass Storage Class device configurations ifeq ($(CONFIG_USBMSC),y) - CONFIGURED_APPS += examples/usbmsc + CONFIGURED_APPS += system/usbmsc else # USB CDC/ACM serial device configurations diff --git a/nuttx/configs/pic32mx7mmb/nsh/defconfig b/nuttx/configs/pic32mx7mmb/nsh/defconfig index f47363019..839464997 100644 --- a/nuttx/configs/pic32mx7mmb/nsh/defconfig +++ b/nuttx/configs/pic32mx7mmb/nsh/defconfig @@ -738,16 +738,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n # -# Settings for examples/usbmsc -# -CONFIG_EXAMPLES_USBMSC_NLUNS=1 -CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0 -CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0" -CONFIG_EXAMPLES_USBMSC_TRACEINIT=n -CONFIG_EXAMPLES_USBMSC_TRACECLASS=n -CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n -CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n -CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n +# Settings for system/usbmsc +# +CONFIG_SYSTEM_USBMSC_NLUNS=1 +CONFIG_SYSTEM_USBMSC_DEVMINOR1=0 +CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0" +CONFIG_SYSTEM_USBMSC_TRACEINIT=n +CONFIG_SYSTEM_USBMSC_TRACECLASS=n +CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n +CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n +CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n # # Settings for examples/usbterm diff --git a/nuttx/configs/pic32mx7mmb/ostest/defconfig b/nuttx/configs/pic32mx7mmb/ostest/defconfig index de06d1674..419f2040f 100644 --- a/nuttx/configs/pic32mx7mmb/ostest/defconfig +++ b/nuttx/configs/pic32mx7mmb/ostest/defconfig @@ -622,16 +622,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n # -# Settings for examples/usbmsc -# -CONFIG_EXAMPLES_USBMSC_NLUNS=1 -CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0 -CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0" -CONFIG_EXAMPLES_USBMSC_TRACEINIT=n -CONFIG_EXAMPLES_USBMSC_TRACECLASS=n -CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n -CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n -CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n +# Settings for system/usbmsc +# +CONFIG_SYSTEM_USBMSC_NLUNS=1 +CONFIG_SYSTEM_USBMSC_DEVMINOR1=0 +CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0" +CONFIG_SYSTEM_USBMSC_TRACEINIT=n +CONFIG_SYSTEM_USBMSC_TRACECLASS=n +CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n +CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n +CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n # # Settings for examples/usbterm diff --git a/nuttx/configs/pic32mx7mmb/src/up_usbmsc.c b/nuttx/configs/pic32mx7mmb/src/up_usbmsc.c index 5ec64336c..7038bb635 100644 --- a/nuttx/configs/pic32mx7mmb/src/up_usbmsc.c +++ b/nuttx/configs/pic32mx7mmb/src/up_usbmsc.c @@ -82,7 +82,7 @@ int usbmsc_archinitialize(void) { - /* If examples/usbmsc is built as an NSH command, then SD slot should + /* If system/usbmsc is built as an NSH command, then SD slot should * already have been initized in nsh_archinitialize() (see up_nsh.c). In * this case, there is nothing further to be done here. */ |