From: Tom Rini <trini@konsulko.com>
Date: Sun, 30 Sep 2018 22:16:51 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-dm
X-Git-Tag: v2025.01-rc5-pxa1908~3436
X-Git-Url: http://git.dujemihanovic.xyz/html/%7B%7B%20%28.OutputFormats.Get?a=commitdiff_plain;h=d24c1d0f4da3b081a4fedf7ae2a08790871f08d0;p=u-boot.git

Merge git://git.denx.de/u-boot-dm
---

d24c1d0f4da3b081a4fedf7ae2a08790871f08d0
diff --cc arch/sandbox/dts/test.dts
index cfa47bcd0d,42ceeb994e..491f889f3b
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@@ -644,9 -649,9 +650,13 @@@
  		};
  	};
  
 +	osd {
 +		compatible = "sandbox,sandbox_osd";
 +	};
++
+ 	board {
+ 		compatible = "sandbox,board_sandbox";
+ 	};
  };
  
  #include "sandbox_pmic.dtsi"
diff --cc tools/binman/ftest.py
index 924701a76b,abf02b62e8..57725c928e
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@@ -39,9 -41,10 +41,11 @@@ U_BOOT_SPL_DTB_DATA   = 'spldtb
  U_BOOT_TPL_DTB_DATA   = 'tpldtb'
  X86_START16_DATA      = 'start16'
  X86_START16_SPL_DATA  = 'start16spl'
+ X86_START16_TPL_DATA  = 'start16tpl'
 +PPC_MPC85XX_BR_DATA   = 'ppcmpc85xxbr'
  U_BOOT_NODTB_DATA     = 'nodtb with microcode pointer somewhere in here'
  U_BOOT_SPL_NODTB_DATA = 'splnodtb with microcode pointer somewhere in here'
+ U_BOOT_TPL_NODTB_DATA = 'tplnodtb with microcode pointer somewhere in here'
  FSP_DATA              = 'fsp'
  CMC_DATA              = 'cmc'
  VBT_DATA              = 'vbt'
@@@ -91,9 -97,10 +98,11 @@@ class TestFunctional(unittest.TestCase)
          TestFunctional._MakeInputFile('vga.bin', VGA_DATA)
          self._ResetDtbs()
          TestFunctional._MakeInputFile('u-boot-x86-16bit.bin', X86_START16_DATA)
 +        TestFunctional._MakeInputFile('u-boot-br.bin', PPC_MPC85XX_BR_DATA)
          TestFunctional._MakeInputFile('spl/u-boot-x86-16bit-spl.bin',
                                        X86_START16_SPL_DATA)
+         TestFunctional._MakeInputFile('tpl/u-boot-x86-16bit-tpl.bin',
+                                       X86_START16_TPL_DATA)
          TestFunctional._MakeInputFile('u-boot-nodtb.bin', U_BOOT_NODTB_DATA)
          TestFunctional._MakeInputFile('spl/u-boot-spl-nodtb.bin',
                                        U_BOOT_SPL_NODTB_DATA)