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/evb-rk3229_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/evb-rk3229_defconfig')
| -rw-r--r-- | configs/evb-rk3229_defconfig | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig index 4efee273ad..5a2466b06d 100644 --- a/configs/evb-rk3229_defconfig +++ b/configs/evb-rk3229_defconfig @@ -15,7 +15,7 @@ CONFIG_SPL_TEXT_BASE=0x60000000 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_SOURCE="arch/arm/mach-rockchip/fit_spl_optee.its" +CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/fit_spl_optee.sh" CONFIG_USE_PREBOOT=y CONFIG_DEFAULT_FDT_FILE="rk3229-evb.dtb" # CONFIG_DISPLAY_CPUINFO is not set @@ -46,8 +46,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_SIZE=0x04000000 -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 @@ -66,9 +64,6 @@ CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y CONFIG_USB=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_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y |