Merge branch '2019-08-11-ti-imports'
authorTom Rini <trini@konsulko.com>
Mon, 12 Aug 2019 22:47:53 +0000 (18:47 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 12 Aug 2019 22:47:53 +0000 (18:47 -0400)
- More DaVinci updates and fixes
- PCIe support on am65x
- Watchdog converted to DM
- Assorted other bugfixes

1  2 
arch/arm/dts/Makefile
arch/arm/mach-omap2/boot-common.c
board/davinci/da8xxevm/da850evm.c
board/overo/overo.c
board/siemens/common/factoryset.c

Simple merge
Simple merge
Simple merge
Simple merge
index 049a65ff778f6617c0b7435159a2b606741f47fa,40456a53922f784b0920e49334b5cb759951da2c..7715ddf307a4458c2f2baf06c4009452965bc527
@@@ -8,7 -8,8 +8,9 @@@
  #if !defined(CONFIG_SPL_BUILD)
  
  #include <common.h>
 -#include <environment.h>
 +#include <env.h>
+ #include <dm.h>
++#include <env_internal.h>
  #include <i2c.h>
  #include <asm/io.h>
  #include <asm/arch/cpu.h>