From: Tom Rini <trini@konsulko.com>
Date: Mon, 12 Aug 2019 22:47:53 +0000 (-0400)
Subject: Merge branch '2019-08-11-ti-imports'
X-Git-Tag: v2019.10-rc2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9c6115822e894ead72fa4c094bf718eaabb9e103;p=oweals%2Fu-boot.git

Merge branch '2019-08-11-ti-imports'

- More DaVinci updates and fixes
- PCIe support on am65x
- Watchdog converted to DM
- Assorted other bugfixes
---

9c6115822e894ead72fa4c094bf718eaabb9e103
diff --cc board/siemens/common/factoryset.c
index 049a65ff77,40456a5392..7715ddf307
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@@ -8,7 -8,8 +8,9 @@@
  #if !defined(CONFIG_SPL_BUILD)
  
  #include <common.h>
 +#include <env.h>
+ #include <dm.h>
 -#include <environment.h>
++#include <env_internal.h>
  #include <i2c.h>
  #include <asm/io.h>
  #include <asm/arch/cpu.h>