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

diff --cc arch/sandbox/dts/test.dts
index cfa47bcd0dec792101179b43c6924ca00c694de9,42ceeb994e8b6144bb16975db47b1a4c7d080f33..491f889f3b9cd04c4c8f5f630652311805103163
--- 1/arch/sandbox/dts/test.dts
--- 2/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 configs/sandbox64_defconfig
Simple merge

diff --cc configs/sandbox_defconfig
Simple merge

diff --cc configs/sandbox_flattree_defconfig
Simple merge

diff --cc configs/sandbox_noblk_defconfig
Simple merge

diff --cc configs/sandbox_spl_defconfig
Simple merge

diff --cc drivers/Kconfig
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc include/dm/uclass-id.h
Simple merge

diff --cc test/dm/Makefile
Simple merge

diff --cc tools/binman/README
Simple merge

diff --cc tools/binman/README.entries
Simple merge

diff --cc tools/binman/bsection.py
Simple merge

diff --cc tools/binman/ftest.py
index 924701a76b2369b03a961327bc488dbed8b8a6dd,abf02b62e813e3d7e74842f630f652edb5c0887e..57725c928e70afda6f4b3cb6cad19cefb20a5753
--- 1/tools/binman/ftest.py
--- 2/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)