Commit 4f60e5d3a82f7061d235c28eb3451b612fae43b5

Authored by Lukasz Majewski
Committed by Tom Rini
1 parent c6c1ca100f

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>

Showing 52 changed files with 27 additions and 51 deletions Side-by-side Diff

configs/Bananapi_m2m_defconfig
... ... @@ -18,4 +18,5 @@
18 18 # CONFIG_SPL_PARTITION_UUIDS is not set
19 19 CONFIG_USB_EHCI_HCD=y
20 20 CONFIG_USB_MUSB_GADGET=y
  21 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
configs/CHIP_pro_defconfig
... ... @@ -25,4 +25,5 @@
25 25 CONFIG_USB_EHCI_HCD=y
26 26 CONFIG_USB_MUSB_GADGET=y
27 27 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
  28 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
configs/Nintendo_NES_Classic_Edition_defconfig
... ... @@ -20,4 +20,5 @@
20 20 CONFIG_AXP_ELDO2_VOLT=1800
21 21 CONFIG_USB_MUSB_GADGET=y
22 22 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
  23 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
configs/Sinlinx_SinA33_defconfig
... ... @@ -24,4 +24,5 @@
24 24 CONFIG_USB_EHCI_HCD=y
25 25 CONFIG_USB_MUSB_GADGET=y
26 26 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
  27 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
configs/chromebit_mickey_defconfig
... ... @@ -81,6 +81,7 @@
81 81 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
82 82 CONFIG_USB_GADGET_DWC2_OTG=y
83 83 CONFIG_USB_STORAGE=y
  84 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
84 85 CONFIG_DM_VIDEO=y
85 86 CONFIG_DISPLAY=y
86 87 CONFIG_VIDEO_ROCKCHIP=y
configs/chromebook_jerry_defconfig
... ... @@ -82,6 +82,7 @@
82 82 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
83 83 CONFIG_USB_GADGET_DWC2_OTG=y
84 84 CONFIG_USB_STORAGE=y
  85 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
85 86 CONFIG_DM_VIDEO=y
86 87 CONFIG_DISPLAY=y
87 88 CONFIG_VIDEO_ROCKCHIP=y
configs/chromebook_minnie_defconfig
... ... @@ -81,6 +81,7 @@
81 81 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
82 82 CONFIG_USB_GADGET_DWC2_OTG=y
83 83 CONFIG_USB_STORAGE=y
  84 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
84 85 CONFIG_DM_VIDEO=y
85 86 CONFIG_DISPLAY=y
86 87 CONFIG_VIDEO_ROCKCHIP=y
configs/evb-rk3036_defconfig
... ... @@ -47,6 +47,7 @@
47 47 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
48 48 CONFIG_USB_GADGET_PRODUCT_NUM=0x310a
49 49 CONFIG_USB_GADGET_DWC2_OTG=y
  50 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
50 51 CONFIG_SPL_TINY_MEMSET=y
51 52 CONFIG_CMD_DHRYSTONE=y
52 53 CONFIG_ERRNO_STR=y
configs/evb-rk3229_defconfig
... ... @@ -52,5 +52,6 @@
52 52 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
53 53 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
54 54 CONFIG_USB_GADGET_DWC2_OTG=y
  55 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
55 56 CONFIG_ERRNO_STR=y
configs/evb-rk3288_defconfig
... ... @@ -72,6 +72,7 @@
72 72 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
73 73 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
74 74 CONFIG_USB_GADGET_DWC2_OTG=y
  75 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
75 76 CONFIG_DM_VIDEO=y
76 77 CONFIG_DISPLAY=y
77 78 CONFIG_VIDEO_ROCKCHIP=y
configs/fennec-rk3288_defconfig
... ... @@ -73,6 +73,7 @@
73 73 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
74 74 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
75 75 CONFIG_USB_GADGET_DWC2_OTG=y
  76 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
76 77 CONFIG_USB_HOST_ETHER=y
77 78 CONFIG_USB_ETHER_ASIX=y
78 79 CONFIG_USB_ETHER_SMSC95XX=y
configs/firefly-rk3288_defconfig
... ... @@ -79,6 +79,7 @@
79 79 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
80 80 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
81 81 CONFIG_USB_GADGET_DWC2_OTG=y
  82 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
82 83 CONFIG_USB_HOST_ETHER=y
83 84 CONFIG_USB_ETHER_ASIX=y
84 85 CONFIG_USB_ETHER_SMSC95XX=y
configs/kylin-rk3036_defconfig
... ... @@ -47,6 +47,7 @@
47 47 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
48 48 CONFIG_USB_GADGET_PRODUCT_NUM=0x310a
49 49 CONFIG_USB_GADGET_DWC2_OTG=y
  50 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
50 51 CONFIG_USB_HOST_ETHER=y
51 52 CONFIG_USB_ETHER_ASIX=y
52 53 CONFIG_USB_ETHER_SMSC95XX=y
configs/miqi-rk3288_defconfig
... ... @@ -73,6 +73,7 @@
73 73 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
74 74 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
75 75 CONFIG_USB_GADGET_DWC2_OTG=y
  76 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
76 77 CONFIG_USB_HOST_ETHER=y
77 78 CONFIG_USB_ETHER_ASIX=y
78 79 CONFIG_USB_ETHER_SMSC95XX=y
configs/parrot_r16_defconfig
... ... @@ -20,4 +20,5 @@
20 20 CONFIG_USB_EHCI_HCD=y
21 21 CONFIG_USB_MUSB_GADGET=y
22 22 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
  23 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
configs/phycore-rk3288_defconfig
... ... @@ -77,6 +77,7 @@
77 77 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
78 78 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
79 79 CONFIG_USB_GADGET_DWC2_OTG=y
  80 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
80 81 CONFIG_USB_HOST_ETHER=y
81 82 CONFIG_USB_ETHER_ASIX=y
82 83 CONFIG_USB_ETHER_SMSC95XX=y
configs/popmetal-rk3288_defconfig
... ... @@ -73,6 +73,7 @@
73 73 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
74 74 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
75 75 CONFIG_USB_GADGET_DWC2_OTG=y
  76 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
76 77 CONFIG_USB_HOST_ETHER=y
77 78 CONFIG_USB_ETHER_ASIX=y
78 79 CONFIG_USB_ETHER_SMSC95XX=y
configs/rock2_defconfig
... ... @@ -74,6 +74,7 @@
74 74 CONFIG_USB_GADGET_DWC2_OTG=y
75 75 CONFIG_USB_DWC2=y
76 76 CONFIG_USB_STORAGE=y
  77 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
77 78 CONFIG_DM_VIDEO=y
78 79 CONFIG_DISPLAY=y
79 80 CONFIG_VIDEO_ROCKCHIP=y
configs/tbs_a711_defconfig
... ... @@ -21,4 +21,5 @@
21 21 CONFIG_AXP_DCDC5_VOLT=1200
22 22 CONFIG_USB_EHCI_HCD=y
23 23 CONFIG_USB_MUSB_GADGET=y
  24 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
configs/tinker-rk3288_defconfig
... ... @@ -76,6 +76,7 @@
76 76 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
77 77 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
78 78 CONFIG_USB_GADGET_DWC2_OTG=y
  79 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
79 80 CONFIG_USB_HOST_ETHER=y
80 81 CONFIG_USB_ETHER_ASIX=y
81 82 CONFIG_USB_ETHER_SMSC95XX=y
configs/vyasa-rk3288_defconfig
... ... @@ -72,6 +72,7 @@
72 72 CONFIG_USB_GADGET_VENDOR_NUM=0x2207
73 73 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
74 74 CONFIG_USB_GADGET_DWC2_OTG=y
  75 +CONFIG_USB_FUNCTION_MASS_STORAGE=y
75 76 CONFIG_USB_HOST_ETHER=y
76 77 CONFIG_USB_ETHER_ASIX=y
77 78 CONFIG_USB_ETHER_SMSC95XX=y
drivers/usb/gadget/Kconfig
... ... @@ -127,6 +127,12 @@
127 127  
128 128 if USB_GADGET_DOWNLOAD
129 129  
  130 +config USB_FUNCTION_MASS_STORAGE
  131 + bool "Enable USB mass storage gadget"
  132 + help
  133 + Enable mass storage protocol support in U-Boot. It allows exporting
  134 + the eMMC/SD card content to HOST PC so it can be mounted.
  135 +
130 136 config USB_FUNCTION_ROCKUSB
131 137 bool "Enable USB rockusb gadget"
132 138 help
include/configs/advantech_dms-ba16.h
... ... @@ -57,7 +57,6 @@
57 57 #define CONFIG_MXC_USB_FLAGS 0
58 58  
59 59 #define CONFIG_USBD_HS
60   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
61 60  
62 61 /* Networking Configs */
63 62 #define CONFIG_FEC_MXC
include/configs/apalis_imx6.h
... ... @@ -97,7 +97,6 @@
97 97 #define CONFIG_USBD_HS
98 98  
99 99 #define CONFIG_USB_GADGET_MASS_STORAGE
100   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
101 100 /* USB DFU */
102 101 #define CONFIG_DFU_MMC
103 102  
include/configs/bav335x.h
... ... @@ -400,10 +400,6 @@
400 400 #define CONFIG_AM335X_USB1
401 401 #define CONFIG_AM335X_USB1_MODE MUSB_HOST
402 402  
403   -#ifdef CONFIG_USB_MUSB_GADGET
404   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
405   -#endif /* CONFIG_USB_MUSB_GADGET */
406   -
407 403 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
408 404 /* disable host part of MUSB in SPL */
409 405 /* disable EFI partitions and partition UUID support */
include/configs/cgtqmx6eval.h
... ... @@ -68,8 +68,6 @@
68 68  
69 69 #define CONFIG_USBD_HS
70 70  
71   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
72   -
73 71 /* Framebuffer */
74 72 #define CONFIG_VIDEO_IPUV3
75 73 #define CONFIG_VIDEO_BMP_RLE8
include/configs/colibri_imx6.h
... ... @@ -85,7 +85,6 @@
85 85 #define CONFIG_USBD_HS
86 86  
87 87 #define CONFIG_USB_GADGET_MASS_STORAGE
88   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
89 88 /* USB DFU */
90 89 #define CONFIG_DFU_MMC
91 90  
include/configs/colibri_imx7.h
... ... @@ -187,8 +187,6 @@
187 187  
188 188 #define CONFIG_USBD_HS
189 189  
190   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
191   -
192 190 /* USB Device Firmware Update support */
193 191 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
194 192 #define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/colibri_vf.h
... ... @@ -181,7 +181,6 @@
181 181 #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1024 * 1024)
182 182  
183 183 /* USB Storage */
184   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
185 184  
186 185 #endif /* __CONFIG_H */
include/configs/dh_imx6.h
... ... @@ -116,8 +116,6 @@
116 116  
117 117 /* USB Gadget (DFU, UMS) */
118 118 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
119   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
120   -
121 119 #define CONFIG_SYS_DFU_DATA_BUF_SIZE (16 * 1024 * 1024)
122 120 #define DFU_DEFAULT_POLL_TIMEOUT 300
123 121  
include/configs/exynos4-common.h
... ... @@ -33,8 +33,6 @@
33 33  
34 34 #define CONFIG_USB_GADGET_DWC2_OTG_PHY
35 35  
36   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
37   -
38 36 /* Common environment variables */
39 37 #define CONFIG_EXTRA_ENV_ITB \
40 38 "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \
include/configs/ge_bx50v3.h
... ... @@ -72,7 +72,6 @@
72 72  
73 73 #define CONFIG_USBD_HS
74 74 #define CONFIG_USB_GADGET_MASS_STORAGE
75   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
76 75 #endif
77 76  
78 77 /* Networking Configs */
include/configs/gw_ventana.h
... ... @@ -146,9 +146,6 @@
146 146 #define CONFIG_USBD_HS
147 147 #define CONFIG_NETCONSOLE
148 148  
149   -/* USB Mass Storage Gadget */
150   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
151   -
152 149 /* Framebuffer and LCD */
153 150 #define CONFIG_VIDEO_IPUV3
154 151 #define CONFIG_VIDEO_LOGO
include/configs/ma5d4evk.h
... ... @@ -100,7 +100,6 @@
100 100 #ifdef CONFIG_CMD_USB
101 101  
102 102 /* USB device */
103   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
104 103 #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 * 1024 * 1024)
105 104 #define DFU_DEFAULT_POLL_TIMEOUT 300
106 105 #endif
include/configs/mx6sabre_common.h
... ... @@ -210,8 +210,6 @@
210 210  
211 211 #ifndef CONFIG_SPL
212 212 #define CONFIG_USBD_HS
213   -
214   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
215 213 #endif
216 214  
217 215 #endif /* __MX6QSABRE_COMMON_CONFIG_H */
include/configs/mx7dsabresd.h
... ... @@ -220,8 +220,6 @@
220 220  
221 221 #define CONFIG_USBD_HS
222 222  
223   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
224   -
225 223 #ifdef CONFIG_VIDEO
226 224 #define CONFIG_VIDEO_MXS
227 225 #define CONFIG_VIDEO_LOGO
include/configs/nitrogen6x.h
... ... @@ -279,7 +279,5 @@
279 279 #define CONFIG_PCIE_IMX
280 280 #endif
281 281  
282   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
283   -
284 282 #endif /* __CONFIG_H */
include/configs/odroid_xu3.h
... ... @@ -51,7 +51,6 @@
51 51 /* UMS */
52 52 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
53 53 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
54   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
55 54  
56 55 /* FIXME: MUST BE REMOVED AFTER TMU IS TURNED ON */
57 56 #undef CONFIG_EXYNOS_TMU
include/configs/opos6uldev.h
... ... @@ -49,7 +49,6 @@
49 49 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
50 50 #define CONFIG_MXC_USB_FLAGS 0
51 51 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
52   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
53 52 #endif
54 53  
55 54 /* Ethernet */
include/configs/pico-imx6ul.h
... ... @@ -42,8 +42,6 @@
42 42  
43 43 #define CONFIG_USBD_HS
44 44  
45   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
46   -
47 45 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
48 46 #define DFU_DEFAULT_POLL_TIMEOUT 300
49 47  
include/configs/pico-imx7d.h
... ... @@ -136,7 +136,5 @@
136 136  
137 137 #define CONFIG_IMX_THERMAL
138 138  
139   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
140   -
141 139 #endif
include/configs/rk3036_common.h
... ... @@ -47,7 +47,6 @@
47 47 /* usb otg */
48 48  
49 49 /* usb mass storage */
50   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
51 50 #define CONFIG_CMD_USB_MASS_STORAGE
52 51  
53 52 /* usb host */
include/configs/rk3128_common.h
... ... @@ -47,7 +47,6 @@
47 47 #ifndef CONFIG_SPL_BUILD
48 48  
49 49 /* usb mass storage */
50   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
51 50  
52 51 #define ENV_MEM_LAYOUT_SETTINGS \
53 52 "scriptaddr=0x60500000\0" \
include/configs/rk322x_common.h
... ... @@ -41,7 +41,6 @@
41 41 /* usb otg */
42 42  
43 43 /* usb mass storage */
44   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
45 44 #define CONFIG_CMD_USB_MASS_STORAGE
46 45  
47 46 /* usb host */
include/configs/rk3288_common.h
... ... @@ -60,7 +60,6 @@
60 60 /* usb otg */
61 61  
62 62 /* usb mass storage */
63   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
64 63 #define CONFIG_CMD_USB_MASS_STORAGE
65 64  
66 65 /* usb host support */
include/configs/s5p_goni.h
... ... @@ -187,7 +187,6 @@
187 187 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000)
188 188  
189 189 #define CONFIG_USB_GADGET_DWC2_OTG_PHY
190   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
191 190  
192 191 #endif /* __CONFIG_H */
include/configs/socfpga_common.h
... ... @@ -210,8 +210,6 @@
210 210 * USB Gadget (DFU, UMS)
211 211 */
212 212 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
213   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
214   -
215 213 #define CONFIG_SYS_DFU_DATA_BUF_SIZE (16 * 1024 * 1024)
216 214 #define DFU_DEFAULT_POLL_TIMEOUT 300
217 215  
include/configs/sunxi-common.h
... ... @@ -312,10 +312,6 @@
312 312 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
313 313 #endif
314 314  
315   -#ifdef CONFIG_USB_MUSB_GADGET
316   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
317   -#endif
318   -
319 315 #ifdef CONFIG_USB_FUNCTION_MASS_STORAGE
320 316 #endif
321 317  
include/configs/tbs2910.h
... ... @@ -91,7 +91,6 @@
91 91 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
92 92 #ifdef CONFIG_CMD_USB_MASS_STORAGE
93 93 #define CONFIG_USBD_HS
94   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
95 94 #endif /* CONFIG_CMD_USB_MASS_STORAGE */
96 95 #ifdef CONFIG_USB_KEYBOARD
97 96 #define CONFIG_PREBOOT \
include/configs/tegra-common-usb-gadget.h
... ... @@ -13,8 +13,6 @@
13 13 #ifndef CONFIG_TEGRA20
14 14 #define CONFIG_CI_UDC_HAS_HOSTPC
15 15 #endif
16   -/* USB mass storage protocol */
17   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
18 16 /* DFU protocol */
19 17 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_1M
20 18 #define CONFIG_SYS_DFU_MAX_FILE_SIZE SZ_32M
include/configs/warp.h
... ... @@ -64,8 +64,6 @@
64 64  
65 65 #define CONFIG_USBD_HS
66 66  
67   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
68   -
69 67 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
70 68 #define DFU_DEFAULT_POLL_TIMEOUT 300
71 69  
include/configs/warp7.h
... ... @@ -130,8 +130,6 @@
130 130  
131 131 #define CONFIG_USBD_HS
132 132  
133   -#define CONFIG_USB_FUNCTION_MASS_STORAGE
134   -
135 133 /* USB Device Firmware Update support */
136 134 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
137 135 #define DFU_DEFAULT_POLL_TIMEOUT 300