From: Tom Rini <trini@konsulko.com>
Date: Fri, 15 Jul 2016 12:06:22 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-dm
X-Git-Tag: v2016.09-rc1~82
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ebe621d5fb2f5c15aff50e0610372f2751fd152f;p=oweals%2Fu-boot.git

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

ebe621d5fb2f5c15aff50e0610372f2751fd152f
diff --cc test/py/u_boot_console_sandbox.py
index b4404971c4,6bf4653083..647e1f879f
--- a/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)