Merge tag '2020-01-20-ti-2020.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
authorTom Rini <trini@konsulko.com>
Mon, 20 Jan 2020 19:54:55 +0000 (14:54 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 20 Jan 2020 19:54:55 +0000 (14:54 -0500)
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

1  2 
arch/arm/dts/Makefile
arch/arm/mach-k3/common.c
arch/arm/mach-k3/security.c
board/ti/am43xx/board.c
board/ti/am57xx/board.c
board/ti/dra7xx/evm.c

Simple merge
Simple merge
index 6934e88a965bfdf9942d46ab112e5634820f709c,83b037f189b60b9e88b0391bf3ef04da3767f904..0d77d9835964dece8a909bb76104dc3b4aaaec13
@@@ -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>
index 36f86926bc31345a09fc263288c15e9ed6a4d7fb,99b83d7ed19bfc98e927bcfa76243388b6beedfc..21fc5ed1d3dd989afde49764c5544b81fecfcc76
@@@ -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>
Simple merge
index 94001a4dc39c534602dce69d15ecb95dad7b5a25,5d56d36978612438c059d2c19345ee0ecddd3af6..8132cdfbf2f83e6ed6aba70de80fd6be44df6091
@@@ -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>