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

diff --cc Makefile
Simple merge

diff --cc test/py/conftest.py
Simple merge

diff --cc test/py/u_boot_console_base.py
Simple merge

diff --cc test/py/u_boot_console_sandbox.py
index b4404971c48b0e35ace5799857d629d7e8d34851,6bf46530833b4f8cbaff6deb549903749f0121fa..647e1f879fcadcbaf1487e6ad728597959e6f577
--- 1/test/py/u_boot_console_sandbox.py
--- 2/test/py/u_boot_console_sandbox.py
+++ b/test/py/u_boot_console_sandbox.py
@@@ -43,10 -47,10 +47,10 @@@ class ConsoleSandbox(ConsoleBase)
          if self.config.gdbserver:
              cmd += ['gdbserver', self.config.gdbserver]
          cmd += [
-             self.config.build_dir + '/u-boot',
+             self.config.build_dir + fname,
              '-v',
              '-d',
 -            self.config.build_dir + '/arch/sandbox/dts/test.dtb'
 +            self.config.dtb
          ]
          return Spawn(cmd, cwd=self.config.source_dir)