From: Tom Rini <trini@konsulko.com>
Date: Mon, 19 Jul 2021 12:29:24 +0000 (-0400)
Subject: Merge tag 'ti-v2021.10-rc1' of https://source.denx.de/u-boot/custodians/u-boot-ti
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=83befb446664af32ce18f0e42e99a353e6622e58;p=u-boot.git

Merge tag 'ti-v2021.10-rc1' of https://source.denx.de/u-boot/custodians/u-boot-ti

- Enabled distro boot for all TI platforms.
- Cleanup for AM335x Guardian Board
- PRUSS rproc on AM65 platform.
- Add PMIC support for J7200
- Misc fixes for Nokia RX-51

# Conflicts:
#	arch/arm/mach-omap2/am33xx/Kconfig
---

83befb446664af32ce18f0e42e99a353e6622e58
diff --cc arch/arm/mach-omap2/am33xx/Kconfig
index 53abc92a5f,65f43944fe..88cb9573c9
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@@ -94,6 -94,9 +94,8 @@@ config TARGET_AM335X_GUARDIA
  	select DM
  	select DM_SERIAL
  	select DM_GPIO
 -	select DM_USB
+ 	select DM_VIDEO
+ 	select DM_PANEL_HX8238D
  
  config TARGET_AM335X_SL50
  	bool "Support am335x_sl50"