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>

diff --git a/configs/Bananapi_m2m_defconfig b/configs/Bananapi_m2m_defconfig
index cb1edcf2ccc32859ad2f3acfa7684b41a2eb40c4..543fd01a287f3f652a1b7208f2229e328987fb51 100644 (file)
--- a/configs/Bananapi_m2m_defconfig
+++ b/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

diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
index 02e79b5bb510a289061e9840dd4f6c0161f88f1b..3b3a316721a42fb15b906802d4bb217e13b68b3b 100644 (file)
--- a/configs/CHIP_pro_defconfig
+++ b/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

diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig
index b9e553e0a5c4ec3c6c450c9bd2fc9a5505b354ce..fbaeb2ea7770b68d3445dbedbdf9e18b6afb6be5 100644 (file)
--- a/configs/Nintendo_NES_Classic_Edition_defconfig
+++ b/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

diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
index 9e2d9e21639bf5b853f78eb76c2c9f57ab560089..41ea4aa86ec9743447e4a089cdf9c36308391f1e 100644 (file)
--- a/configs/Sinlinx_SinA33_defconfig
+++ b/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

diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
index b35081145faba7a9647031efbbb71bdd87f40040..98e602bf56f6643812f39abcd32bb558e4b1ba68 100644 (file)
--- a/configs/chromebit_mickey_defconfig
+++ b/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

diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index f80faaeff8f086609a75d89ddc9221ef11bb1110..f7d193f41000b74e38bce4f5defc2bf8d356680b 100644 (file)
--- a/configs/chromebook_jerry_defconfig
+++ b/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

diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
index ff94a4d74f4fe2695513b03835fa7157718b9a53..7af708d25672017f20156cfe25fc8a9b97bb87dc 100644 (file)
--- a/configs/chromebook_minnie_defconfig
+++ b/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

diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig
index 783683aa4567d644c1b8110e02fcd7e9df96a257..282b81d47560df151c6f5a5526786b949b37d603 100644 (file)
--- a/configs/evb-rk3036_defconfig
+++ b/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

diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig
index 39469b4d403edf5496a347d6b0da4a7e02682395..0afd2b2e8bb6d7443d65e2948ce9a9b255a15105 100644 (file)
--- a/configs/evb-rk3229_defconfig
+++ b/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

diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
index 09a884472ff727137295b9951a899c5c1f06e318..5574ff0653d87d0883d75f67d7cb8d221c7e64d8 100644 (file)
--- a/configs/evb-rk3288_defconfig
+++ b/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

diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
index 9ae1b33828c8204a8bf9f7f5717a876b0c7f0b89..328edb17cddb9d10a8ea9a48f689a80170797d8e 100644 (file)
--- a/configs/fennec-rk3288_defconfig
+++ b/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

diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
index 3a0bd7939e38815f32f62d829c9ac7ad9bbf44dd..34985dd2e5c02aea9b0a3adbdfc3c6aa4fbd7a4a 100644 (file)
--- a/configs/firefly-rk3288_defconfig
+++ b/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

diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
index 7af01e26d53ffe2d0de7574135565742050b9487..3433e3b0648c03e1a8c5e06d7f00142bd0e34641 100644 (file)
--- a/configs/kylin-rk3036_defconfig
+++ b/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

diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
index 3a5ec2d246f91972d169a62b9234929fdddc1e63..532c56c2f466f933f8a3fbcc6c38f19315379974 100644 (file)
--- a/configs/miqi-rk3288_defconfig
+++ b/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

diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig
index c3e61784ac7c38c582ce93286439172db884a837..a6e92cc9e77cfa319e640c97d3e62db74dd8618e 100644 (file)
--- a/configs/parrot_r16_defconfig
+++ b/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

diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig
index 969b0e68686845f7f06a289f66c3e0cf18f31db3..bc6c02c8724b846ecd194b10a3afe0e18ff9e983 100644 (file)
--- a/configs/phycore-rk3288_defconfig
+++ b/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

diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
index 94f4979ba6af12db02d8f6953b3737cbf4bdc94a..587fc9f89bf634c1d0d302767639b5f5491c0edd 100644 (file)
--- a/configs/popmetal-rk3288_defconfig
+++ b/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

diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index 0a95e6aac5c59fc3e73cbd94f2e1ecd90b2b7ccd..242b8d51eba3140345d642c9dd5483ab6d33393c 100644 (file)
--- a/configs/rock2_defconfig
+++ b/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

diff --git a/configs/tbs_a711_defconfig b/configs/tbs_a711_defconfig
index 03deae084e90ccf9fff03233353701113233de27..95d616e9c974196a7b09c464c7fbc52b248c9cbe 100644 (file)
--- a/configs/tbs_a711_defconfig
+++ b/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

diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
index a0df3fd401bafef25fa98c0e00f3f066a362e537..3acc98daa0cae019f24b61c4333a33fc35b1ed63 100644 (file)
--- a/configs/tinker-rk3288_defconfig
+++ b/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

diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig
index 5d8fa228c579eb3c470c0251397e347008157c72..af3274237ad439c0b54a76c01f43a87d3a24de48 100644 (file)
--- a/configs/vyasa-rk3288_defconfig
+++ b/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

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 0d99d84458b66d2c131d079aa045da9b60710625..6825e6b5434f4b7e844f5b804c5e24a893dd1d2e 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/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

diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index f370fe5b7814f350d4f9db930941b3363cff5bea..1c2dee7ee23c756a66dd17de9ec9dcb55dada00f 100644 (file)
--- a/include/configs/advantech_dms-ba16.h
+++ b/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

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index c4e93562b5fca24c30aeb7e6f0b48267885190b9..18218c164d30fdff8ed4a0b37e88f892f1b84c60 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/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
 

diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index d084af8ada5ba39bf55e6bd1efd03e29a5abf158..930066c149819d18a6061187e7e9a9ddc8317235 100644 (file)
--- a/include/configs/bav335x.h
+++ b/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 */

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index b50535f9b06b65c161e02f85f8ac7eb53c9016be..f49302603ca527ed45fce02397842157f801399f 100644 (file)
--- a/include/configs/cgtqmx6eval.h
+++ b/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

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 7d2c3d6b650657a0f8b89e8d096795e44636f75b..823034f4d850da64b733f7c29b901ef96860ff72 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/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
 

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 04036c87fd35c9c096e6e697fb03c11c9f8596a5..8030ca69e762ee8ec24687b52b86839205b1d4a2 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/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

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index c7a34c2c7652b6a1587041cb875f2323fc3f5e28..23de41d1fab4fc04f9e857d0be1f92f7dcf8ace6 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/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 */

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index fb49997ebd3aed87fe663f24c048b1113b5d46cd..1f26ef4f8f5c2cd26ebae957e9929e49d7c1201d 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/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
 

diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index 3b70ff64f82cf55da987d805788f1844bd3407f2..996dbed99dff65572a5f1561e92c8124e0992f48 100644 (file)
--- a/include/configs/exynos4-common.h
+++ b/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} " \

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 1454577dbfc49eaa320e08cd3fede8f7e5e31e17..694aa8ae769b77e4aa5f2193132a827a7c11a09f 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/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 */

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 068962d6135405da53f77fdf044e4199e218b658..d2944b5db29eaff0434d7641e1744d66f22d3e3a 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/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

diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index 5ecc97fbe778849dc127ff6dc667ce7664f2da37..3ddfc0957f5dd1ce37cabcf8b7fd9405730f0ea8 100644 (file)
--- a/include/configs/ma5d4evk.h
+++ b/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

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index f083dc8a93ff8352510c940582362ece4a849b4c..207c05ab9db19c4b0f03b1eea2808ebe4d1a3834 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/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 */

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 593bf38d7e93d66e4a5d8ff3a41d820f23c3f761..fd39f221ac163e588dfe9eae6bdb1e850d6102fd 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/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

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 8e0d6df93d5c9e2c76ce26fe9c28d2db3bc73a36..57cdfd4e2b177ffe0533d541a28082ce32de60d5 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -279,6 +279,4 @@
 #define CONFIG_PCIE_IMX
 #endif
 
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 #endif        /* __CONFIG_H */

diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index ca46b61204fb6ac7321f08673aa3909ee59aa614..c55ae521c2aff7ee3d0776e52a6eed0656f72684 100644 (file)
--- a/include/configs/odroid_xu3.h
+++ b/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

diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 04fc602ce44aed501f6aa2a4b83c4192b3598fc0..24e1f80474d10b5625a5ebae9604534113e1b1bc 100644 (file)
--- a/include/configs/opos6uldev.h
+++ b/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 */

diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index f821b67c72bd989a921398f4a504285ac6915bc0..62feb224ac790078efbcedbede89511b7bc93d21 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/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
 

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 793ba78c7b450715181dc4664f6a687da7200e7a..ee4836359068f108519a7933010484bcd6944f83 100644 (file)
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -136,6 +136,4 @@
 
 #define CONFIG_IMX_THERMAL
 
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 #endif

diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index 3a2bf339b1803c428b469d741dab6f3aac7f10fd..14da6245063f309891523fe64407608c444f0f1f 100644 (file)
--- a/include/configs/rk3036_common.h
+++ b/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 */

diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index 8889046f2b2a2e743e3a90740ac1708ecc45f1ae..9e204070538b554e86214372e6d22e0551a7b5d1 100644 (file)
--- a/include/configs/rk3128_common.h
+++ b/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" \

diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index b22169d163a2f7a93a8547856573c3dc5021ac10..d1ba52aaa6f51ac8ca972c54b0e4c71a0a29adbe 100644 (file)
--- a/include/configs/rk322x_common.h
+++ b/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 */

diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index c2bd378437eb701655009e2ff73e4e1bf510486f..079e3a6a3476b257155116bca977cad3a5e2edd9 100644 (file)
--- a/include/configs/rk3288_common.h
+++ b/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 */

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 852eb640630317dc29382c5d98d75a831073da26..b80fdc31ce4ace786b16ee5fa1ce56ee2fcdfd9b 100644 (file)
--- a/include/configs/s5p_goni.h
+++ b/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 */

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index d343a6ec0a32907ac85c608a1515c2c44f7a9635..bbc1f3de9b1c3db59e4d0f27d3e1b39e97aa909b 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/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
 

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 9b3944ad1309b7afb534b26af1a3d95be657d912..542f7f5df90a87430cedcb6c9aea1cf12763f244 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/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
 

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 3a3bab0fea91ef48a3ccb34638ef09d83ad93b10..abd0e1862f112ed28fadce6c4758e946662dbe2e 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/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 \

diff --git a/include/configs/tegra-common-usb-gadget.h b/include/configs/tegra-common-usb-gadget.h
index 58a5a300f31cdea00b7869f97d007003be06aebf..502ba7d8f2116c878742cbbda2db80cacd0ed4ae 100644 (file)
--- a/include/configs/tegra-common-usb-gadget.h
+++ b/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

diff --git a/include/configs/warp.h b/include/configs/warp.h
index 139cde4d113fde153570f9e478a73ddb6e62f9a6..77af0d46e7af548cae9607fa7979351750682a45 100644 (file)
--- a/include/configs/warp.h
+++ b/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
 

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 11f1bc3eab75c9f3f95416da5c5dae387e8593eb..fe96988be7bd2ac220a9924dcbf504adeff716c3 100644 (file)
--- a/include/configs/warp7.h
+++ b/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