From: Tom Rini Date: Mon, 6 Jun 2016 17:24:23 +0000 (-0400) Subject: Merge http://git.denx.de/u-boot-samsung X-Git-Tag: v2016.07-rc1~1 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d77fa2ff766bbb4b867e791187f78b6033071613;p=u-boot Merge http://git.denx.de/u-boot-samsung Signed-off-by: Tom Rini Conflicts: configs/peach-pi_defconfig configs/peach-pit_defconfig --- d77fa2ff766bbb4b867e791187f78b6033071613 diff --cc configs/peach-pi_defconfig index 3c403ba8da,fea8bde324..313fb03e66 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@@ -55,8 -58,8 +58,10 @@@ CONFIG_EXYNOS_SPI= CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y + CONFIG_DM_VIDEO=y + CONFIG_DISPLAY=y CONFIG_VIDEO_BRIDGE=y CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y CONFIG_TPM=y diff --cc configs/peach-pit_defconfig index bfa361498c,41c3d1208d..eb5558a408 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@@ -55,8 -58,8 +58,10 @@@ CONFIG_EXYNOS_SPI= CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y + CONFIG_DM_VIDEO=y + CONFIG_DISPLAY=y CONFIG_VIDEO_BRIDGE=y CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y CONFIG_TPM=y