| Message ID | 20180129182554.12907-1-lukma@denx.de |
|---|---|
| State | Accepted |
| Commit | 4f60e5d3a82f7061d235c28eb3451b612fae43b5 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,1/4] Kconfig: usb: Sort USB_FUNCTION_* entries | expand |
Hi, On Mon, Jan 29, 2018 at 07:25:54PM +0100, Lukasz Majewski wrote: > This commit moves USB_FUNCTION_MASS_STORAGE config to Kconfig. > > Signed-off-by: Lukasz Majewski <lukma@denx.de> > --- > > configs/Bananapi_m2m_defconfig | 1 + > configs/CHIP_pro_defconfig | 1 + > configs/Nintendo_NES_Classic_Edition_defconfig | 1 + > configs/Sinlinx_SinA33_defconfig | 1 + Please make that a default for sunxi instead of crippling our defconfigs. Thanks! Maxime
On 01/30/2018 03:25 AM, Lukasz Majewski wrote: > 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> Best Regards, Jaehoon Chung > --- > > configs/Bananapi_m2m_defconfig | 1 + > configs/CHIP_pro_defconfig | 1 + > configs/Nintendo_NES_Classic_Edition_defconfig | 1 + > configs/Sinlinx_SinA33_defconfig | 1 +
Hi Maxime, > Hi, > > On Mon, Jan 29, 2018 at 07:25:54PM +0100, Lukasz Majewski wrote: > > This commit moves USB_FUNCTION_MASS_STORAGE config to Kconfig. > > > > Signed-off-by: Lukasz Majewski <lukma@denx.de> > > --- > > > > configs/Bananapi_m2m_defconfig | 1 + > > configs/CHIP_pro_defconfig | 1 + > > configs/Nintendo_NES_Classic_Edition_defconfig | 1 + > > configs/Sinlinx_SinA33_defconfig | 1 + > > Please make that a default for sunxi instead of crippling our > defconfigs. Could you be more specific here? I've used moveconfig.py script to check which board has this define in its *.h config file. Then, it was moved to proper defconfig for this board. Hence, I don't understand why I "cripple" your (sunxi) defconfig(s)? If this is the case - I can "select" this option for all sunxi devices, so all of them would have UMS function enabled. Is this the case here? > > Thanks! > Maxime > Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
On Tue, Jan 30, 2018 at 10:08:50AM +0100, Lukasz Majewski wrote: > Hi Maxime, > > > Hi, > > > > On Mon, Jan 29, 2018 at 07:25:54PM +0100, Lukasz Majewski wrote: > > > This commit moves USB_FUNCTION_MASS_STORAGE config to Kconfig. > > > > > > Signed-off-by: Lukasz Majewski <lukma@denx.de> > > > --- > > > > > > configs/Bananapi_m2m_defconfig | 1 + > > > configs/CHIP_pro_defconfig | 1 + > > > configs/Nintendo_NES_Classic_Edition_defconfig | 1 + > > > configs/Sinlinx_SinA33_defconfig | 1 + > > > > Please make that a default for sunxi instead of crippling our > > defconfigs. > > Could you be more specific here? Add an equivalent to the #ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_FUNCTION_MASS_STORAGE #endif That was there before, and isn't there anymore. Something like default y if ARCH_SUNXI && USB_MUSB_GADGET > I've used moveconfig.py script to check which board has this define in > its *.h config file. > Then, it was moved to proper defconfig for this board. > > Hence, I don't understand why I "cripple" your (sunxi) defconfig(s)? > > If this is the case - I can "select" this option for all sunxi devices, > so all of them would have UMS function enabled. We're always trying to keep the defconfig as free of boilerplate as possible, since we have so many of them. And people just keep adding more and more and more boilerplate options, that's all... Maxime
On Mon, Jan 29, 2018 at 07:25:54PM +0100, Lukasz Majewski wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/configs/Bananapi_m2m_defconfig b/configs/Bananapi_m2m_defconfig index cb1edcf2ccc3..543fd01a287f 100644 --- 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 02e79b5bb510..3b3a316721a4 100644 --- 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 b9e553e0a5c4..fbaeb2ea7770 100644 --- 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 9e2d9e21639b..41ea4aa86ec9 100644 --- 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 b35081145fab..98e602bf56f6 100644 --- 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 f80faaeff8f0..f7d193f41000 100644 --- 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 ff94a4d74f4f..7af708d25672 100644 --- 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 783683aa4567..282b81d47560 100644 --- 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 39469b4d403e..0afd2b2e8bb6 100644 --- 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 09a884472ff7..5574ff0653d8 100644 --- 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 9ae1b33828c8..328edb17cddb 100644 --- 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 3a0bd7939e38..34985dd2e5c0 100644 --- 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 7af01e26d53f..3433e3b0648c 100644 --- 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 3a5ec2d246f9..532c56c2f466 100644 --- 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 c3e61784ac7c..a6e92cc9e77c 100644 --- 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 969b0e686868..bc6c02c8724b 100644 --- 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 94f4979ba6af..587fc9f89bf6 100644 --- 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 0a95e6aac5c5..242b8d51eba3 100644 --- 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 03deae084e90..95d616e9c974 100644 --- 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 a0df3fd401ba..3acc98daa0ca 100644 --- 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 5d8fa228c579..af3274237ad4 100644 --- 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 0d99d84458b6..6825e6b5434f 100644 --- 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 f370fe5b7814..1c2dee7ee23c 100644 --- 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 c4e93562b5fc..18218c164d30 100644 --- 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 d084af8ada5b..930066c14981 100644 --- 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 b50535f9b06b..f49302603ca5 100644 --- 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 7d2c3d6b6506..823034f4d850 100644 --- 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 04036c87fd35..8030ca69e762 100644 --- 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 c7a34c2c7652..23de41d1fab4 100644 --- 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 fb49997ebd3a..1f26ef4f8f5c 100644 --- 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 3b70ff64f82c..996dbed99dff 100644 --- 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 1454577dbfc4..694aa8ae769b 100644 --- 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 068962d61354..d2944b5db29e 100644 --- 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 5ecc97fbe778..3ddfc0957f5d 100644 --- 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 f083dc8a93ff..207c05ab9db1 100644 --- 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 593bf38d7e93..fd39f221ac16 100644 --- 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 8e0d6df93d5c..57cdfd4e2b17 100644 --- 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 ca46b61204fb..c55ae521c2af 100644 --- 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 04fc602ce44a..24e1f80474d1 100644 --- 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 f821b67c72bd..62feb224ac79 100644 --- 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 793ba78c7b45..ee4836359068 100644 --- 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 3a2bf339b180..14da6245063f 100644 --- 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 8889046f2b2a..9e204070538b 100644 --- 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 b22169d163a2..d1ba52aaa6f5 100644 --- 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 c2bd378437eb..079e3a6a3476 100644 --- 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 852eb6406303..b80fdc31ce4a 100644 --- 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 d343a6ec0a32..bbc1f3de9b1c 100644 --- 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 9b3944ad1309..542f7f5df90a 100644 --- 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 3a3bab0fea91..abd0e1862f11 100644 --- 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 58a5a300f31c..502ba7d8f211 100644 --- 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 139cde4d113f..77af0d46e7af 100644 --- 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 11f1bc3eab75..fe96988be7bd 100644 --- 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
This commit moves USB_FUNCTION_MASS_STORAGE config to Kconfig. Signed-off-by: Lukasz Majewski <lukma@denx.de> --- configs/Bananapi_m2m_defconfig | 1 + configs/CHIP_pro_defconfig | 1 + configs/Nintendo_NES_Classic_Edition_defconfig | 1 + configs/Sinlinx_SinA33_defconfig | 1 + configs/chromebit_mickey_defconfig | 1 + configs/chromebook_jerry_defconfig | 1 + configs/chromebook_minnie_defconfig | 1 + configs/evb-rk3036_defconfig | 1 + configs/evb-rk3229_defconfig | 1 + configs/evb-rk3288_defconfig | 1 + configs/fennec-rk3288_defconfig | 1 + configs/firefly-rk3288_defconfig | 1 + configs/kylin-rk3036_defconfig | 1 + configs/miqi-rk3288_defconfig | 1 + configs/parrot_r16_defconfig | 1 + configs/phycore-rk3288_defconfig | 1 + configs/popmetal-rk3288_defconfig | 1 + configs/rock2_defconfig | 1 + configs/tbs_a711_defconfig | 1 + configs/tinker-rk3288_defconfig | 1 + configs/vyasa-rk3288_defconfig | 1 + drivers/usb/gadget/Kconfig | 6 ++++++ include/configs/advantech_dms-ba16.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/bav335x.h | 4 ---- include/configs/cgtqmx6eval.h | 2 -- include/configs/colibri_imx6.h | 1 - include/configs/colibri_imx7.h | 2 -- include/configs/colibri_vf.h | 1 - include/configs/dh_imx6.h | 2 -- include/configs/exynos4-common.h | 2 -- include/configs/ge_bx50v3.h | 1 - include/configs/gw_ventana.h | 3 --- include/configs/ma5d4evk.h | 1 - include/configs/mx6sabre_common.h | 2 -- include/configs/mx7dsabresd.h | 2 -- include/configs/nitrogen6x.h | 2 -- include/configs/odroid_xu3.h | 1 - include/configs/opos6uldev.h | 1 - include/configs/pico-imx6ul.h | 2 -- include/configs/pico-imx7d.h | 2 -- include/configs/rk3036_common.h | 1 - include/configs/rk3128_common.h | 1 - include/configs/rk322x_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/socfpga_common.h | 2 -- include/configs/sunxi-common.h | 4 ---- include/configs/tbs2910.h | 1 - include/configs/tegra-common-usb-gadget.h | 2 -- include/configs/warp.h | 2 -- include/configs/warp7.h | 2 -- 52 files changed, 27 insertions(+), 51 deletions(-)