From: Simon Glass <sjg@chromium.org>
Date: Mon, 4 Jul 2016 17:58:40 +0000 (-0600)
Subject: test/py: Start sandbox SPL when enabled
X-Git-Tag: v2016.09-rc1~82^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a811779b174f8c5c687aaa5574dfdea9f3745f98;p=oweals%2Fu-boot.git

test/py: Start sandbox SPL when enabled

When sandbox SPL is enabled we want to start that rather than U-Boot proper,
since some tests may rely on running it first.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/test/py/u_boot_console_sandbox.py b/test/py/u_boot_console_sandbox.py
index 04654ae8c9..6bf4653083 100644
--- a/test/py/u_boot_console_sandbox.py
+++ b/test/py/u_boot_console_sandbox.py
@@ -39,11 +39,15 @@ class ConsoleSandbox(ConsoleBase):
             A u_boot_spawn.Spawn object that is attached to U-Boot.
         """
 
+        bcfg = self.config.buildconfig
+        config_spl = bcfg.get('config_spl', 'n') == 'y'
+        fname = '/spl/u-boot-spl' if config_spl else '/u-boot'
+        print fname
         cmd = []
         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'