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

2016-07-15 08:06:22 -04:00
parent 36b898b6be 1269625177
commit ebe621d5fb
71 changed files with 2495 additions and 130 deletions
--- a/test/py/conftest.py
+++ b/test/py/conftest.py
@@ -193,7 +193,7 @@ def pytest_configure(config):
    for v in env_vars:
        os.environ['U_BOOT_' + v.upper()] = getattr(ubconfig, v)

-    if board_type == 'sandbox':
+    if board_type.startswith('sandbox'):
        import u_boot_console_sandbox
        console = u_boot_console_sandbox.ConsoleSandbox(log, ubconfig)
    else: