From: Tom Rini <trini@konsulko.com>
Date: Mon, 20 Jan 2020 19:54:55 +0000 (-0500)
Subject: Merge tag '2020-01-20-ti-2020.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
X-Git-Tag: v2020.04-rc1~13
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=07add22cab3be86067c227a30ad5d0feab541316;p=oweals%2Fu-boot.git

Merge tag '2020-01-20-ti-2020.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti

K3 J721E:
* DMA support.
* MMC and ADMA support.
* EEPROM support.
* J721e High Security EVM support.
* USB DT nodes

K3 AM654:
* Fixed boot due to pmic probe error.
* USB support and DT nodes.
* ADMA support

DRA7xx/AM57xx:
* BBAI board support
* Clean up of net platform code under board/ti

AM33/AM43/Davinci:
* Reduce SPL size for omap3 boards.
* SPL DT support for da850-lcdk
* PLL divider fix for AM335x
---

07add22cab3be86067c227a30ad5d0feab541316
diff --cc arch/arm/mach-k3/security.c
index 6934e88a96,83b037f189..0d77d98359
--- a/arch/arm/mach-k3/security.c
+++ b/arch/arm/mach-k3/security.c
@@@ -7,8 -7,8 +7,9 @@@
   */
  
  #include <common.h>
+ #include <cpu_func.h>
  #include <dm.h>
 +#include <hang.h>
  #include <linux/soc/ti/ti_sci_protocol.h>
  #include <mach/spl.h>
  #include <spl.h>
diff --cc board/ti/am43xx/board.c
index 36f86926bc,99b83d7ed1..21fc5ed1d3
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@@ -9,8 -9,8 +9,9 @@@
  
  #include <common.h>
  #include <eeprom.h>
+ #include <dm/uclass.h>
  #include <env.h>
 +#include <fdt_support.h>
  #include <i2c.h>
  #include <init.h>
  #include <linux/errno.h>
diff --cc board/ti/dra7xx/evm.c
index 94001a4dc3,5d56d36978..8132cdfbf2
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@@ -11,8 -11,8 +11,9 @@@
   */
  #include <common.h>
  #include <env.h>
 +#include <fdt_support.h>
  #include <init.h>
+ #include <spl.h>
  #include <palmas.h>
  #include <sata.h>
  #include <serial.h>