aboutsummaryrefslogtreecommitdiff
path: root/configs/kylin-rk3036_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-11-23 20:50:11 -0500
committerTom Rini <trini@konsulko.com>2019-11-23 20:50:11 -0500
commit9a0cbae22a613dfd55e15565785749b74c19fdf0 (patch)
treee66f4ce35ba9d7ce812b95b8b441fc0bec917a4f /configs/kylin-rk3036_defconfig
parentc8f2fe4e670c91172540ab36700d7a8411fc6f76 (diff)
parent8019d32c4701b95410113541deb7f28d5c2b02a5 (diff)
downloadu-boot-9a0cbae22a613dfd55e15565785749b74c19fdf0.zip
u-boot-9a0cbae22a613dfd55e15565785749b74c19fdf0.tar.gz
u-boot-9a0cbae22a613dfd55e15565785749b74c19fdf0.tar.bz2
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/kylin-rk3036_defconfig')
-rw-r--r--configs/kylin-rk3036_defconfig5
1 files changed, 0 insertions, 5 deletions
diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
index d05906e..78dc14f 100644
--- a/configs/kylin-rk3036_defconfig
+++ b/configs/kylin-rk3036_defconfig
@@ -39,8 +39,6 @@ CONFIG_REGMAP=y
CONFIG_SYSCON=y
# CONFIG_SPL_BLK is not set
CONFIG_CLK=y
-CONFIG_FASTBOOT_FLASH=y
-CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
CONFIG_ROCKCHIP_GPIO=y
CONFIG_SYS_I2C_ROCKCHIP=y
@@ -58,9 +56,6 @@ CONFIG_SYSRESET=y
CONFIG_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_GADGET=y
-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_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y