diff options
author | Tom Rini <trini@konsulko.com> | 2019-08-12 18:46:07 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-08-12 18:46:07 -0400 |
commit | 5939afc9611e8ba4a86b96e67670b765ee27668e (patch) | |
tree | 369402e0305a7b8f9f905baec6387bfd9683ba71 /board/freescale/t102xqds | |
parent | d7ae932152ddf58125a05f4eb28596d9b31bdb1e (diff) | |
parent | ec1fa18561f818bee252da2c331d371ad26037d2 (diff) | |
download | u-boot-5939afc9611e8ba4a86b96e67670b765ee27668e.tar.gz u-boot-5939afc9611e8ba4a86b96e67670b765ee27668e.tar.xz u-boot-5939afc9611e8ba4a86b96e67670b765ee27668e.zip |
Merge branch '2019-08-11-master-imports'
- environment cleanup
- HiKey 960 support
- Some PCI fixes
Diffstat (limited to 'board/freescale/t102xqds')
-rw-r--r-- | board/freescale/t102xqds/spl.c | 2 | ||||
-rw-r--r-- | board/freescale/t102xqds/t102xqds.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/board/freescale/t102xqds/spl.c b/board/freescale/t102xqds/spl.c index 1b58174ed1..3008f0919f 100644 --- a/board/freescale/t102xqds/spl.c +++ b/board/freescale/t102xqds/spl.c @@ -4,7 +4,7 @@ #include <common.h> #include <console.h> -#include <environment.h> +#include <env_internal.h> #include <malloc.h> #include <ns16550.h> #include <nand.h> diff --git a/board/freescale/t102xqds/t102xqds.c b/board/freescale/t102xqds/t102xqds.c index d770aebebb..6c754503d1 100644 --- a/board/freescale/t102xqds/t102xqds.c +++ b/board/freescale/t102xqds/t102xqds.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <i2c.h> #include <netdev.h> #include <linux/compiler.h> |