Merge branch 'master' of git://git.denx.de/u-boot-tegra

diff --combined arch/arm/dts/Makefile
index e76f56b22eb0d8b253310661f034e87ffc81e425,818d24eb69bdb2808f741a3d2e2599a5fe5ebcf8..e159475580bc963da27b0c25236f50771761201e
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -47,6 -47,7 +47,7 @@@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.
        tegra124-jetson-tk1.dtb \
        tegra124-nyan-big.dtb \
        tegra124-venice2.dtb \
+       tegra186-p2771-0000.dtb \
        tegra210-e2220-1170.dtb \
        tegra210-p2371-0000.dtb \
        tegra210-p2371-2180.dtb \
@@@ -107,8 -108,7 +108,8 @@@ dtb-$(CONFIG_ARCH_SOCFPGA) +=                              
        socfpga_cyclone5_de0_nano_soc.dtb                       \
        socfpga_cyclone5_sockit.dtb                     \
        socfpga_cyclone5_socrates.dtb                   \
 -      socfpga_cyclone5_sr1500.dtb
 +      socfpga_cyclone5_sr1500.dtb                     \
 +      socfpga_cyclone5_vining_fpga.dtb
  
  dtb-$(CONFIG_TARGET_DRA7XX_EVM) += dra72-evm.dtb dra7-evm.dtb
  dtb-$(CONFIG_TARGET_BEAGLE_X15) += am57xx-beagle-x15.dtb