From cf8d66212262d5d709b74b5184eed4e80b8bba1a Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 6 Sep 2013 13:07:29 -0600
Subject: [PATCH] SAMA5D3x-EK: Add support for USB MSC device on AT25 serial
flash
---
examples/usbmsc/usbmsc.h | 12 +++-
examples/usbstorage/Kconfig | 124 ------------------------------------
2 files changed, 10 insertions(+), 126 deletions(-)
delete mode 100644 examples/usbstorage/Kconfig
diff --git a/examples/usbmsc/usbmsc.h b/examples/usbmsc/usbmsc.h
index bd66a2927..2ae796efc 100644
--- a/examples/usbmsc/usbmsc.h
+++ b/examples/usbmsc/usbmsc.h
@@ -72,13 +72,21 @@
# ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR3
# error "CONFIG_EXAMPLES_USBMSC_DEVMINOR2 for LUN=3"
# endif
-# ifndef CONFIG_EXAMPLES_USBMSC_DEVPATH2
-# error "CONFIG_EXAMPLES_USBMSC_DEVPATH2 for LUN=3"
+# ifndef CONFIG_EXAMPLES_USBMSC_DEVPATH3
+# error "CONFIG_EXAMPLES_USBMSC_DEVPATH3 for LUN=3"
# endif
# if CONFIG_EXAMPLES_USBMSC_NLUNS > 3
# error "CONFIG_EXAMPLES_USBMSC_NLUNS must be {1,2,3}"
# endif
+# else
+# undef CONFIG_EXAMPLES_USBMSC_DEVMINOR3
+# undef CONFIG_EXAMPLES_USBMSC_DEVPATH3
# endif
+#else
+# undef CONFIG_EXAMPLES_USBMSC_DEVMINOR2
+# undef CONFIG_EXAMPLES_USBMSC_DEVPATH2
+# undef CONFIG_EXAMPLES_USBMSC_DEVMINOR3
+# undef CONFIG_EXAMPLES_USBMSC_DEVPATH3
#endif
/* Debug ********************************************************************/
diff --git a/examples/usbstorage/Kconfig b/examples/usbstorage/Kconfig
deleted file mode 100644
index 1681b181f..000000000
--- a/examples/usbstorage/Kconfig
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see misc/tools/kconfig-language.txt.
-#
-
-config EXAMPLES_USBMSC
- bool "USB mass storage class example"
- default n
- ---help---
- Enable the USB mass storage class example
-
-if EXAMPLES_USBMSC
-
-config EXAMPLES_USBMSC_NLUNS
- int "Number of LUNs"
- default 1
- ---help---
- Defines the number of logical units (LUNs) exported by the USB
- storage driver. Each LUN corresponds to one exported block driver
- (or partition of a block driver). May be 1, 2, or 3. Default is 1.
-
-config EXAMPLES_USBMSC_DEVMINOR1
- int "LUN1 Minor Device Number"
- default 0
- ---help---
- The minor device number of the block driver for the first LUN. For
- example, N in /dev/mmcsdN. Used for registering the block driver.
- Default is zero.
-
-config EXAMPLES_USBMSC_DEVPATH1
- string "LUN1 Device Path"
- default "/dev/mmcsd0"
- ---help---
- The full path to the registered block driver. Default is
- "/dev/mmcsd0"
-
-config EXAMPLES_USBMSC_DEVMINOR2
- int "LUN2 Minor Device Number"
- default 1
- ---help---
- The minor device number of the block driver for the second LUN. For
- example, N in /dev/mmcsdN. Used for registering the block driver.
- Ignored if EXAMPLES_USBMSC_NLUNS < 2. Default is one.
-
-config EXAMPLES_USBMSC_DEVPATH2
- string "LUN2 Device Path"
- default "/dev/mmcsd1"
- ---help---
- The full path to the registered block driver. Ignored if
- EXAMPLES_USBMSC_NLUNS < 2. Default is "/dev/mmcsd1"
-
-config EXAMPLES_USBMSC_DEVMINOR3
- int "LUN3 Minor Device Number"
- default 2
- ---help---
- The minor device number of the block driver for the third LUN. For
- example, N in /dev/mmcsdN. Used for registering the block driver.
- Ignored if EXAMPLES_USBMSC_NLUNS < 2. Default is two.
-
-config EXAMPLES_USBMSC_DEVPATH3
- string "LUN3 Device Path"
- default "/dev/mmcsd2"
- ---help---
- The full path to the registered block driver. Ignored if
- EXAMPLES_USBMSC_NLUNS < 2. Default is "/dev/mmcsd2"
-
-config EXAMPLES_USBMSC_DEBUGMM
- bool "USB MSC MM Debug"
- default n
- ---help---
- Enables some debug tests to check for memory usage and memory leaks.
-
-config EXAMPLES_USBMSC_TRACEINIT
- bool "USB Trace Initialization"
- default n
- depends on USBDEV_TRACE || DEBUG_USB
- ---help---
- If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
- then the example code will also manage the USB trace output. The
- amount of trace output can be controlled this configuration value:
- This setting will show USB initialization events
-
-config EXAMPLES_USBMSC_TRACECLASS
- bool "USB Trace Class"
- default n
- depends on USBDEV_TRACE || DEBUG_USB
- ---help---
- If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
- then the example code will also manage the USB trace output. The
- amount of trace output can be controlled this configuration value:
- This setting will show USB class driver events
-
-config EXAMPLES_USBMSC_TRACETRANSFERS
- bool "USB Trace Transfers"
- default n
- depends on USBDEV_TRACE || DEBUG_USB
- ---help---
- If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
- then the example code will also manage the USB trace output. The
- amount of trace output can be controlled this configuration value:
- This setting will show USB data transfer events
-
-config EXAMPLES_USBMSC_TRACECONTROLLER
- bool "USB Trace Device Controller Events"
- default n
- depends on USBDEV_TRACE || DEBUG_USB
- ---help---
- If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
- then the example code will also manage the USB trace output. The
- amount of trace output can be controlled this configuration value:
- This setting will show USB device controller events
-
-config EXAMPLES_USBMSC_TRACEINTERRUPTS
- bool "USB Trace Device Controller Interrupt Events"
- default n
- depends on USBDEV_TRACE || DEBUG_USB
- ---help---
- If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
- then the example code will also manage the USB trace output. The
- amount of trace output can be controlled this configuration value:
- This setting will show USB device controller interrupt-related events.
-
-endif
-