Browse Source

Kconfig: gadget: Move CONFIG_USB_FUNCTION_MASS_STORAGE to Kconfig

This commit moves USB_FUNCTION_MASS_STORAGE config to Kconfig.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Lukasz Majewski 6 years ago
parent
commit
4f60e5d3a8
52 changed files with 27 additions and 51 deletions
  1. 1 0
      configs/Bananapi_m2m_defconfig
  2. 1 0
      configs/CHIP_pro_defconfig
  3. 1 0
      configs/Nintendo_NES_Classic_Edition_defconfig
  4. 1 0
      configs/Sinlinx_SinA33_defconfig
  5. 1 0
      configs/chromebit_mickey_defconfig
  6. 1 0
      configs/chromebook_jerry_defconfig
  7. 1 0
      configs/chromebook_minnie_defconfig
  8. 1 0
      configs/evb-rk3036_defconfig
  9. 1 0
      configs/evb-rk3229_defconfig
  10. 1 0
      configs/evb-rk3288_defconfig
  11. 1 0
      configs/fennec-rk3288_defconfig
  12. 1 0
      configs/firefly-rk3288_defconfig
  13. 1 0
      configs/kylin-rk3036_defconfig
  14. 1 0
      configs/miqi-rk3288_defconfig
  15. 1 0
      configs/parrot_r16_defconfig
  16. 1 0
      configs/phycore-rk3288_defconfig
  17. 1 0
      configs/popmetal-rk3288_defconfig
  18. 1 0
      configs/rock2_defconfig
  19. 1 0
      configs/tbs_a711_defconfig
  20. 1 0
      configs/tinker-rk3288_defconfig
  21. 1 0
      configs/vyasa-rk3288_defconfig
  22. 6 0
      drivers/usb/gadget/Kconfig
  23. 0 1
      include/configs/advantech_dms-ba16.h
  24. 0 1
      include/configs/apalis_imx6.h
  25. 0 4
      include/configs/bav335x.h
  26. 0 2
      include/configs/cgtqmx6eval.h
  27. 0 1
      include/configs/colibri_imx6.h
  28. 0 2
      include/configs/colibri_imx7.h
  29. 0 1
      include/configs/colibri_vf.h
  30. 0 2
      include/configs/dh_imx6.h
  31. 0 2
      include/configs/exynos4-common.h
  32. 0 1
      include/configs/ge_bx50v3.h
  33. 0 3
      include/configs/gw_ventana.h
  34. 0 1
      include/configs/ma5d4evk.h
  35. 0 2
      include/configs/mx6sabre_common.h
  36. 0 2
      include/configs/mx7dsabresd.h
  37. 0 2
      include/configs/nitrogen6x.h
  38. 0 1
      include/configs/odroid_xu3.h
  39. 0 1
      include/configs/opos6uldev.h
  40. 0 2
      include/configs/pico-imx6ul.h
  41. 0 2
      include/configs/pico-imx7d.h
  42. 0 1
      include/configs/rk3036_common.h
  43. 0 1
      include/configs/rk3128_common.h
  44. 0 1
      include/configs/rk322x_common.h
  45. 0 1
      include/configs/rk3288_common.h
  46. 0 1
      include/configs/s5p_goni.h
  47. 0 2
      include/configs/socfpga_common.h
  48. 0 4
      include/configs/sunxi-common.h
  49. 0 1
      include/configs/tbs2910.h
  50. 0 2
      include/configs/tegra-common-usb-gadget.h
  51. 0 2
      include/configs/warp.h
  52. 0 2
      include/configs/warp7.h

+ 1 - 0
configs/Bananapi_m2m_defconfig

@@ -18,3 +18,4 @@ CONFIG_SPL=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y

+ 1 - 0
configs/CHIP_pro_defconfig

@@ -25,3 +25,4 @@ CONFIG_AXP_ALDO4_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y

+ 1 - 0
configs/Nintendo_NES_Classic_Edition_defconfig

@@ -20,3 +20,4 @@ CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_AXP_ELDO2_VOLT=1800
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y

+ 1 - 0
configs/Sinlinx_SinA33_defconfig

@@ -24,3 +24,4 @@ CONFIG_DFU_RAM=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y

+ 1 - 0
configs/chromebit_mickey_defconfig

@@ -81,6 +81,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROCKCHIP=y

+ 1 - 0
configs/chromebook_jerry_defconfig

@@ -82,6 +82,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROCKCHIP=y

+ 1 - 0
configs/chromebook_minnie_defconfig

@@ -81,6 +81,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROCKCHIP=y

+ 1 - 0
configs/evb-rk3036_defconfig

@@ -47,6 +47,7 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x310a
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_ERRNO_STR=y

+ 1 - 0
configs/evb-rk3229_defconfig

@@ -52,4 +52,5 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_ERRNO_STR=y

+ 1 - 0
configs/evb-rk3288_defconfig

@@ -72,6 +72,7 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROCKCHIP=y

+ 1 - 0
configs/fennec-rk3288_defconfig

@@ -73,6 +73,7 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y

+ 1 - 0
configs/firefly-rk3288_defconfig

@@ -79,6 +79,7 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y

+ 1 - 0
configs/kylin-rk3036_defconfig

@@ -47,6 +47,7 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x310a
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y

+ 1 - 0
configs/miqi-rk3288_defconfig

@@ -73,6 +73,7 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y

+ 1 - 0
configs/parrot_r16_defconfig

@@ -20,3 +20,4 @@ CONFIG_SPL=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y

+ 1 - 0
configs/phycore-rk3288_defconfig

@@ -77,6 +77,7 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y

+ 1 - 0
configs/popmetal-rk3288_defconfig

@@ -73,6 +73,7 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y

+ 1 - 0
configs/rock2_defconfig

@@ -74,6 +74,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_DWC2=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROCKCHIP=y

+ 1 - 0
configs/tbs_a711_defconfig

@@ -21,3 +21,4 @@ CONFIG_SPL=y
 CONFIG_AXP_DCDC5_VOLT=1200
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y

+ 1 - 0
configs/tinker-rk3288_defconfig

@@ -76,6 +76,7 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y

+ 1 - 0
configs/vyasa-rk3288_defconfig

@@ -72,6 +72,7 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y

+ 6 - 0
drivers/usb/gadget/Kconfig

@@ -127,6 +127,12 @@ config USB_GADGET_DOWNLOAD
 
 if USB_GADGET_DOWNLOAD
 
+config USB_FUNCTION_MASS_STORAGE
+	bool "Enable USB mass storage gadget"
+	help
+	  Enable mass storage protocol support in U-Boot. It allows exporting
+	  the eMMC/SD card content to HOST PC so it can be mounted.
+
 config USB_FUNCTION_ROCKUSB
         bool "Enable USB rockusb gadget"
         help

+ 0 - 1
include/configs/advantech_dms-ba16.h

@@ -57,7 +57,6 @@
 #define CONFIG_MXC_USB_FLAGS	0
 
 #define CONFIG_USBD_HS
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 
 /* Networking Configs */
 #define CONFIG_FEC_MXC

+ 0 - 1
include/configs/apalis_imx6.h

@@ -97,7 +97,6 @@
 #define CONFIG_USBD_HS
 
 #define CONFIG_USB_GADGET_MASS_STORAGE
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 /* USB DFU */
 #define CONFIG_DFU_MMC
 

+ 0 - 4
include/configs/bav335x.h

@@ -400,10 +400,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #define CONFIG_AM335X_USB1
 #define CONFIG_AM335X_USB1_MODE MUSB_HOST
 
-#ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-#endif /* CONFIG_USB_MUSB_GADGET */
-
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
 /* disable host part of MUSB in SPL */
 /* disable EFI partitions and partition UUID support */

+ 0 - 2
include/configs/cgtqmx6eval.h

@@ -68,8 +68,6 @@
 
 #define CONFIG_USBD_HS
 
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_VIDEO_BMP_RLE8

+ 0 - 1
include/configs/colibri_imx6.h

@@ -85,7 +85,6 @@
 #define CONFIG_USBD_HS
 
 #define CONFIG_USB_GADGET_MASS_STORAGE
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 /* USB DFU */
 #define CONFIG_DFU_MMC
 

+ 0 - 2
include/configs/colibri_imx7.h

@@ -187,8 +187,6 @@
 
 #define CONFIG_USBD_HS
 
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 /* USB Device Firmware Update support */
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	SZ_16M
 #define DFU_DEFAULT_POLL_TIMEOUT	300

+ 0 - 1
include/configs/colibri_vf.h

@@ -181,6 +181,5 @@
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1024 * 1024)
 
 /* USB Storage */
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 
 #endif /* __CONFIG_H */

+ 0 - 2
include/configs/dh_imx6.h

@@ -116,8 +116,6 @@
 
 /* USB Gadget (DFU, UMS) */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	(16 * 1024 * 1024)
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 

+ 0 - 2
include/configs/exynos4-common.h

@@ -33,8 +33,6 @@
 
 #define CONFIG_USB_GADGET_DWC2_OTG_PHY
 
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 /* Common environment variables */
 #define CONFIG_EXTRA_ENV_ITB \
 	"loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \

+ 0 - 1
include/configs/ge_bx50v3.h

@@ -72,7 +72,6 @@
 
 #define CONFIG_USBD_HS
 #define CONFIG_USB_GADGET_MASS_STORAGE
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 #endif
 
 /* Networking Configs */

+ 0 - 3
include/configs/gw_ventana.h

@@ -146,9 +146,6 @@
 #define CONFIG_USBD_HS
 #define CONFIG_NETCONSOLE
 
-/* USB Mass Storage Gadget */
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 /* Framebuffer and LCD */
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_VIDEO_LOGO

+ 0 - 1
include/configs/ma5d4evk.h

@@ -100,7 +100,6 @@
 #ifdef CONFIG_CMD_USB
 
 /* USB device */
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	(1 * 1024 * 1024)
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 #endif

+ 0 - 2
include/configs/mx6sabre_common.h

@@ -210,8 +210,6 @@
 
 #ifndef CONFIG_SPL
 #define CONFIG_USBD_HS
-
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 #endif
 
 #endif                         /* __MX6QSABRE_COMMON_CONFIG_H */

+ 0 - 2
include/configs/mx7dsabresd.h

@@ -220,8 +220,6 @@
 
 #define CONFIG_USBD_HS
 
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO

+ 0 - 2
include/configs/nitrogen6x.h

@@ -279,6 +279,4 @@
 #define CONFIG_PCIE_IMX
 #endif
 
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 #endif	       /* __CONFIG_H */

+ 0 - 1
include/configs/odroid_xu3.h

@@ -51,7 +51,6 @@
 /* UMS */
 #define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 
 /* FIXME: MUST BE REMOVED AFTER TMU IS TURNED ON */
 #undef CONFIG_EXYNOS_TMU

+ 0 - 1
include/configs/opos6uldev.h

@@ -49,7 +49,6 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	2
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 #endif
 
 /* Ethernet */

+ 0 - 2
include/configs/pico-imx6ul.h

@@ -42,8 +42,6 @@
 
 #define CONFIG_USBD_HS
 
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 

+ 0 - 2
include/configs/pico-imx7d.h

@@ -136,6 +136,4 @@
 
 #define CONFIG_IMX_THERMAL
 
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 #endif

+ 0 - 1
include/configs/rk3036_common.h

@@ -47,7 +47,6 @@
 /* usb otg */
 
 /* usb mass storage */
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_CMD_USB_MASS_STORAGE
 
 /* usb host */

+ 0 - 1
include/configs/rk3128_common.h

@@ -47,7 +47,6 @@
 #ifndef CONFIG_SPL_BUILD
 
 /* usb mass storage */
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 
 #define ENV_MEM_LAYOUT_SETTINGS \
 	"scriptaddr=0x60500000\0" \

+ 0 - 1
include/configs/rk322x_common.h

@@ -41,7 +41,6 @@
 /* usb otg */
 
 /* usb mass storage */
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_CMD_USB_MASS_STORAGE
 
 /* usb host */

+ 0 - 1
include/configs/rk3288_common.h

@@ -60,7 +60,6 @@
 /* usb otg */
 
 /* usb mass storage */
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_CMD_USB_MASS_STORAGE
 
 /* usb host support */

+ 0 - 1
include/configs/s5p_goni.h

@@ -187,6 +187,5 @@
 #define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_LOAD_ADDR - 0x1000000)
 
 #define CONFIG_USB_GADGET_DWC2_OTG_PHY
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 
 #endif	/* __CONFIG_H */

+ 0 - 2
include/configs/socfpga_common.h

@@ -210,8 +210,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  * USB Gadget (DFU, UMS)
  */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	(16 * 1024 * 1024)
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 

+ 0 - 4
include/configs/sunxi-common.h

@@ -312,10 +312,6 @@ extern int soft_i2c_gpio_scl;
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
 #endif
 
-#ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-#endif
-
 #ifdef CONFIG_USB_FUNCTION_MASS_STORAGE
 #endif
 

+ 0 - 1
include/configs/tbs2910.h

@@ -91,7 +91,6 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #ifdef CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USBD_HS
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 #endif /* CONFIG_CMD_USB_MASS_STORAGE */
 #ifdef CONFIG_USB_KEYBOARD
 #define CONFIG_PREBOOT \

+ 0 - 2
include/configs/tegra-common-usb-gadget.h

@@ -13,8 +13,6 @@
 #ifndef CONFIG_TEGRA20
 #define CONFIG_CI_UDC_HAS_HOSTPC
 #endif
-/* USB mass storage protocol */
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 /* DFU protocol */
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_1M
 #define CONFIG_SYS_DFU_MAX_FILE_SIZE SZ_32M

+ 0 - 2
include/configs/warp.h

@@ -64,8 +64,6 @@
 
 #define CONFIG_USBD_HS
 
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 

+ 0 - 2
include/configs/warp7.h

@@ -130,8 +130,6 @@
 
 #define CONFIG_USBD_HS
 
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 /* USB Device Firmware Update support */
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	SZ_16M
 #define DFU_DEFAULT_POLL_TIMEOUT	300