From: Tom Rini <trini@konsulko.com>
Date: Tue, 14 Jun 2022 16:28:58 +0000 (-0400)
Subject: Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-tegra
X-Git-Tag: baikal/mips/sdk5.9~3^2~28
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=809c09ae08de0c3a3aeed64ccac3e96d1f3294a3;p=uboot.git

Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-tegra

Signed-off-by: Tom Rini <trini@konsulko.com>
---

809c09ae08de0c3a3aeed64ccac3e96d1f3294a3
diff --cc board/toradex/colibri_t20/colibri_t20.c
index 73ef4d2db3,c58d2021cd..1df9697b97
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@@ -4,6 -4,7 +4,8 @@@
   */
  
  #include <common.h>
+ #include <env.h>
++#include <fdt_support.h>
  #include <init.h>
  #include <log.h>
  #include <asm/arch/clock.h>