diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-23 20:50:11 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-23 20:50:11 -0500 |
| commit | 9a0cbae22a613dfd55e15565785749b74c19fdf0 (patch) | |
| tree | e66f4ce35ba9d7ce812b95b8b441fc0bec917a4f /configs/rock2_defconfig | |
| parent | c8f2fe4e670c91172540ab36700d7a8411fc6f76 (diff) | |
| parent | 8019d32c4701b95410113541deb7f28d5c2b02a5 (diff) | |
Merge tag 'u-boot-rockchip-20191124' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Clean vid/pid in Kconfig and add fastboot for rk3399
- add 'u-boot, spl-fifo-mode' for mmc
- Use FIT generator for rk3229 optee and rk3368 ATF
- fan53555: add support for Silergy SYR82X and SYR83X
Diffstat (limited to 'configs/rock2_defconfig')
| -rw-r--r-- | configs/rock2_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index a28b3f1494..ea8b87ae35 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -74,8 +74,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_DM_VIDEO=y |