Message ID | 1501068179-56229-4-git-send-email-philipp.tomsich@theobroma-systems.com |
---|---|
State | Changes Requested |
Delegated to: | Lukasz Majewski |
Headers | show |
On Wed, Jul 26, 2017 at 01:22:59PM +0200, Philipp Tomsich wrote: > With both an imply from CMD_USB to USB_FUNCTION_MASS_STORAGE and with > USB_FUNCTION_MASS_STORAGE moved to Kconfig, we can now run moveconfig. > > Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Tom Rini <trini@konsulko.com>
On 26 July 2017 at 05:22, Philipp Tomsich <philipp.tomsich@theobroma-systems.com> wrote: > With both an imply from CMD_USB to USB_FUNCTION_MASS_STORAGE and with > USB_FUNCTION_MASS_STORAGE moved to Kconfig, we can now run moveconfig. > > Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > --- > > Changes in v3: None > Changes in v2: None > > configs/CHIP_pro_defconfig | 1 + > configs/Nintendo_NES_Classic_Edition_defconfig | 1 + > configs/Sinlinx_SinA33_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 | 2 +- > configs/popmetal-rk3288_defconfig | 1 + > configs/smdkv310_defconfig | 1 + > configs/tinker-rk3288_defconfig | 1 + > 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/exynos4-common.h | 2 -- > include/configs/ge_bx50v3.h | 1 - > include/configs/gw_ventana.h | 1 - > 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 | 1 - > include/configs/pico-imx7d.h | 2 -- > include/configs/rk3036_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 | 1 - > include/configs/tbs2910.h | 1 - > include/configs/tegra-common-usb-gadget.h | 1 - > include/configs/warp.h | 2 -- > include/configs/warp7.h | 2 -- > scripts/config_whitelist.txt | 1 - > 41 files changed, 12 insertions(+), 43 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
Hi Philipp, > On 26 July 2017 at 05:22, Philipp Tomsich > <philipp.tomsich@theobroma-systems.com> wrote: >> With both an imply from CMD_USB to USB_FUNCTION_MASS_STORAGE and with >> USB_FUNCTION_MASS_STORAGE moved to Kconfig, we can now run moveconfig. >> >> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> >> --- >> >> Changes in v3: None >> Changes in v2: None >> >> configs/CHIP_pro_defconfig | 1 + >> configs/Nintendo_NES_Classic_Edition_defconfig | 1 + >> configs/Sinlinx_SinA33_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 | 2 +- >> configs/popmetal-rk3288_defconfig | 1 + >> configs/smdkv310_defconfig | 1 + >> configs/tinker-rk3288_defconfig | 1 + >> 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/exynos4-common.h | 2 -- >> include/configs/ge_bx50v3.h | 1 - >> include/configs/gw_ventana.h | 1 - >> 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 | 1 - >> include/configs/pico-imx7d.h | 2 -- >> include/configs/rk3036_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 | 1 - >> include/configs/tbs2910.h | 1 - >> include/configs/tegra-common-usb-gadget.h | 1 - >> include/configs/warp.h | 2 -- >> include/configs/warp7.h | 2 -- >> scripts/config_whitelist.txt | 1 - >> 41 files changed, 12 insertions(+), 43 deletions(-) >> > > Reviewed-by: Simon Glass <sjg@chromium.org> > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot > This patch does not apply clearly on the u-boot-usb/master branch (the firefly-rk3288_defconfig and configs/kylin-rk3036_defconfig causes problem). Philipp, would you be so kind and rebase this patch on top of u-boot-usb/master ?
diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig index f9033bc..b68f1b8 100644 --- a/configs/CHIP_pro_defconfig +++ b/configs/CHIP_pro_defconfig @@ -26,6 +26,7 @@ CONFIG_AXP_ALDO4_VOLT=3300 CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Allwinner Technology" CONFIG_G_DNL_VENDOR_NUM=0x1f3a diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig index f9d8da1..afa5a22 100644 --- a/configs/Nintendo_NES_Classic_Edition_defconfig +++ b/configs/Nintendo_NES_Classic_Edition_defconfig @@ -22,6 +22,7 @@ CONFIG_AXP_DLDO1_VOLT=3300 CONFIG_AXP_ELDO2_VOLT=1800 CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Allwinner Technology" CONFIG_G_DNL_VENDOR_NUM=0x1f3a diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig index d1b5b22..bf99dde 100644 --- a/configs/Sinlinx_SinA33_defconfig +++ b/configs/Sinlinx_SinA33_defconfig @@ -25,6 +25,7 @@ CONFIG_DFU_RAM=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Allwinner Technology" CONFIG_G_DNL_VENDOR_NUM=0x1f3a diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig index 9d2b319..0b44fe9 100644 --- a/configs/fennec-rk3288_defconfig +++ b/configs/fennec-rk3288_defconfig @@ -65,6 +65,7 @@ CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y +CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 3b605f4..d1a0a43 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -68,6 +68,7 @@ CONFIG_SYSRESET=y CONFIG_USB=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/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig index c0faf85..7ff10d8 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -36,5 +36,6 @@ CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y +CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig index a7c796d..58d89df 100644 --- a/configs/miqi-rk3288_defconfig +++ b/configs/miqi-rk3288_defconfig @@ -65,6 +65,7 @@ CONFIG_SYSRESET=y CONFIG_USB=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/parrot_r16_defconfig b/configs/parrot_r16_defconfig index 76e4e34..e66b00a 100644 --- a/configs/parrot_r16_defconfig +++ b/configs/parrot_r16_defconfig @@ -21,6 +21,7 @@ CONFIG_SPL=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Allwinner Technology" CONFIG_G_DNL_VENDOR_NUM=0x1f3a diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig index 618d983..0ec8f49 100644 --- a/configs/phycore-rk3288_defconfig +++ b/configs/phycore-rk3288_defconfig @@ -2,7 +2,6 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3288=y -CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y CONFIG_TARGET_PHYCORE_RK3288=y CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-phycore-rdk" @@ -66,6 +65,7 @@ CONFIG_SYS_NS16550=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig index cfa2205..77fdc77 100644 --- a/configs/popmetal-rk3288_defconfig +++ b/configs/popmetal-rk3288_defconfig @@ -65,6 +65,7 @@ CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y +CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig index 5e9f181..0843c55 100644 --- a/configs/smdkv310_defconfig +++ b/configs/smdkv310_defconfig @@ -31,3 +31,4 @@ CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_S5P=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_USB_FUNCTION_MASS_STORAGE=y diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig index be93799..09caed9 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -68,6 +68,7 @@ CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y +CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 22a4e69..bd19f11 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -61,7 +61,6 @@ #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP #define CONFIG_USBD_HS -#define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_USB_GADGET_VBUS_DRAW 2 /* Networking Configs */ diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 4a12ac8..c2f937b 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -109,7 +109,6 @@ #define CONFIG_USBD_HS #define CONFIG_USB_GADGET_MASS_STORAGE -#define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_G_DNL_MANUFACTURER "Toradex" /* USB DFU */ #define CONFIG_DFU_MMC diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index fafab8e..b3d5830 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -435,10 +435,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 #endif -#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 b36cbb9..352c509 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -71,8 +71,6 @@ #define CONFIG_USBD_HS -#define CONFIG_USB_FUNCTION_MASS_STORAGE - #define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_CMD_FASTBOOT #define CONFIG_ANDROID_BOOT_IMAGE diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 5f73867..a3335a1 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -94,7 +94,6 @@ #define CONFIG_USBD_HS #define CONFIG_USB_GADGET_MASS_STORAGE -#define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_G_DNL_MANUFACTURER "Toradex" /* USB DFU */ #define CONFIG_DFU_MMC diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 8aca89d..df8ee2d 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -198,8 +198,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 72e3ea7..f00d16e 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -193,6 +193,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/exynos4-common.h b/include/configs/exynos4-common.h index c995f35..a563b8f 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -39,8 +39,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 5e04dd2..92a1610 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -79,7 +79,6 @@ #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_MASS_STORAGE -#define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_G_DNL_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index ff2b9c6..410f0db 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -161,7 +161,6 @@ #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP /* USB Mass Storage Gadget */ -#define CONFIG_USB_FUNCTION_MASS_STORAGE /* Framebuffer and LCD */ #define CONFIG_VIDEO_IPUV3 diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index 7c28a94..b750d28 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -101,7 +101,6 @@ #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_MANUFACTURER "AriesEmbedded" -#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 b3638d5..bdf1b39 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -217,8 +217,6 @@ #ifndef CONFIG_SPL #define CONFIG_USBD_HS -#define CONFIG_USB_FUNCTION_MASS_STORAGE - #define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_CMD_FASTBOOT #define CONFIG_ANDROID_BOOT_IMAGE diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 4345332..f3dccb5 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -226,8 +226,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 a1a0cda..b3c3962 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -292,8 +292,6 @@ #define CONFIG_PCIE_IMX #endif -#define CONFIG_USB_FUNCTION_MASS_STORAGE - #define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_CMD_FASTBOOT #define CONFIG_ANDROID_BOOT_IMAGE diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 697f8d2..9e3d55e 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -53,7 +53,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 9b96cd0..3adde43 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -48,7 +48,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 7b44752..f2554e8 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -44,7 +44,6 @@ #define CONFIG_USBD_HS -#define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index e623f48..0aebb1d 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -137,6 +137,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 43fece6..b411cc6 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -61,7 +61,6 @@ #define CONFIG_FASTBOOT_BUF_SIZE 0x08000000 /* usb mass storage */ -#define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_GADGET_DOWNLOAD diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index a145b74..b359d75 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -55,7 +55,6 @@ #define CONFIG_FASTBOOT_BUF_SIZE 0x08000000 /* usb mass storage */ -#define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_GADGET_DOWNLOAD diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 488d679..1ef7f01 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -71,7 +71,6 @@ #define CONFIG_FASTBOOT_BUF_SIZE 0x08000000 /* usb mass storage */ -#define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_GADGET_DOWNLOAD diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 9c00138..7184a26 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -215,6 +215,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 7e63b55..83dad3a 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -228,8 +228,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 681c91c..c2b8734 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -318,7 +318,6 @@ extern int soft_i2c_gpio_scl; #ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_FUNCTION_FASTBOOT -#define CONFIG_USB_FUNCTION_MASS_STORAGE #endif #ifdef CONFIG_USB_FUNCTION_FASTBOOT diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 4baccdc..e075b73 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -96,7 +96,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_SYS_USB_EVENT_POLL_VIA_INT_QUEUE diff --git a/include/configs/tegra-common-usb-gadget.h b/include/configs/tegra-common-usb-gadget.h index 58a5a30..82e2350 100644 --- a/include/configs/tegra-common-usb-gadget.h +++ b/include/configs/tegra-common-usb-gadget.h @@ -14,7 +14,6 @@ #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 139cde4..77af0d4 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 75ae8a3..db8e818 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 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2d642de..da9d572 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -5134,7 +5134,6 @@ CONFIG_USB_ETH_SUBSET CONFIG_USB_EXT2_BOOT CONFIG_USB_FAT_BOOT CONFIG_USB_FREQ -CONFIG_USB_FUNCTION_MASS_STORAGE CONFIG_USB_FUNCTION_THOR CONFIG_USB_GADGET_AMD5536UDC CONFIG_USB_GADGET_AT91
With both an imply from CMD_USB to USB_FUNCTION_MASS_STORAGE and with USB_FUNCTION_MASS_STORAGE moved to Kconfig, we can now run moveconfig. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> --- Changes in v3: None Changes in v2: None configs/CHIP_pro_defconfig | 1 + configs/Nintendo_NES_Classic_Edition_defconfig | 1 + configs/Sinlinx_SinA33_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 | 2 +- configs/popmetal-rk3288_defconfig | 1 + configs/smdkv310_defconfig | 1 + configs/tinker-rk3288_defconfig | 1 + 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/exynos4-common.h | 2 -- include/configs/ge_bx50v3.h | 1 - include/configs/gw_ventana.h | 1 - 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 | 1 - include/configs/pico-imx7d.h | 2 -- include/configs/rk3036_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 | 1 - include/configs/tbs2910.h | 1 - include/configs/tegra-common-usb-gadget.h | 1 - include/configs/warp.h | 2 -- include/configs/warp7.h | 2 -- scripts/config_whitelist.txt | 1 - 41 files changed, 12 insertions(+), 43 deletions(-)