Hi Urja, The subject is a little bit too long and missing a spaces. This is a per SoC config, so it will be better to add the CONFIG_CMD_USB_MASS_STORAGE as imply option in the SOC Kconfig instead of add them in all the defconfigs.
Thanks, - Kever Urja Rannikko <urja...@gmail.com> 于2019年5月13日周一 下午9:51写道: > This affects RK3036, RK322X and RK3288 - the defconfig changes done by > moveconfig.py for the veyrons were left out on purpose because they dont > have an OTG port, and will get their config updated in the next commit. > > Signed-off-by: Urja Rannikko <urja...@gmail.com> > --- > v2: Also cleanup now unrelevant comments about usb support from the headers > (series v2: rebased) > --- > configs/evb-rk3036_defconfig | 2 +- > configs/evb-rk3229_defconfig | 1 + > configs/evb-rk3288_defconfig | 2 +- > configs/fennec-rk3288_defconfig | 2 +- > configs/firefly-rk3288_defconfig | 2 +- > configs/kylin-rk3036_defconfig | 2 +- > configs/miqi-rk3288_defconfig | 2 +- > configs/phycore-rk3288_defconfig | 2 +- > configs/popmetal-rk3288_defconfig | 2 +- > configs/rock2_defconfig | 2 +- > configs/tinker-rk3288_defconfig | 2 +- > include/configs/rk3036_common.h | 5 ----- > include/configs/rk322x_common.h | 5 ----- > include/configs/rk3288_common.h | 5 ----- > include/configs/vyasa-rk3288.h | 1 - > 15 files changed, 11 insertions(+), 26 deletions(-) > > diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig > index 1e00c37438..d9158d28ad 100644 > --- a/configs/evb-rk3036_defconfig > +++ b/configs/evb-rk3036_defconfig > @@ -24,6 +24,7 @@ CONFIG_CMD_I2C=y > CONFIG_CMD_MMC=y > CONFIG_CMD_SF=y > CONFIG_CMD_SPI=y > +CONFIG_CMD_USB_MASS_STORAGE=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_CACHE=y > CONFIG_CMD_TIME=y > @@ -56,7 +57,6 @@ 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 9ee9daa3af..e800d09409 100644 > --- a/configs/evb-rk3229_defconfig > +++ b/configs/evb-rk3229_defconfig > @@ -29,6 +29,7 @@ CONFIG_SPL_OPTEE=y > CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl.lds" > CONFIG_CMD_GPT=y > CONFIG_CMD_MMC=y > +CONFIG_CMD_USB_MASS_STORAGE=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_TIME=y > CONFIG_SPL_OF_CONTROL=y > diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig > index 843c59d30d..e181ccef28 100644 > --- a/configs/evb-rk3288_defconfig > +++ b/configs/evb-rk3288_defconfig > @@ -25,6 +25,7 @@ CONFIG_CMD_MMC=y > CONFIG_CMD_SF=y > CONFIG_CMD_SPI=y > CONFIG_CMD_USB=y > +CONFIG_CMD_USB_MASS_STORAGE=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_CACHE=y > CONFIG_CMD_TIME=y > @@ -77,7 +78,6 @@ 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 6dfaff50ff..98aa936ea0 100644 > --- a/configs/fennec-rk3288_defconfig > +++ b/configs/fennec-rk3288_defconfig > @@ -26,6 +26,7 @@ CONFIG_CMD_MMC=y > CONFIG_CMD_SF=y > CONFIG_CMD_SPI=y > CONFIG_CMD_USB=y > +CONFIG_CMD_USB_MASS_STORAGE=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_CACHE=y > CONFIG_CMD_TIME=y > @@ -76,7 +77,6 @@ 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 4cedb28d22..1272244260 100644 > --- a/configs/firefly-rk3288_defconfig > +++ b/configs/firefly-rk3288_defconfig > @@ -25,6 +25,7 @@ CONFIG_CMD_MMC=y > CONFIG_CMD_SF=y > CONFIG_CMD_SPI=y > CONFIG_CMD_USB=y > +CONFIG_CMD_USB_MASS_STORAGE=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_CACHE=y > CONFIG_CMD_TIME=y > @@ -81,7 +82,6 @@ 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 6822311ae6..4c175b0a8a 100644 > --- a/configs/kylin-rk3036_defconfig > +++ b/configs/kylin-rk3036_defconfig > @@ -25,6 +25,7 @@ CONFIG_CMD_MMC=y > CONFIG_CMD_SF=y > CONFIG_CMD_SPI=y > CONFIG_CMD_USB=y > +CONFIG_CMD_USB_MASS_STORAGE=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_CACHE=y > CONFIG_CMD_TIME=y > @@ -59,7 +60,6 @@ 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 936192f547..bf6d2d7f2a 100644 > --- a/configs/miqi-rk3288_defconfig > +++ b/configs/miqi-rk3288_defconfig > @@ -25,6 +25,7 @@ CONFIG_CMD_MMC=y > CONFIG_CMD_SF=y > CONFIG_CMD_SPI=y > CONFIG_CMD_USB=y > +CONFIG_CMD_USB_MASS_STORAGE=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_CACHE=y > CONFIG_CMD_TIME=y > @@ -76,7 +77,6 @@ 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/phycore-rk3288_defconfig > b/configs/phycore-rk3288_defconfig > index 2e6a4a7621..8ed6289888 100644 > --- a/configs/phycore-rk3288_defconfig > +++ b/configs/phycore-rk3288_defconfig > @@ -28,6 +28,7 @@ CONFIG_CMD_MMC=y > CONFIG_CMD_SF=y > CONFIG_CMD_SPI=y > CONFIG_CMD_USB=y > +CONFIG_CMD_USB_MASS_STORAGE=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_CACHE=y > CONFIG_CMD_TIME=y > @@ -80,7 +81,6 @@ 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 902294bc3c..b5cf53187a 100644 > --- a/configs/popmetal-rk3288_defconfig > +++ b/configs/popmetal-rk3288_defconfig > @@ -26,6 +26,7 @@ CONFIG_CMD_MMC=y > CONFIG_CMD_SF=y > CONFIG_CMD_SPI=y > CONFIG_CMD_USB=y > +CONFIG_CMD_USB_MASS_STORAGE=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_CACHE=y > CONFIG_CMD_TIME=y > @@ -76,7 +77,6 @@ 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 7639b558cf..bfe1ee3597 100644 > --- a/configs/rock2_defconfig > +++ b/configs/rock2_defconfig > @@ -25,6 +25,7 @@ CONFIG_CMD_MMC=y > CONFIG_CMD_SF=y > CONFIG_CMD_SPI=y > CONFIG_CMD_USB=y > +CONFIG_CMD_USB_MASS_STORAGE=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_CACHE=y > CONFIG_CMD_TIME=y > @@ -77,7 +78,6 @@ 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/tinker-rk3288_defconfig > b/configs/tinker-rk3288_defconfig > index 07e0d45781..3134954a34 100644 > --- a/configs/tinker-rk3288_defconfig > +++ b/configs/tinker-rk3288_defconfig > @@ -27,6 +27,7 @@ CONFIG_CMD_MMC=y > CONFIG_CMD_SF=y > CONFIG_CMD_SPI=y > CONFIG_CMD_USB=y > +CONFIG_CMD_USB_MASS_STORAGE=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_CACHE=y > CONFIG_CMD_TIME=y > @@ -79,7 +80,6 @@ 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/include/configs/rk3036_common.h > b/include/configs/rk3036_common.h > index bff20c842f..f44ad83f99 100644 > --- a/include/configs/rk3036_common.h > +++ b/include/configs/rk3036_common.h > @@ -28,12 +28,7 @@ > #define SDRAM_MAX_SIZE (CONFIG_NR_DRAM_BANKS * > SDRAM_BANK_SIZE) > > #ifndef CONFIG_SPL_BUILD > -/* usb otg */ > > -/* usb mass storage */ > -#define CONFIG_CMD_USB_MASS_STORAGE > - > -/* usb host */ > #define ENV_MEM_LAYOUT_SETTINGS \ > "scriptaddr=0x60000000\0" \ > "pxefile_addr_r=0x60100000\0" \ > diff --git a/include/configs/rk322x_common.h > b/include/configs/rk322x_common.h > index 15bb8d63b8..ae583d43f5 100644 > --- a/include/configs/rk322x_common.h > +++ b/include/configs/rk322x_common.h > @@ -29,12 +29,7 @@ > #define SDRAM_MAX_SIZE 0x80000000 > > #ifndef CONFIG_SPL_BUILD > -/* usb otg */ > > -/* usb mass storage */ > -#define CONFIG_CMD_USB_MASS_STORAGE > - > -/* usb host */ > #define ENV_MEM_LAYOUT_SETTINGS \ > "scriptaddr=0x60000000\0" \ > "pxefile_addr_r=0x60100000\0" \ > diff --git a/include/configs/rk3288_common.h > b/include/configs/rk3288_common.h > index 7c79ed6138..12a815601e 100644 > --- a/include/configs/rk3288_common.h > +++ b/include/configs/rk3288_common.h > @@ -36,12 +36,7 @@ > #define SDRAM_MAX_SIZE 0xfe000000 > > #ifndef CONFIG_SPL_BUILD > -/* usb otg */ > > -/* usb mass storage */ > -#define CONFIG_CMD_USB_MASS_STORAGE > - > -/* usb host support */ > #define ENV_MEM_LAYOUT_SETTINGS \ > "scriptaddr=0x00000000\0" \ > "pxefile_addr_r=0x00100000\0" \ > diff --git a/include/configs/vyasa-rk3288.h > b/include/configs/vyasa-rk3288.h > index 382fdac4c0..3574a3b5a5 100644 > --- a/include/configs/vyasa-rk3288.h > +++ b/include/configs/vyasa-rk3288.h > @@ -17,7 +17,6 @@ > func(MMC, mmc, 1) \ > > #define CONFIG_SYS_MMC_ENV_DEV 1 > -#undef CONFIG_CMD_USB_MASS_STORAGE > > #ifndef CONFIG_TPL_BUILD > > -- > 2.21.0 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot